From 9b2e0275edbc4d3521b93429f9037c2f364aa227 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Thu, 3 Apr 2025 18:22:02 +0800 Subject: [PATCH] =?UTF-8?q?4.3=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfAqrwController.java | 32 +++++++++++-- .../kms/yg/df/service/BsSgcDfAqrwService.java | 8 ++-- .../sz/controller/BsSgcSzAqrwController.java | 23 +++++++++ .../com/kms/yg/sz/domain/dto/AqrwDto.java | 5 +- .../kms/yg/sz/mapper/BsSgcSzAqrwMapper.java | 4 ++ .../kms/yg/sz/service/BsSgcSzAqrwService.java | 16 +++++-- .../mapper/yg/df/BsSgcDfAqrwMapper.xml | 39 +++++++-------- .../mapper/yg/sz/BsSgcSzAqrwMapper.xml | 47 ++++++++++--------- 8 files changed, 120 insertions(+), 54 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java index 4dec8ced..d9e1a510 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java @@ -1,5 +1,6 @@ package com.kms.yg.df.controller; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,11 +9,20 @@ import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfAqjc; +import com.kms.yg.df.domain.BsSgcDfAqjdxx; import com.kms.yg.df.domain.BsSgcDfAqrw; import com.kms.yg.df.domain.BsSgcDfDfrw; +import com.kms.yg.df.service.BsSgcDfAqjcService; +import com.kms.yg.df.service.BsSgcDfAqjdxxService; import com.kms.yg.df.service.BsSgcDfAqrwService; import com.kms.yg.df.service.BsSgcDfDfrwService; +import com.kms.yg.sz.domain.BsSgcSzAqjc; +import com.kms.yg.sz.domain.BsSgcSzAqjdxx; +import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.domain.dto.AqrwDto; +import com.kms.yg.sz.service.BsSgcSzAqjcService; +import com.kms.yg.sz.service.BsSgcSzAqjdxxService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -51,9 +61,13 @@ public class BsSgcDfAqrwController extends BaseController private SysDeptService sysDeptService; @Autowired - private BsSgcDfDfrwService bsSgcDfDfrwService; + private BsSgcDfDfrwService bsSgcDfrwService; + @Autowired + private BsSgcDfAqjdxxService bsSgcDfAqjdxxService; + @Autowired + private BsSgcDfAqjcService bsSgcDfAqjcService; @GetMapping("/getLevel/{taskId}") public AjaxResult getLevel(@PathVariable String taskId) { @@ -203,9 +217,21 @@ public class BsSgcDfAqrwController extends BaseController public AjaxResult remove(@PathVariable String[] ids) { for (String id:ids){ - LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); lw.eq(BsSgcDfDfrw::getTaskId,id); - bsSgcDfDfrwService.remove(lw); + List list = bsSgcDfrwService.list(lw); + if(CollectionUtil.isNotEmpty(list)) { + for (BsSgcDfDfrw dfrw:list) { + LambdaQueryWrapper jdxxLw = new LambdaQueryWrapper<>(); + jdxxLw.eq(BsSgcDfAqjdxx::getDfrwId,dfrw.getId()); + bsSgcDfAqjdxxService.remove(jdxxLw); + + LambdaQueryWrapperaqjcLw=new LambdaQueryWrapper<>(); + aqjcLw.eq(BsSgcDfAqjc::getDfrwId,dfrw.getId()); + bsSgcDfAqjcService.remove(aqjcLw); + } + } + bsSgcDfrwService.remove(lw); } return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids))); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java index 3917750b..41b66c0c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java @@ -192,25 +192,25 @@ public class BsSgcDfAqrwService extends BaseService lw=new LambdaQueryWrapper<>(); lw.eq(BsSgcSzSzrw::getTaskId,id); + List list = bsSgcSzSzrwService.list(lw); + if(CollectionUtil.isNotEmpty(list)) { + for (BsSgcSzSzrw szrw:list) { + LambdaQueryWrapper jdxxLw = new LambdaQueryWrapper<>(); + jdxxLw.eq(BsSgcSzAqjdxx::getSzrwId,szrw.getId()); + bsSgcSzAqjdxxService.remove(jdxxLw); + + LambdaQueryWrapperaqjcLw=new LambdaQueryWrapper<>(); + aqjcLw.eq(BsSgcSzAqjc::getSzrwId,szrw.getId()); + bsSgcSzAqjcService.remove(aqjcLw); + } + } bsSgcSzSzrwService.remove(lw); } return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids))); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java index 8927907a..4df3b622 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java @@ -25,6 +25,8 @@ public class AqrwDto { private int three; + private int four; + private String rate; public void setTotal() { @@ -32,6 +34,7 @@ public class AqrwDto { } public void setRate() { - this.rate = String.valueOf(this.threeNum/this.total); + Double i = Double.valueOf(this.threeNum) / Double.valueOf(this.total); + this.rate = String.valueOf(i); } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java index 7e078c54..3fd1341a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java @@ -51,6 +51,10 @@ public interface BsSgcSzAqrwMapper extends BaseMapper { @Param("layer") Integer layer, @Param("taskId") String taskId); + List getFour(@Param("adcd") String subString, + @Param("layer") Integer layer, + @Param("taskId") String taskId); + Map getStatistics(@Param("startDate") String startDate,@Param("endDate")String endDate, @Param("adcd")String xzqh,@Param("layer")String layer); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java index 8635b7c7..890213e7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java @@ -187,27 +187,28 @@ public class BsSgcSzAqrwService extends BaseService one = bsSgcSzAqrwMapper.getOne(sysXzqhService.getSubString(adcd), layer,taskId); List two = bsSgcSzAqrwMapper.getTwo(sysXzqhService.getSubString(adcd), layer,taskId); List three = bsSgcSzAqrwMapper.getThree(sysXzqhService.getSubString(adcd), layer,taskId); + List four = bsSgcSzAqrwMapper.getFour(sysXzqhService.getSubString(adcd), layer,taskId); for (AqrwDto aqrwDto : dtoList) { @@ -262,6 +264,12 @@ public class BsSgcSzAqrwService extends BaseService + + SELECT sx.`NAME`, + COUNT(1) num + FROM bs_sgc_df_dfrw ss + LEFT JOIN bs_sgc_df_aqjdxx jdxx on jdxx.dfrw_id =ss.ID + LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code + LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.XZQHDM,6) AND RIGHT(sx.XZQHDM, 6) = '000000' + + @@ -70,34 +79,22 @@ - - where task_id =#{taskId} and sj.`security_category`="0" - + + where task_id =#{taskId} and jdxx.`security_category`=0 GROUP BY LEFT(sj.adcd,4) - - - GROUP BY sj.adcd - + + +