大屏三库建设人员列表调整

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UserPostEnum.java

@@ -23,6 +23,30 @@ public enum UserPostEnum {
     AQZJ("安全总监","6547","2,3"),
     //安全员
     AQY("安全员","6549","2,3"),
+    // todo hcing
+    JSFZR("技术负责人","6660",""),
+
+    SJRY("设计人员","6661",""),
+
+    JSRY("技术人员","6662",""),
+
+    ZLJYRY("质量检验人员","6663",""),
+
+    XMFZR("项目负责人","6664",""),
+
+    LHJYRY("理化检验人员","6665",""),
+
+    HYRY("化验人员","6666",""),
+
+    JYJCQYFZR("检验检测区域负责人","6667",""),
+
+    AQGLY("安全管理员","6617",""),
+
+    ZLFZR("质量负责人","质量负责人",""),
+
+    ZRS("责任师","责任师",""),
+
+    JCARY("检查人员","责任师",""),
 
 
     //质量保证体系人员（非字典表字段，后期修改code）

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SkjsUserCountItemDto.java

@@ -71,6 +71,71 @@ public class SkjsUserCountItemDto {
      */
     private String syaqy;
 
+    /**
+     * 技术负责人
+     */
+    private String jsfzr;
+
+    /**
+     * 设计人员
+     */
+    private String sjry;
+
+    /**
+     * 技术人员
+     */
+    private String jsry;
+
+    /**
+     * 质量检验人员
+     */
+    private String zljyry;
+
+    /**
+     * 项目负责人
+     */
+    private String xmfzr;
+
+    /**
+     * 理化检验人员
+     */
+    private String lhjyry;
+
+    /**
+     * 化验人员
+     */
+    private String hyry;
+
+    /**
+     * 检验检测区域负责人
+     */
+    private String jyjcqyfzr;
+
+    /**
+     * 质量保证体系人员
+     */
+    private String zlbztxry;
+
+    /**
+     * 安全管理员
+     */
+    private String aqgly;
+
+    /**
+     * 质量负责人
+     */
+    private String zlfzr;
+
+    /**
+     * 责任师
+     */
+    private String zrs;
+
+    /**
+     * 检查人员
+     */
+    private String jcary;
+
     public void setDefaultValues() {
         this.zyry = "0";
         this.jyry = "0";
@@ -81,5 +146,18 @@ public class SkjsUserCountItemDto {
         this.syzyfzr = "0";
         this.syaqzj = "0";
         this.syaqy = "0";
+        this.jsfzr = "0";
+        this.sjry = "0";
+        this.jsry = "0";
+        this.zljyry = "0";
+        this.xmfzr = "0";
+        this.lhjyry = "0";
+        this.hyry = "0";
+        this.jyjcqyfzr = "0";
+        this.zlbztxry = "0";
+        this.aqgly = "0";
+        this.zlfzr = "0";
+        this.zrs = "0";
+        this.jcary = "0";
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -3667,7 +3667,7 @@ public class JGDPStatisticsServiceImpl {
             regionModelDto.setRegionCode(r.getRegionCode().toString());
             regionModelDto.setRegionName(r.getRegionName());
             regionModelDto.setLevel(r.getLevel());
-            regionModelDto.setParentRegionCode(r.getParentRegionCode().toString());
+            regionModelDto.setParentRegionCode(Objects.toString(r.getParentRegionCode()));
             regionModelsDto.add(regionModelDto);
         });
         if (orgCodeP == null || regionModels.isEmpty()) {
@@ -3873,6 +3873,32 @@ public class JGDPStatisticsServiceImpl {
                 int syaqzj = countDtos.stream().filter(c -> (c.getKeyStr().contains(COMPANY_TYPE_USE) || c.getKeyStr().contains(COMPANY_TYPE_PERSON)) && c.getKeyStr().contains(UserPostEnum.AQZJ.getCode())).mapToInt(CountDto::getIntValue).sum();
                 // 使用单位[使用单位、个人主体]-安全员
                 int syaqy = countDtos.stream().filter(c -> (c.getKeyStr().contains(COMPANY_TYPE_USE) || c.getKeyStr().contains(COMPANY_TYPE_PERSON)) && c.getKeyStr().contains(UserPostEnum.AQY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 技术负责人
+                int jsfzr = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.JSFZR.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 设计人员
+                int sjry = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.SJRY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 技术人员
+                int jsry = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.JSRY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 质量检验人员
+                int zljyry = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.ZLJYRY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 项目负责人
+                int xmfzr = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.XMFZR.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 理化检验人员
+                int lhjyry = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.LHJYRY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 化验人员
+                int hyry = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.HYRY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 检验检测区域负责人
+                int jyjcqyfzr = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.JYJCQYFZR.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 质量保证体系人员
+                int zlbztxry = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.ZLBZTXRY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 安全管理员
+                int aqgly = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.AQGLY.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 质量负责人
+                int zlfzr = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.ZLFZR.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 责任师
+                int zrs = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.ZRS.getCode())).mapToInt(CountDto::getIntValue).sum();
+                // 检查人员
+                int jcary = countDtos.stream().filter(c -> c.getKeyStr().contains(UserPostEnum.JCARY.getCode())).mapToInt(CountDto::getIntValue).sum();
                 userCountItemDto.setZyry(String.valueOf(zyry));
                 userCountItemDto.setJyry(String.valueOf(jyry));
                 userCountItemDto.setJcry(String.valueOf(jcyr));
@@ -3882,6 +3908,19 @@ public class JGDPStatisticsServiceImpl {
                 userCountItemDto.setSyzyfzr(String.valueOf(syzyfzr));
                 userCountItemDto.setSyaqzj(String.valueOf(syaqzj));
                 userCountItemDto.setSyaqy(String.valueOf(syaqy));
+                userCountItemDto.setJsfzr(String.valueOf(jsfzr));
+                userCountItemDto.setSjry(String.valueOf(sjry));
+                userCountItemDto.setJsry(String.valueOf(jsry));
+                userCountItemDto.setZljyry(String.valueOf(zljyry));
+                userCountItemDto.setXmfzr(String.valueOf(xmfzr));
+                userCountItemDto.setLhjyry(String.valueOf(lhjyry));
+                userCountItemDto.setHyry(String.valueOf(hyry));
+                userCountItemDto.setJyjcqyfzr(String.valueOf(jyjcqyfzr));
+                userCountItemDto.setZlbztxry(String.valueOf(zlbztxry));
+                userCountItemDto.setAqgly(String.valueOf(aqgly));
+                userCountItemDto.setZlfzr(String.valueOf(zlfzr));
+                userCountItemDto.setZrs(String.valueOf(zrs));
+                userCountItemDto.setJcary(String.valueOf(jcary));
             } else {
                 userCountItemDto.setDefaultValues();
             }
@@ -3907,6 +3946,19 @@ public class JGDPStatisticsServiceImpl {
         summary.setSyzyfzr(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getSyzyfzr())).sum()));
         summary.setSyaqzj(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getSyaqzj())).sum()));
         summary.setSyaqy(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getSyaqy())).sum()));
+        summary.setJsfzr(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getJsfzr())).sum()));
+        summary.setSjry(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getSjry())).sum()));
+        summary.setJsry(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getJsry())).sum()));
+        summary.setZljyry(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getZljyry())).sum()));
+        summary.setXmfzr(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getXmfzr())).sum()));
+        summary.setLhjyry(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getLhjyry())).sum()));
+        summary.setHyry(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getHyry())).sum()));
+        summary.setJyjcqyfzr(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getJyjcqyfzr())).sum()));
+        summary.setZlbztxry(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getZlbztxry())).sum()));
+        summary.setAqgly(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getAqgly())).sum()));
+        summary.setZlfzr(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getZlfzr())).sum()));
+        summary.setZrs(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getZrs())).sum()));
+        summary.setJcary(String.valueOf(countItems.stream().mapToLong(e -> Long.parseLong(e.getJcary())).sum()));
         countItems.add(summary);
     }