数据中心报告统计

src/main/java/com/sooka/sponest/data/index/domain/IndexViewInfo.java

@@ -18,6 +18,15 @@ public class IndexViewInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "基础数据列表-类别", required = false)
     private String category;
 
+    /*
+    * 基础数据列表-类别(英文)
+    *
+    * @author 韩福成
+    * @date 2023/12/19 16:39
+    */
+    @ApiModelProperty(value = "基础数据列表-类别(英文)", required = false)
+    private String categoryEnglish;
+
     /**
      * 基础数据列表-小类
      */

src/main/java/com/sooka/sponest/data/index/service/impl/IndexViewServiceImpl.java

@@ -126,6 +126,7 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
             indexViewInfo.setUpdataCount(0L);
 
             indexViewInfo.setCategory(categoryMap.get(subclass));
+            indexViewInfo.setCategoryEnglish(subclass);
             indexViewInfo.setSubclass(subclassCount.get(subclass));
 
             List<MenuInfo> menuInfos = entry.getValue();
@@ -157,6 +158,7 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
 
         IndexViewInfo indexViewInfo = new IndexViewInfo();
         indexViewInfo.setCategory("共有基础数据类型");
+        indexViewInfo.setCategoryEnglish("all");
         indexViewInfo.setSubclass((long) basicDataList.size());
         indexViewInfo.setCount(totalCount);
         basicList.add(indexViewInfo);
@@ -254,8 +256,8 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
         // 合并基础数据
         if (basicDataList != null) {
             for (int i = 0; i < basicDataList.size(); i++) {
-                systemInfoReportMap.put("basicDataSubclass" + i, basicDataList.get(i).getSubclass());
-                systemInfoReportMap.put("basicDataCount" + i, basicDataList.get(i).getCount());
+                systemInfoReportMap.put("basicDataSubclass-" + basicDataList.get(i).getCategoryEnglish(), basicDataList.get(i).getSubclass());
+                systemInfoReportMap.put("basicDataCount-" + basicDataList.get(i).getCategoryEnglish(), basicDataList.get(i).getCount());
             }
         }
         // 合并四长人数、巡护距离

src/main/resources/mapper/index/IndexViewMapper.xml

@@ -40,7 +40,7 @@
                     </choose>
                 </when>
             </choose>
-            <if test="deptIds != null and deptIds != ''">and CONCAT(d.ancestors,',',a.dept_id) = #{deptIds}</if>
+            <if test="deptIds != null and deptIds != ''">and CONCAT(d.ancestors,',',a.dept_id) like concat('%', #{deptIds}, '%') </if>
         </where>
     </select>