当年主体单位隐患排名

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/ZBGLStatisticsMapper.java

@@ -29,4 +29,6 @@ public interface ZBGLStatisticsMapper {
     Map<String,Long> getAYHLXYHSLPMChartData(@Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
 
     List<Map<String,Long>> getAYHLXYHSLPMPageData(@Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
+
+    Map<String, Long> getDNZTDWYHPMChartData(@Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto, @Param("issueTypeList") List<String> issueTypeList);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZBGLStatisticsMapper.xml

@@ -102,6 +102,21 @@
         GROUP BY
             problem_type_code
     </select>
+    <select id="getDNZTDWYHPMChartData" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ) AS allCount,
+               SUM ( CASE problem_status_code WHEN '1' THEN 1 ELSE 0 END ) AS endCount
+        FROM
+            tzs_safety_problem_tracing
+        WHERE
+                governing_body_org_code LIKE concat ( #{dpFilterParamForDetailDto.orgCode}, '%' )
+          AND problem_type_code IN
+              (
+                  <foreach collection="issueTypeList" item="item" separator=",">
+                      #{item}
+                  </foreach>
+              )
+    </select>
 
 
 </mapper>

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/JYJCDPStatisticsServiceImpl.java

@@ -249,8 +249,8 @@ public class JYJCDPStatisticsServiceImpl {
         List<Map<String, String>> typeNameList = UnitTypeEnum.getTypeNameList();
         List<Map<String,Object>> result = new ArrayList<>();
         Map<String,Object> map = new HashMap<>();
-        map.put("title","人员类型");
-        map.put("value","0");
+        map.put("title","人员全部类型");
+        map.put("value","all");
         map.put("children",typeNameList);
         result.add(map);
         return result;

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/ZBGLImpl/DnztdwyhpmServiceImpl.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ZBGLImpl;
 import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
+import com.yeejoin.amos.boot.module.common.api.enums.IssueMainBodyEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.IssueTypeEnum;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.IZBGLService;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZBGLStatisticsMapper;
@@ -28,12 +30,13 @@ public class DnztdwyhpmServiceImpl implements IZBGLService {
     @Override
     public Map<String, Object> getChart(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
         List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(dpFilterParamForDetailDto.getCityCode());
+        List<String> issueTypeList = IssueTypeEnum.getEnumCodeListByMainBody(IssueMainBodyEnum.COMPANY.getCode());
         List<Map<String,Object>> result =  regionModels.parallelStream().map(r -> {
             String orgCode = stCommonService.getAndSetOrgCode(r.getRegionCode()+"");
             DPFilterParamForDetailDto dpFilterParamForDetailDtoNew = new DPFilterParamForDetailDto();
             dpFilterParamForDetailDtoNew.setOrgCode(orgCode);
             Map<String, Object> itemResult = new HashMap<>();
-            Map<String,Long> map = zbglStatisticsMapper.getAYHLXYHSLPMChartData(dpFilterParamForDetailDtoNew);
+            Map<String,Long> map = zbglStatisticsMapper.getDNZTDWYHPMChartData(dpFilterParamForDetailDtoNew,issueTypeList);
             if(map.get("allCount") != 0 && map.get("endCount") != 0){
                 itemResult.put("rate",BigDecimal.valueOf(map.get("endCount")).divide(BigDecimal.valueOf(map.get("allCount")),2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString());
             }else{
@@ -111,6 +114,10 @@ public class DnztdwyhpmServiceImpl implements IZBGLService {
     @Override
     public List<Map<String, String>> getTitle(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
         List<Map<String, String>> list = zbglStatisticsMapper.getTypeList("ISSUE_TYPE");
+        for(int i = 0;i<list.size();i++){
+            list.get(i).put("dataIndex",list.get(i).get("code"));
+            list.get(i).put("title",list.get(i).get("name"));
+        }
         Map<String,String> map = new HashMap<>();
         map.put("dataIndex","area");
         map.put("title","区域");