|
@@ -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);
|