From cf954c94305134629ebba24e86ca5bc06572f401 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Thu, 27 Mar 2025 09:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfAqjdxxController.java | 18 ++++++++++++++++++ .../com/kms/yg/df/domain/BsSgcDfAqjdxx.java | 13 +++++++++++++ .../java/com/kms/yg/df/domain/dto/DfrwDto.java | 1 + .../kms/yg/df/service/BsSgcDfDfrwService.java | 1 + .../sz/controller/BsSgcSzAqjdxxController.java | 17 +++++++++++++++++ .../com/kms/yg/sz/domain/BsSgcSzAqjdxx.java | 13 +++++++++++++ .../java/com/kms/yg/sz/domain/dto/SzrwDto.java | 2 ++ .../kms/yg/sz/service/BsSgcSzSzrwService.java | 1 + .../mapper/yg/df/BsSgcDfBzbpMapper.xml | 2 +- .../mapper/yg/sz/BsSgcSzBzbpMapper.xml | 2 +- 10 files changed, 68 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java index ecdf2807..80425cc4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java @@ -1,6 +1,10 @@ package com.kms.yg.df.controller; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; @@ -15,12 +19,14 @@ 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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -59,6 +65,18 @@ public class BsSgcDfAqjdxxController extends BaseController @ApiOperation("水闸安全鉴定信息列表") public IPage list(@RequestBody SearchParam sp) { + + BsSgcDfAqjdxx data = sp.getData(); + if (StringUtils.isNotEmpty(data.getDikeCode())){ + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + lw.eq(BsSgcDfAqjdxx::getRemark,data.getDikeCode()); + if(ObjectUtil.isNotEmpty(data.getIdentifyTime())){ + lw.eq(BsSgcDfAqjdxx::getIdentifyTime,data.getIdentifyTime()); + } + Pagepa=new Page<>(sp.getPageNum(),sp.getPageSize()); + Page page = bsSgcSzAqjdxxService.page(pa, lw); + return page; + } return bsSgcSzAqjdxxService.selectPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java index 28ea790d..5b8a0a0b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java @@ -1,5 +1,6 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.shuili.common.annotation.Excel; @@ -136,4 +137,16 @@ public class BsSgcDfAqjdxx extends BaseEntity @ApiModelProperty("安全鉴定意见") private String relation; + private String remark; + + + @TableField(exist = false) + private String dikeCode; + + + @TableField(exist = false) + private Date startTime; + + @TableField(exist = false) + private Date endDateTime; } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java index 40ed8e62..33686a58 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java @@ -15,6 +15,7 @@ public class DfrwDto { private String taskName; private String dikeName; + private String dikeCode; private String dikeType; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java index bdd913e2..e4d45536 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java @@ -64,6 +64,7 @@ public class BsSgcDfDfrwService extends BaseService sp) { + + BsSgcSzAqjdxx data = sp.getData(); + if (StringUtils.isNotEmpty(data.getWagaCode())){ + LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); + if(ObjectUtil.isNotEmpty(data.getIdentifyTime())){ + lw.eq(BsSgcSzAqjdxx::getIdentifyTime,data.getIdentifyTime()); + } + lw.eq(BsSgcSzAqjdxx::getRemark,data.getWagaCode()); + Page pa=new Page<>(sp.getPageNum(),sp.getPageSize()); + Page page = bsSgcSzAqjdxxService.page(pa, lw); + return page; + } return bsSgcSzAqjdxxService.selectPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjdxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjdxx.java index a3d0e653..eede05cb 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjdxx.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjdxx.java @@ -1,6 +1,8 @@ package com.kms.yg.sz.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -138,4 +140,15 @@ public class BsSgcSzAqjdxx extends BaseEntity @ApiModelProperty("安全鉴定意见") private String relation; + private String remark; + + @TableField(exist = false) + private String wagaCode; + + @TableField(exist = false) + private Date startTime; + + @TableField(exist = false) + private Date endDateTime; + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java index fd405177..65194a4a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java @@ -16,6 +16,8 @@ public class SzrwDto { private String wagaName; + private String wagaCode; + private String wagaType; private String adcd; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java index ba2ed0b0..49096b26 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java @@ -62,6 +62,7 @@ public class BsSgcSzSzrwService extends BaseService SELECT qh.NAME as name,count(1) as num FROM bs_sgc_df_bzbp bp - inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,6) AND RIGHT(qh.XZQHDM, 6) = '000000' + inner join sys_xzqh qh on bp.adcd= LEFT(qh.XZQHDM,4) AND RIGHT(qh.XZQHDM, 4) = '00000000' embankment_name like concat('%', #{embankmentName}, '%') diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml index 325adf8c..1031e043 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml @@ -43,7 +43,7 @@