Ver código fonte

数据看板调整

dzx 1 semana atrás
pai
commit
5d0d376756

+ 3 - 3
src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -289,15 +289,15 @@ public class DataboardController {
         result.setTeacherFemaleCount(teacherFemaleSet.size());
 
         Set<String> teacherSet1 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1601")))
+                .filter(x -> (x.getEmployType() != null && x.getEmployType().equals("FB1601")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount1(teacherSet1.size());
         Set<String> teacherSet2 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1605")))
+                .filter(x -> (x.getEmployType() != null && x.getEmployType().equals("FB1605")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount2(teacherSet2.size());
         Set<String> teacherSet4 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1609")))
+                .filter(x -> (x.getEmployType() != null && x.getEmployType().equals("FB1609")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount4(teacherSet4.size());
         return RT.ok(result);