From 86d04a3cbd1b31a271bf523982ad42ed8c7c1b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Wed, 26 Mar 2025 17:27:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=A7=E5=B1=8F=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/common/dto/ApprovalSearchDto.java | 12 +++++++--- .../yxgh/common/enums/StaticIndexEnum.java | 24 +++++++++---------- .../service/DfCheckingProblemV2Service.java | 3 +-- .../resources/mapper/yxgh/DfYhV2Mapper.xml | 10 ++++++-- .../resources/mapper/yxgh/DwYhV2Mapper.xml | 8 ++++++- .../resources/mapper/yxgh/SzYhV2Mapper.xml | 8 ++++++- 6 files changed, 44 insertions(+), 21 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java index 97368c59..23d50ca7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java @@ -9,7 +9,11 @@ import org.springframework.util.StringUtils; @ApiModel("审批搜索") @Data -public class ApprovalSearchDto { +public class ApprovalSearchDto implements IAdcdDeptRole{ + + + @ApiModelProperty(value = "行政区划") + private String adcd; @ApiModelProperty("审批状态") private String status; @@ -26,6 +30,9 @@ public class ApprovalSearchDto { @ApiModelProperty(value = "堤防编码") private String dikeCode; + @ApiModelProperty(value = "堤防编码") + private String wagaCode; + public String getDikeCode() { if (StringUtils.isEmpty(this.dikeCode)) { this.dikeCode =AuthorityDikeCodeService.getAuthorityDikeCode(); @@ -33,8 +40,7 @@ public class ApprovalSearchDto { return this.dikeCode; } - @ApiModelProperty(value = "水闸编码") - private String wagaCode; + public String getWagaCode() { if (StringUtils.isEmpty(this.wagaCode)) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index c239371e..5ff21e9d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -483,12 +483,12 @@ public enum StaticIndexEnum { Map map =new HashMap<>(); BsSgcSzSzrwService szService = SpringUtils.getBean(BsSgcSzSzrwService.class); int sz = szService.count(new LambdaQueryWrapper() - .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())); + .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, sp.getEndTime())); BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class); int df = dfService.count(new LambdaQueryWrapper() - .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime())); + .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime())); map.put("sum", String.valueOf(sz + df)); return map; }, "个", "0", "0"), @@ -499,15 +499,15 @@ public enum StaticIndexEnum { int sz = service.count(new LambdaQueryWrapper() // 待鉴定 .ne(BsSgcSzSzrw::getStatus, 3) - .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()) + .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, sp.getEndTime()) ); BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class); int df = dfService.count(new LambdaQueryWrapper() // 待鉴定 .ne(BsSgcDfDfrw::getStatus, 3) - .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime()) + .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime()) ); map.put("sum", String.valueOf(sz + df)); return map; @@ -518,14 +518,14 @@ public enum StaticIndexEnum { BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class); int count = service.count(new LambdaQueryWrapper() .eq(BsSgcSzSzrw::getStatus, 3) - .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()) + .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getPlanTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getPlanTime, sp.getEndTime()) ); BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class); int dfCount = dfService.count(new LambdaQueryWrapper() .eq(BsSgcDfDfrw::getStatus, 3) - .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime()) + .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getPlanTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getPlanTime, sp.getEndTime()) ); map.put("sum", String.valueOf(count + dfCount)); return map; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java index f0f51d6c..98e7ef86 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -55,8 +55,7 @@ public class DfCheckingProblemV2Service extends BaseService list(SearchParam sp) { - DfRecordSearchV2Dto data = sp.getData(); - if (ObjectUtils.isEmpty(data)) { + if (ObjectUtils.isEmpty(sp.getData())) { return new Page<>(); } // 分页参数 diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml index 0dd89db8..23607022 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -36,13 +36,14 @@ jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status FROM bs_sgc_sp_task ts LEFT JOIN bs_sgc_df_xcyj jl ON jl.id = ts.form_id + LEFT JOIN att_dike_base base on base.dike_code=jl.dike_code WHERE ts.business_type = #{dto.businessType} and ts.status in ('1','2') AND ts.status = #{dto.status} - + AND jl.name LIKE CONCAT('%',#{dto.condition.name},'%') @@ -66,9 +67,12 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} - + AND jl.dike_code = #{dto.dikeCode} + + and base.adcd like concat(#{dto.adcdQx}, '%') + ORDER BY jl.update_time DESC @@ -84,6 +88,7 @@ + @@ -100,6 +105,7 @@ yh.dike_code , yh.dike_name , yh.start_date , + yh.end_date , yh.problem_level , yh.duty_holder_name , yh.record_id diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml index ec229512..53a15bf2 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml @@ -34,6 +34,7 @@ jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status FROM bs_sgc_sp_task ts LEFT JOIN bs_sgc_dw_xcyj jl ON jl.id = ts.form_id + LEFT JOIN att_dike_base base on base.dike_code=jl.dike_code WHERE ts.business_type = #{dto.businessType} and ts.status in ('1','2') @@ -64,9 +65,12 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} - + AND jl.dike_code = #{dto.dikeCode} + + and base.adcd like concat(#{dto.adcdQx}, '%') + ORDER BY jl.update_time DESC @@ -84,6 +88,7 @@ + @@ -100,6 +105,7 @@ yh.dike_code , yh.dike_name , yh.start_date , + yh.start_date , yh.problem_level , yh.duty_holder_name , yh.record_id diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml index dc474b3f..9b6bfb39 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml @@ -36,6 +36,7 @@ jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status FROM bs_sgc_sp_task ts LEFT JOIN bs_sgc_sz_xcyj jl ON jl.id = ts.form_id + LEFT JOIN att_waga_base base on base.waga_code=jl.waga_code WHERE ts.business_type = #{dto.businessType} and ts.status in ('1','2') @@ -66,9 +67,12 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} - + AND jl.waga_code = #{dto.wagaCode} + + and base.adcd like concat(#{dto.adcdQx}, '%') + ORDER BY jl.update_time DESC @@ -84,6 +88,7 @@ + @@ -100,6 +105,7 @@ yh.waga_code , yh.waga_name , yh.start_date , + yh.end_date , yh.problem_level , yh.duty_holder_name , yh.record_id