数据看板调整

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

@@ -553,19 +553,43 @@ public class DatadetailController {
             " INNER JOIN base_student_school_roll t2 ON t1.id = t2.user_id" +
             " WHERE t1.delete_mark = 0 AND t2.grade_id = base_grade.id" +
             " and t2.archives_status = 'FB2901') AS a_count FROM base_grade" +
-            " WHERE delete_mark = 0 AND status = 1 ORDER BY name DESC LIMIT 3";
+            " WHERE delete_mark = 0 AND status = 1 ORDER BY name DESC LIMIT 4";
         list = SqlRunnerAdapter.db().selectList(sql);
         Collections.reverse(list);
         List<ItemCountVo> gradeList = new ArrayList<>();
         for (Map<String, Object> objectMap : list) {
+            int aCount = Integer.parseInt(objectMap.get("a_count").toString());
+            if(aCount == 0){
+                continue;
+            }
             gradeList.add(
                     new ItemCountVo(){{
                         setItem(objectMap.get("item").toString());
-                        setCount(Integer.parseInt(objectMap.get("a_count").toString()));
+                        setCount(aCount);
                     }}
             );
         }
         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";
+        list = SqlRunnerAdapter.db().selectList(sql);
+        Collections.reverse(list);
+        List<ItemCountVo> deptList = new ArrayList<>();
+        for (Map<String, Object> objectMap : list) {
+            deptList.add(
+                    new ItemCountVo(){{
+                        setItem(objectMap.get("item").toString());
+                        setCount(Integer.parseInt(objectMap.get("a_count").toString()));
+                    }}
+            );
+        }
+        result.setDeptList(deptList);
         return RT.ok(result);
     }