数据看板调整

src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -31,6 +31,7 @@ import com.xjrsoft.module.oa.service.IWfSubscriptionService;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.service.IBaseStudentService;
 import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
+import com.xjrsoft.module.student.vo.StudentReportRecordItemVo;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
 import com.xjrsoft.module.teacher.entity.XjrUser;
@@ -575,21 +576,28 @@ public class DatadetailController {
         }
         result.setGradeList(gradeList);
 
-        sql = "SELECT name AS item,(" +
-            " SELECT COUNT(*) FROM xjr_user t1" +
-            " INNER JOIN base_student_school_roll t2 ON t1.id = t2.user_id" +
-            " inner join base_class t3 on t2.class_id = t3.id" +
-            " WHERE t1.delete_mark = 0 AND t3.org_id = xjr_department.id" +
-            " and t2.archives_status = 'FB2901') AS a_count FROM xjr_department" +
-            " WHERE delete_mark = 0 AND is_major = 1 ORDER BY name DESC";
+        sql = "SELECT NAME AS item,(\n" +
+            "SELECT COUNT(*) FROM xjr_user t1\n" +
+            "INNER JOIN base_student_school_roll t2 ON t1.id = t2.user_id\n" +
+            "INNER JOIN base_class t3 ON t2.class_id = t3.id\n" +
+            "WHERE t1.delete_mark = 0 AND t3.org_id = xjr_department.id\n" +
+            "AND t2.archives_status = 'FB2901' AND t1.gender = 'SB10001') AS a_count,\n" +
+            "(\n" +
+            "SELECT COUNT(*) FROM xjr_user t1\n" +
+            "INNER JOIN base_student_school_roll t2 ON t1.id = t2.user_id\n" +
+            "INNER JOIN base_class t3 ON t2.class_id = t3.id\n" +
+            "WHERE t1.delete_mark = 0 AND t3.org_id = xjr_department.id\n" +
+            "AND t2.archives_status = 'FB2901' AND t1.gender = 'SB10002') AS b_count FROM xjr_department\n" +
+            "WHERE delete_mark = 0 AND is_major = 1 ORDER BY NAME DESC";
         list = SqlRunnerAdapter.db().selectList(sql);
         Collections.reverse(list);
-        List<ItemCountVo> deptList = new ArrayList<>();
+        List<StudentReportRecordItemVo> deptList = new ArrayList<>();
         for (Map<String, Object> objectMap : list) {
             deptList.add(
-                    new ItemCountVo(){{
+                    new StudentReportRecordItemVo(){{
                         setItem(objectMap.get("item").toString());
                         setCount(Integer.parseInt(objectMap.get("a_count").toString()));
+                        setCount2(Integer.parseInt(objectMap.get("b_count").toString()));
                     }}
             );
         }

src/main/java/com/xjrsoft/module/databoard/vo/StudnetStatisticsDetailVo.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.databoard.vo;
 
+import com.xjrsoft.module.student.vo.StudentReportRecordItemVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -37,6 +38,6 @@ public class StudnetStatisticsDetailVo {
     private Integer studentNotStayFemaleCount;
 
     @ApiModelProperty("专业部占比数据")
-    private List<ItemCountVo> deptList;
+    private List<StudentReportRecordItemVo> deptList;
 
 }