运管开发

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java

@@ -2,6 +2,7 @@ package com.kms.yg.sz.controller;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,12 +68,12 @@ public class BsSgcSzFzrController extends BaseController
 
 
     @GetMapping("/getHistogram")
-    public HistogramDto getHistogram() {
+    public HashMap<String, HashMap<String,String>> getHistogram() {
         Integer layer = sysXzqhService.getLayer();
 
         String xzqh = sysXzqhService.getXzqh();
 
-        HistogramDto dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
+        HashMap<String, HashMap<String,String>> dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
 
 
         return dto;

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@@ -113,6 +113,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
         BsSgcSzSafeJbxx data = sp.getData();
         Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                 Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
+                        .ne(BsSgcSzSafeJbxx::getStatus,"0")
                         .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                         .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
                         .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))

shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java

@@ -11,4 +11,6 @@ public class PieDto {
     private String num;
 
     private String status;
+
+    private String type;
 }

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java

@@ -93,7 +93,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
 
     }
 
-    public HistogramDto getHistogram(Integer layer, String xzqh) {
+    public HashMap<String, HashMap<String,String>> getHistogram(Integer layer, String xzqh) {
         //获取政府责任人
         List<PieDto> listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh));
 
@@ -103,31 +103,34 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
         //获取管理单位责任人
         List<PieDto> listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh));
 
-        HistogramDto dto = new HistogramDto();
+        List<PieDto> pieDtos = new ArrayList<>();
+        pieDtos.addAll(listType1);
 
-        HashMap<String, List<String>> map = new HashMap<>();
+        pieDtos.addAll(listType2);
+        pieDtos.addAll(listType3);
 
-        for (PieDto pieDto : listType1) {
-            ArrayList<String> list = new ArrayList<>();
-            list.add(pieDto.getNum());
+        HashMap<String, HashMap<String,String>> map = new HashMap<>();
 
-            for (PieDto p : listType2) {
-                if (p.getName().equals(pieDto.getName())) {
-                    list.add(p.getNum());
-                }
-            }
-            for (PieDto p2 : listType3) {
-                if (p2.getName().equals(pieDto.getName())) {
-                    list.add(p2.getNum());
+        for (int i = 0; i < pieDtos.size(); i++) {
+            List<HashMap<String, String>> hashMaps = new ArrayList<>();
+            HashMap<String, String> hashMap = new HashMap<>();
+            hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
+            hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
+            for (int j = 0; j < pieDtos.size(); j++) {
+                if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
+
+                    hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
                 }
             }
+            map.put(pieDtos.get(i).getName(), hashMap);
 
-            map.put(pieDto.getName(), list);
         }
 
-        dto.setMap(map);
 
-        return dto;
+
+
+
+        return map;
 
     }
 }

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java

@@ -102,7 +102,7 @@ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, B
             hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
             for (int j = 0; j < pieDtos.size(); j++) {
                 if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getStatus().equals(pieDtos.get(i).getStatus())) {
-                    hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
+//                    hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
                     hashMap.put(pieDtos.get(j).getStatus(), pieDtos.get(j).getNum());
                 }
             }

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml

@@ -5,13 +5,11 @@
 <mapper namespace="com.kms.yg.sz.mapper.BsSgcSzAqrwMapper">
 
     <sql id="info">
-        SELECT
-            sx.`NAME`,
-            COUNT( 1 ) num
-        FROM
-            bs_sgc_sz_szrw ss
-                LEFT JOIN bs_sgc_sz_safe_jbxx sj ON sj.id = ss.WAGA_ID
-                LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM
+        SELECT sx.`NAME`,
+               COUNT(1) num
+        FROM bs_sgc_sz_szrw ss
+                 LEFT JOIN bs_sgc_sz_safe_jbxx sj ON sj.id = ss.WAGA_ID
+                 LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM
     </sql>
     <resultMap id="NumDto" type="NumDto">
         <result property="name" column="name"/>

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

@@ -14,7 +14,8 @@
 
     <sql id="getHistogram">
         select sx.name,
-               count(1) num
+               count(1) num,
+               sf.type
         from bs_sgc_sz_fzr sf
                  left join bs_sgc_sz_safe_jbxx sj on sf.waga_id = sj.id
                  left join sys_xzqh sx on sj.adcd=sx.xzqhdm
@@ -24,6 +25,7 @@
     <resultMap type="pieDto" id="pieDto">
         <result property="name" column="name"/>
         <result property="num" column="num"/>
+        <result property="type" column="type"/>
     </resultMap>