开学报到领导统计调整

src/main/java/com/xjrsoft/module/student/controller/StudentReportRecordController.java

@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.enums.DeleteMark;
-import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.EnrollTypeEnum;
 import com.xjrsoft.common.enums.GenderDictionaryEnum;
 import com.xjrsoft.common.enums.RoleCodeEnum;
@@ -39,7 +37,6 @@ import com.xjrsoft.module.student.entity.StudentReportPlanClassRelation;
 import com.xjrsoft.module.student.entity.StudentReportRecord;
 import com.xjrsoft.module.student.service.IStudentReportPlanService;
 import com.xjrsoft.module.student.service.IStudentReportRecordService;
-import com.xjrsoft.module.student.vo.BaseMajorCategorPageVo;
 import com.xjrsoft.module.student.vo.StudentReportRecordItemVo;
 import com.xjrsoft.module.student.vo.StudentReportRecordPageVo;
 import com.xjrsoft.module.student.vo.StudentReportRecordPlanPageVo;
@@ -317,7 +314,9 @@ public class StudentReportRecordController {
                     new StudentReportRecordItemVo(){{
                         setItem(className);
                         setCount(classMap.get(className).size());
-                        setCount2(classNotMap.get(className).size());
+                        if(!(classNotMap.get(className).isEmpty())){
+                            setCount2(classNotMap.get(className).size());
+                        }
                     }}
             );
         }
@@ -331,7 +330,9 @@ public class StudentReportRecordController {
                     new StudentReportRecordItemVo(){{
                         setItem(classType);
                         setCount(classTypeMap.get(classType).size());
-                        setCount2(classTypeNotMap.get(classType).size());
+                        if(!(classTypeNotMap.get(classType).isEmpty())){
+                            setCount2(classTypeNotMap.get(classType).size());
+                        }
                     }}
             );
         }
@@ -345,7 +346,9 @@ public class StudentReportRecordController {
                     new StudentReportRecordItemVo(){{
                         setItem(majorName);
                         setCount(majorMap.get(majorName).size());
-                        setCount2(majorNotMap.get(majorName).size());
+                        if(!(majorNotMap.get(majorName).isEmpty())){
+                            setCount2(majorNotMap.get(majorName).size());
+                        }
                     }}
             );
         }