From 5909b1c56647871de15429189e9bbb564f42e03d Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Fri, 2 Feb 2024 10:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sz/controller/BsSgcSzFzrController.java | 5 ++- .../controller/BsSgcSzSafeJbxxController.java | 1 + .../java/com/kms/yg/sz/domain/dto/PieDto.java | 2 + .../kms/yg/sz/service/BsSgcSzFzrService.java | 37 ++++++++++--------- .../yg/sz/service/BsSgcSzSafeJbxxService.java | 2 +- .../mapper/yg/sz/BsSgcSzAqrwMapper.xml | 12 +++--- .../mapper/yg/sz/BsSgcSzFzrMapper.xml | 4 +- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java index 68ae3714..fd5d29e2 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java +++ b/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> getHistogram() { Integer layer = sysXzqhService.getLayer(); String xzqh = sysXzqhService.getXzqh(); - HistogramDto dto = bsSgcSzFzrService.getHistogram(layer, xzqh); + HashMap> dto = bsSgcSzFzrService.getHistogram(layer, xzqh); return dto; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 3f0453cb..951868fe 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/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 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())) diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java index 1cd6c405..6f399b6f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/PieDto.java +++ b/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; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java index 67ee1c69..974a7226 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java @@ -93,7 +93,7 @@ public class BsSgcSzFzrService extends BaseService } - public HistogramDto getHistogram(Integer layer, String xzqh) { + public HashMap> getHistogram(Integer layer, String xzqh) { //获取政府责任人 List listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh)); @@ -103,31 +103,34 @@ public class BsSgcSzFzrService extends BaseService //获取管理单位责任人 List listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh)); - HistogramDto dto = new HistogramDto(); + List pieDtos = new ArrayList<>(); + pieDtos.addAll(listType1); - HashMap> map = new HashMap<>(); + pieDtos.addAll(listType2); + pieDtos.addAll(listType3); - for (PieDto pieDto : listType1) { - ArrayList list = new ArrayList<>(); - list.add(pieDto.getNum()); + HashMap> 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> hashMaps = new ArrayList<>(); + HashMap 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; } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java index ef628b88..a2d41dfc 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java @@ -102,7 +102,7 @@ public class BsSgcSzSafeJbxxService extends BaseService - 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 diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml index 742e1592..f9f99d25 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -14,7 +14,8 @@ 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 @@ +