学历统计排除admin

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/StaffStatisticServiceImpl.java

@@ -80,6 +80,7 @@ public class StaffStatisticServiceImpl implements StaffStatisticService {
 
         List<StaffRecordSDO> staffList = recordsMapper.selectList(new LambdaQueryWrapperX<StaffRecordSDO>()
                 .inIfPresent(StaffRecordSDO::getUserId, userIds)
+                .neIfPresent(StaffRecordSDO::getNickname, "admin")
                 .neIfPresent(StaffRecordSDO::getState, 4));
 
 
@@ -102,15 +103,15 @@ public class StaffStatisticServiceImpl implements StaffStatisticService {
                 .collect(Collectors.groupingBy(
                         employee -> {
                             if (employee.getZgxl().equals("6")) {
-                                return "doctorStaff";
+                                return "doctorStaff"; //博士
                             } else if (employee.getZgxl().equals("5")) {
-                                return "masterStaff";
-                            } else if (employee.getZgxl().equals("4")) {
-                                return "undergraduateStaff";
+                                return "masterStaff"; //硕士
+                            } else if (employee.getZgxl().equals("4") || employee.getZgxl().equals("7")) {
+                                return "undergraduateStaff";//本科
                             } else if (employee.getZgxl().equals("3")) {
-                                return "juniorCollegeStaff";
+                                return "juniorCollegeStaff";//大专
                             } else {
-                                return "belowJuniorCollegeStaff";
+                                return "belowJuniorCollegeStaff"; //大专以下
                             }
                         },
                         Collectors.counting()