From 08f37e3940c1eb9c59541cc45e0b1afd6e039ff9 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Tue, 1 Apr 2025 15:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfFzrController.java | 13 ++++++--- .../controller/BsSgcDfSafeJbxxController.java | 11 +++++--- .../kms/yg/df/mapper/BsSgcDfFzrMapper.java | 12 ++++++--- .../kms/yg/df/service/BsSgcDfFzrService.java | 17 ++++++++---- .../kms/yg/df/service/BsSgcDfJfglService.java | 2 +- .../sz/controller/BsSgcSzFzrController.java | 13 ++++++++- .../controller/BsSgcSzSafeJbxxController.java | 9 +++++-- .../kms/yg/sz/mapper/BsSgcSzFzrMapper.java | 11 +++++--- .../kms/yg/sz/service/BsSgcSzFzrService.java | 16 +++++++---- .../mapper/yg/df/BsSgcDfFzrMapper.xml | 27 ++++++++++++++++++- .../mapper/yg/sz/BsSgcSzFzrMapper.xml | 26 +++++++++++++++++- 11 files changed, 126 insertions(+), 31 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java index 6d5f89d5..0bb82904 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java @@ -15,6 +15,7 @@ import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,11 +61,17 @@ public class BsSgcDfFzrController extends BaseController { @GetMapping("/getHistogram") public HashMap> getHistogram() { + BsSgcDfFzr bsSgcDfFzr=new BsSgcDfFzr(); + HashMap> dto=new HashMap<>(); + if (StringUtils.isEmpty(bsSgcDfFzr.getDikeCode())&&StringUtils.isEmpty(bsSgcDfFzr.getAdcdQx())){ + return dto; + } + if (StringUtils.isNotEmpty(bsSgcDfFzr.getDikeCode())){ + return bsSgcSzFzrService.getHistogram(null, null,bsSgcDfFzr.getDikeCode()); + } Integer layer = sysXzqhService.getLayer(); String xzqh = sysXzqhService.getXzqh(); - HashMap> dto = bsSgcSzFzrService.getHistogram(layer, xzqh); - - + dto = bsSgcSzFzrService.getHistogram(layer, xzqh,null); return dto; } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index 5d73b43a..85e41f1f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java @@ -146,16 +146,19 @@ public class BsSgcDfSafeJbxxController extends BaseController { @PostMapping("/listByStatus") public IPage listByStatus(@RequestBody SearchParam sp) { BsSgcDfSafeJbxx data = sp.getData(); - - Page page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Page page=new Page<>(); + if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } + page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).apply("1=1").like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName()) // .eq(BsSgcDfSafeJbxx::getStatus, "1").or().eq(BsSgcDfSafeJbxx::getStatus, "4").or().eq(BsSgcDfSafeJbxx::getHzStatus, "0") // .or().eq(BsSgcDfSafeJbxx::getZxStatus, "0") - + .eq(StringUtils.isNotEmpty(data.getDikeCode()),BsSgcDfSafeJbxx::getDikeCode,data.getDikeCode()) .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType()) .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus()) .isNull(BsSgcDfSafeJbxx::getExprDate) - .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd())) + .likeRight(StringUtils.isNotEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode()), BsSgcDfSafeJbxx::getAdcd, data.getAdcdQx()) .apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')") .orderByDesc(BsSgcDfSafeJbxx::getCreateTime)); return page; diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java index b5907245..d3ee78ea 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java @@ -43,15 +43,19 @@ public interface BsSgcDfFzrMapper extends BaseMapper { @Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("dikeName")String dikeName); - List> getPercent(); + List> getPercent(@Param("adcd")String adcd, + @Param("dikeCode")String dikeCode); List getType1(@Param("layer") Integer layer, - @Param("adcd") String adcd); + @Param("adcd") String adcd, + @Param("dikeCode")String dikeCode); List getType2(@Param("layer") Integer layer, - @Param("adcd") String adcd); + @Param("adcd") String adcd, + @Param("dikeCode")String dikeCode); List getType3(@Param("layer") Integer layer, - @Param("adcd") String adcd); + @Param("adcd") String adcd, + @Param("dikeCode")String dikeCode); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java index 870597d5..94b5a0b0 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java @@ -76,8 +76,15 @@ public class BsSgcDfFzrService extends BaseService } public MapgetPercent(){ + BsSgcDfFzr bsSgcDfFzr=new BsSgcDfFzr(); MappercentMap=new HashMap<>(); - List> percent = bsSgcDfFzrMapper.getPercent(); + String adcdQx = bsSgcDfFzr.getAdcdQx(); + String dikeCode = bsSgcDfFzr.getDikeCode(); + if (StringUtils.isEmpty(bsSgcDfFzr.getDikeCode())&&StringUtils.isEmpty(bsSgcDfFzr.getAdcdQx())){ + return percentMap; + } + + List> percent = bsSgcDfFzrMapper.getPercent(bsSgcDfFzr.getAdcdQx(),bsSgcDfFzr.getDikeCode()); if (CollectionUtil.isNotEmpty(percent)) { for (Map map : percent) { percentMap.put((String) map.get("name"),(BigDecimal) map.get("score")); @@ -113,15 +120,15 @@ public class BsSgcDfFzrService extends BaseService } - public HashMap> getHistogram(Integer layer, String xzqh) { + public HashMap> getHistogram(Integer layer, String xzqh,String dikeCode) { //获取政府责任人 - List listType1 = bsSgcDfFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh)); + List listType1 = bsSgcDfFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh),dikeCode); //获取主管部门责任人 - List listType2 = bsSgcDfFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh)); + List listType2 = bsSgcDfFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh),dikeCode); //获取管理单位责任人 - List listType3 = bsSgcDfFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh)); + List listType3 = bsSgcDfFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh),dikeCode); List pieDtos = new ArrayList<>(); pieDtos.addAll(listType1); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java index 8a9e168a..2b33512c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java @@ -42,7 +42,7 @@ public class BsSgcDfJfglService extends BaseService list= bsSgcDfJfglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getDikeCode()); + data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize(),data.getDikeCode()); page.setRecords(list); 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 adae0dfa..82796ca9 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfFzr; import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.service.BsSgcSzFzrService; @@ -14,6 +15,7 @@ import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -53,11 +55,20 @@ public class BsSgcSzFzrController extends BaseController @GetMapping("/getHistogram") public HashMap> getHistogram() { + + BsSgcSzFzr bsSgcSzFzr=new BsSgcSzFzr(); + HashMap> dto=new HashMap<>(); + if (StringUtils.isEmpty(bsSgcSzFzr.getWagaCode())&&StringUtils.isEmpty(bsSgcSzFzr.getAdcdQx())){ + return dto; + } + if (StringUtils.isNotEmpty(bsSgcSzFzr.getWagaCode())){ + return bsSgcSzFzrService.getHistogram(null, null,bsSgcSzFzr.getWagaCode()); + } Integer layer = sysXzqhService.getLayer(); String xzqh = sysXzqhService.getXzqh(); - HashMap> dto = bsSgcSzFzrService.getHistogram(layer, xzqh); + dto = bsSgcSzFzrService.getHistogram(layer, xzqh,null); 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 aaf67c6c..ec327a38 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 @@ -146,14 +146,19 @@ public class BsSgcSzSafeJbxxController extends BaseController { @PostMapping("/listByStatus") public IPage listByStatus(@RequestBody SearchParam sp) { BsSgcSzSafeJbxx data = sp.getData(); + Page page=new Page<>(); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } - Page page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) // .eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0") // .or().eq(BsSgcSzSafeJbxx::getZxStatus,"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())) + .eq(StringUtils.isNotEmpty(data.getWagaCode()),BsSgcSzSafeJbxx::getWagaCode,data.getWagaCode()) + .likeRight(StringUtils.isNotEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode()), BsSgcSzSafeJbxx::getAdcd, data.getAdcdQx()) .apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')") .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java index 3c20e798..b5b51971 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java @@ -42,14 +42,17 @@ public interface BsSgcSzFzrMapper extends BaseMapper { @Param("pageNum") int pageNum, @Param("pageSize") int pageSize); - List>getPercent(); + List>getPercent(@Param("wagaCode")String wagaCode,@Param("adcd")String adcd); List getType1(@Param("layer") Integer layer, - @Param("adcd") String adcd); + @Param("adcd") String adcd, + @Param("wagaCode")String wagaCode); List getType2(@Param("layer") Integer layer, - @Param("adcd") String adcd); + @Param("adcd") String adcd, + @Param("wagaCode")String wagaCode); List getType3(@Param("layer") Integer layer, - @Param("adcd") String adcd); + @Param("adcd") String adcd, + @Param("wagaCode")String wagaCode); } 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 460977ff..d28a4854 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfFzr; import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper; @@ -77,7 +78,12 @@ public class BsSgcSzFzrService extends BaseService } public MapgetPercent(){ MappercentMap=new HashMap<>(); - List> percent = bsSgcSzFzrMapper.getPercent(); + BsSgcSzFzr bsSgcSzFzr=new BsSgcSzFzr(); + if (StringUtils.isEmpty(bsSgcSzFzr.getWagaCode())&&StringUtils.isEmpty(bsSgcSzFzr.getAdcdQx())){ + return percentMap; + } + + List> percent = bsSgcSzFzrMapper.getPercent(bsSgcSzFzr.getWagaCode(),bsSgcSzFzr.getAdcdQx()); if (CollectionUtil.isNotEmpty(percent)) { for (Map map : percent) { percentMap.put((String) map.get("name"), (BigDecimal) map.get("score")); @@ -115,15 +121,15 @@ public class BsSgcSzFzrService extends BaseService } - public HashMap> getHistogram(Integer layer, String xzqh) { + public HashMap> getHistogram(Integer layer, String xzqh,String wagaCode) { //获取政府责任人 - List listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh)); + List listType1 = bsSgcSzFzrMapper.getType1(layer, sysXzqhService.getSubString(xzqh),wagaCode); //获取主管部门责任人 - List listType2 = bsSgcSzFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh)); + List listType2 = bsSgcSzFzrMapper.getType2(layer, sysXzqhService.getSubString(xzqh),wagaCode); //获取管理单位责任人 - List listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh)); + List listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh),wagaCode); List pieDtos = new ArrayList<>(); pieDtos.addAll(listType1); diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml index ac84960b..80dcda93 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml @@ -98,6 +98,15 @@ ) AS subquery LEFT JOIN sys_xzqh xzqh ON LEFT(xzqh.XZQHDM, 6) = subquery.adcd and RIGHT(xzqh.XZQHDM, 6)='000000' + + 1=1 + + and subquery.adcd like concat(#{adcd},'%') + + + and subquery.dike_CODE=#{dikeCode} + + GROUP BY xzqh.NAME; @@ -105,6 +114,7 @@ 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 a1236ba2..4e57309f 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -99,16 +99,26 @@ WHERE fzr.type = '0' GROUP BY - db.adcd, fzr.waga_code + db.adcd, waga_code ) AS subquery LEFT JOIN sys_xzqh xzqh ON LEFT(xzqh.XZQHDM, 6) = subquery.adcd and RIGHT(xzqh.XZQHDM, 6)='000000' + + 1=1 + + and subquery.adcd like concat(#{adcd},'%') + + + and subquery.WAGA_CODE=#{wagaCode} + + GROUP BY xzqh.NAME;