教研管理

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchService.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.service.research;
 
+import com.xhkjedu.model.BaseBean;
 import com.xhkjedu.sapi.listener.MessageSender;
 import com.xhkjedu.sapi.mapper.research.ResearchMapper;
 import com.xhkjedu.sapi.mapper.research.ResearchUserMapper;
@@ -160,12 +161,12 @@ public class ResearchService {
         for (Map.Entry<Integer, List<TResearchUser>> entry : collect.entrySet()) {
             List<TResearchUser> users = entry.getValue();
             Integer key = entry.getKey();
-            Map s = new HashMap();
+            Map<String, Object> s = new HashMap<>();
             s.put("schoolid", key);
             s.put("schoolname", users.get(0).getSchoolname());
-            List<String> wcyList = users.stream().filter(u -> u.getRustate().equals(0)).map(u -> u.getCreatename()).collect(Collectors.toList());
-            List<String> ycyList = users.stream().filter(u -> u.getRustate().equals(1)).map(u -> u.getCreatename()).collect(Collectors.toList());
-            s.put("cyrate", N_Utils.getDoubleDivideForAvg(ycyList.size(), users.size()));
+            List<String> wcyList = users.stream().filter(u -> u.getRustate().equals(0)).map(BaseBean::getCreatename).collect(Collectors.toList());
+            List<String> ycyList = users.stream().filter(u -> u.getRustate().equals(1)).map(BaseBean::getCreatename).collect(Collectors.toList());
+            s.put("cyrate", N_Utils.getIntegerDivideAndMulitiply(ycyList.size(), users.size()));
             s.put("wcyList", wcyList);
             s.put("ycyList", ycyList);
             schools.add(s);