From 4ef48080671cc44fac02a552c16408ddecf196fa Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Mon, 31 Mar 2025 20:29:52 +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/BsSgcDfDsjController.java | 2 +- .../df/controller/BsSgcDfFxzzController.java | 3 + .../df/controller/BsSgcDfFzrController.java | 3 +- .../df/controller/BsSgcDfGzscController.java | 1 + .../com/kms/yg/df/domain/BsSgcDfBzhjs.java | 12 +++- .../com/kms/yg/df/domain/BsSgcDfDagl.java | 12 +++- .../java/com/kms/yg/df/domain/BsSgcDfDsj.java | 17 ++++- .../com/kms/yg/df/domain/BsSgcDfGltz.java | 17 ++++- .../com/kms/yg/df/domain/BsSgcDfGzsc.java | 16 ++++- .../com/kms/yg/df/domain/BsSgcDfJfgl.java | 13 +++- .../kms/yg/df/mapper/BsSgcDfDsjMapper.java | 18 +++++ .../kms/yg/df/mapper/BsSgcDfGltzMapper.java | 18 +++++ .../kms/yg/df/mapper/BsSgcDfGzscMapper.java | 18 +++++ .../kms/yg/df/mapper/BsSgcDfJfglMapper.java | 3 +- .../yg/df/service/BsSgcDfBydyzbService.java | 7 +- .../kms/yg/df/service/BsSgcDfBzbpService.java | 5 ++ .../yg/df/service/BsSgcDfBzhjsService.java | 8 ++- .../kms/yg/df/service/BsSgcDfDaglService.java | 15 ++++- .../kms/yg/df/service/BsSgcDfDfrwService.java | 7 +- .../kms/yg/df/service/BsSgcDfDsjService.java | 26 ++++++++ .../kms/yg/df/service/BsSgcDfFxwzService.java | 3 + .../kms/yg/df/service/BsSgcDfFzrService.java | 6 +- .../kms/yg/df/service/BsSgcDfGltzService.java | 26 ++++++++ .../kms/yg/df/service/BsSgcDfGzscService.java | 26 ++++++++ .../kms/yg/df/service/BsSgcDfJfglService.java | 9 ++- .../kms/yg/df/service/BsSgcDfYaxxService.java | 6 +- .../kms/yg/df/service/BsSgcDfYhxxService.java | 6 +- .../sz/controller/BsSgcSzDsjController.java | 3 +- .../sz/controller/BsSgcSzFxzzController.java | 4 ++ .../sz/controller/BsSgcSzGltzController.java | 2 +- .../sz/controller/BsSgcSzGzscController.java | 2 +- .../com/kms/yg/sz/domain/BsSgcSzBzhjs.java | 13 +++- .../com/kms/yg/sz/domain/BsSgcSzDagl.java | 13 +++- .../java/com/kms/yg/sz/domain/BsSgcSzDsj.java | 17 ++++- .../com/kms/yg/sz/domain/BsSgcSzGltz.java | 17 ++++- .../com/kms/yg/sz/domain/BsSgcSzGzsc.java | 16 ++++- .../com/kms/yg/sz/domain/BsSgcSzJfgl.java | 13 +++- .../kms/yg/sz/mapper/BsSgcSzDsjMapper.java | 19 ++++++ .../kms/yg/sz/mapper/BsSgcSzGltzMapper.java | 17 +++++ .../kms/yg/sz/mapper/BsSgcSzGzscMapper.java | 19 ++++++ .../kms/yg/sz/mapper/BsSgcSzJfglMapper.java | 3 +- .../kms/yg/sz/mapper/BsSgcSzYaxxMapper.java | 4 +- .../yg/sz/service/BsSgcSzBydyzbService.java | 6 +- .../kms/yg/sz/service/BsSgcSzBzbpService.java | 3 + .../yg/sz/service/BsSgcSzBzhjsService.java | 9 ++- .../kms/yg/sz/service/BsSgcSzDaglService.java | 16 +++-- .../kms/yg/sz/service/BsSgcSzDsjService.java | 27 ++++++++ .../kms/yg/sz/service/BsSgcSzFxwzService.java | 6 +- .../kms/yg/sz/service/BsSgcSzFzrService.java | 8 ++- .../kms/yg/sz/service/BsSgcSzGltzService.java | 24 +++++++ .../kms/yg/sz/service/BsSgcSzGzscService.java | 26 ++++++++ .../kms/yg/sz/service/BsSgcSzJfglService.java | 8 ++- .../kms/yg/sz/service/BsSgcSzSzrwService.java | 6 +- .../kms/yg/sz/service/BsSgcSzYaxxService.java | 6 +- .../kms/yg/sz/service/BsSgcSzYhxxService.java | 5 +- .../mapper/yg/df/BsSgcDfDsjMapper.xml | 65 +++++++++++++++++++ .../mapper/yg/df/BsSgcDfGltzMapper.xml | 60 +++++++++++++++++ .../mapper/yg/df/BsSgcDfGzscMapper.xml | 59 +++++++++++++++++ .../mapper/yg/df/BsSgcDfJfglMapper.xml | 4 +- .../mapper/yg/sz/BsSgcSzDsjMapper.xml | 65 +++++++++++++++++++ .../mapper/yg/sz/BsSgcSzGltzMapper.xml | 60 +++++++++++++++++ .../mapper/yg/sz/BsSgcSzGzscMapper.xml | 59 +++++++++++++++++ .../mapper/yg/sz/BsSgcSzJfglMapper.xml | 3 + 63 files changed, 925 insertions(+), 65 deletions(-) create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDsjMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGltzMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGzscMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDsjMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGltzMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGzscMapper.xml diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDsjController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDsjController.java index 6b4b1a1a..9e70e51a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDsjController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDsjController.java @@ -53,7 +53,7 @@ public class BsSgcDfDsjController extends BaseController @ApiOperation("堤防工程大事记列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcDfDsjService.selectPage(sp); + return bsSgcDfDsjService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java index 92aa5c1e..1548837e 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java @@ -67,6 +67,9 @@ public class BsSgcDfFxzzController extends BaseController public IPage list(@RequestBody SearchParam sp) { BsSgcDfFxzz data = sp.getData(); + if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return new Page(sp.getPageNum(),sp.getPageSize()); + } LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); if (StringUtils.isNotEmpty(data.getDikeName())){ lw.eq(BsSgcDfFxzz::getDikeName,data.getDikeName()); 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 9e2d4df2..6d5f89d5 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 @@ -61,11 +61,10 @@ public class BsSgcDfFzrController extends BaseController { @GetMapping("/getHistogram") public HashMap> getHistogram() { Integer layer = sysXzqhService.getLayer(); - String xzqh = sysXzqhService.getXzqh(); - HashMap> dto = bsSgcSzFzrService.getHistogram(layer, xzqh); + return dto; } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGzscController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGzscController.java index c52dae70..8d8cc21c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGzscController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGzscController.java @@ -53,6 +53,7 @@ public class BsSgcDfGzscController extends BaseController @ApiOperation("堤防工作手册列表") public IPage list(@RequestBody SearchParam sp) { + return bsSgcDfGzscService.selectPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java index edd009e6..a1542d92 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java @@ -2,12 +2,14 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - +import org.springframework.util.StringUtils; /** @@ -19,7 +21,7 @@ import lombok.Data; @TableName("bs_sgc_df_bzhjs") @Data @ApiModel("堤防标准化建设") -public class BsSgcDfBzhjs extends BaseEntity +public class BsSgcDfBzhjs extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -71,4 +73,10 @@ public class BsSgcDfBzhjs extends BaseEntity @TableField(exist = false) private String adcd; + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.dikeCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java index bbd52598..1260c6df 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java @@ -2,12 +2,14 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - +import org.springframework.util.StringUtils; /** @@ -19,7 +21,7 @@ import lombok.Data; @TableName("bs_sgc_df_dagl") @Data @ApiModel("堤防档案管理") -public class BsSgcDfDagl extends BaseEntity +public class BsSgcDfDagl extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -71,4 +73,10 @@ public class BsSgcDfDagl extends BaseEntity @TableField(exist = false) private String adcd; + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.dikeCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDsj.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDsj.java index 53216675..e16531a2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDsj.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDsj.java @@ -1,14 +1,18 @@ package com.kms.yg.df.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -20,7 +24,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_dsj") @Data @ApiModel("堤防工程大事记") -public class BsSgcDfDsj extends BaseEntity +public class BsSgcDfDsj extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -77,4 +81,13 @@ public class BsSgcDfDsj extends BaseEntity @ApiModelProperty("督促和稽查情况") private String owerDept; + @TableField(exist = false) + private String adcd; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.dikeCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGltz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGltz.java index b016ea17..9f5f6888 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGltz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGltz.java @@ -1,12 +1,15 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_gltz") @Data @ApiModel("堤防管理体制") -public class BsSgcDfGltz extends BaseEntity +public class BsSgcDfGltz extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -54,4 +57,14 @@ public class BsSgcDfGltz extends BaseEntity @ApiModelProperty("附件") private String owerDept; + @TableField(exist = false) + private String adcd; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.dikeCode; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGzsc.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGzsc.java index 9a82559b..3bf0f4b5 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGzsc.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGzsc.java @@ -1,12 +1,15 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_df_gzsc") @Data @ApiModel("堤防工作手册") -public class BsSgcDfGzsc extends BaseEntity +public class BsSgcDfGzsc extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -49,4 +52,13 @@ public class BsSgcDfGzsc extends BaseEntity @ApiModelProperty("操作手册附件") private String owerDept; + @TableField(exist = false) + private String adcd; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.dikeCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java index 23f3d11b..053b74ae 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java @@ -2,12 +2,14 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - +import org.springframework.util.StringUtils; /** @@ -19,7 +21,7 @@ import lombok.Data; @TableName("bs_sgc_df_jfgl") @Data @ApiModel("经费管理") -public class BsSgcDfJfgl extends BaseEntity +public class BsSgcDfJfgl extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -85,4 +87,11 @@ public class BsSgcDfJfgl extends BaseEntity @TableField(exist = false) private String adcd; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.dikeCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDsjMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDsjMapper.java index 82981d86..0c5a282a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDsjMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDsjMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.df.mapper; +import com.kms.yg.sz.domain.BsSgcSzDsj; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfDsj; +import java.util.List; + /** * 堤防工程大事记Mapper接口 * @@ -12,5 +16,19 @@ import com.kms.yg.df.domain.BsSgcDfDsj; */ @Repository public interface BsSgcDfDsjMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("dikeCode") String dikeCode + ); + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("dikeCode") String dikeCode + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGltzMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGltzMapper.java index 36b110f0..b69eebfd 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGltzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGltzMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.df.mapper; +import com.kms.yg.sz.domain.BsSgcSzGltz; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfGltz; +import java.util.List; + /** * 堤防管理体制Mapper接口 * @@ -12,5 +16,19 @@ import com.kms.yg.df.domain.BsSgcDfGltz; */ @Repository public interface BsSgcDfGltzMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("dikeCode") String dikeCode + ); + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("dikeCode") String dikeCode + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGzscMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGzscMapper.java index 13c93114..4ca1fa45 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGzscMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGzscMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.df.mapper; +import com.kms.yg.sz.domain.BsSgcSzGzsc; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfGzsc; +import java.util.List; + /** * 堤防工作手册Mapper接口 * @@ -12,5 +16,19 @@ import com.kms.yg.df.domain.BsSgcDfGzsc; */ @Repository public interface BsSgcDfGzscMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("dikeCode") String dikeCode + ); + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("dikeCode") String dikeCode + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java index 6dbc91ae..419a089f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java @@ -24,6 +24,7 @@ public interface BsSgcDfJfglMapper extends BaseMapper { @Param("adcd") String adcd, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java index 3c63c432..f972da48 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java @@ -6,8 +6,10 @@ import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfBydy; import com.kms.yg.df.domain.BsSgcDfBydyzb; import com.kms.yg.df.mapper.BsSgcDfBydyzbMapper; +import com.kms.yg.sz.domain.BsSgcSzBydyzb; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,6 +33,10 @@ public class BsSgcDfBydyzbService extends BaseService sp){ BsSgcDfBydyzb data = sp.getData(); + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcDfBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(), data.getDikeName(), data.getPowerType(), data.getAdcdQx()); for (BsSgcDfBydyzb zb:list){ @@ -41,7 +47,6 @@ public class BsSgcDfBydyzbService extends BaseServicepage=new Page<>(sp.getPageNum(),sp.getPageSize()); page.setTotal(size); page.setRecords(list); return page; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java index 14fe6fbf..bfd7e763 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java @@ -7,6 +7,7 @@ import com.kms.yg.df.domain.BsSgcDfBzbp; import com.kms.yg.df.mapper.BsSgcDfBzbpMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,6 +54,10 @@ public class BsSgcDfBzbpService extends BaseService page = new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(projectInfo.getDikeCode())){ + return page; + } + List infoPage = bsSgcDfBzbpMapper .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd,projectInfo.getDikeCode()); Page bsSgcDfBzbpPage = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java index 9ec7b8ea..60db339f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java @@ -7,6 +7,7 @@ import com.kms.yg.df.domain.BsSgcDfBzhjs; import com.kms.yg.df.mapper.BsSgcDfBzhjsMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,11 +36,14 @@ public class BsSgcDfBzhjsService extends BaseService sp) { BsSgcDfBzhjs data = sp.getData(); + Page page = new Page<>(); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){ + return page; + } List list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize()); - Page page = new Page<>(); page.setRecords(list); page.setTotal(list.size()); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java index f1cb8a6f..b47ba3a3 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java @@ -7,6 +7,7 @@ import com.kms.yg.df.domain.BsSgcDfDagl; import com.kms.yg.df.mapper.BsSgcDfDaglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,12 +33,20 @@ public class BsSgcDfDaglService extends BaseService sp) { BsSgcDfDagl data = sp.getData(); + Page page = new Page<>(); - + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){ + return page; + } + String adcd=null; + if (StringUtils.isNotEmpty(data.getAdcd())){ + adcd= sysXzqhService.getSubString(data.getAdcd()); + }else { + adcd=data.getAdcdQx(); + } List list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),data.getDikeName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit()); + adcd, "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit()); - Page page = new Page<>(); page.setTotal(list.size()); page.setRecords(list); return page; 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 2942ba09..790c4553 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 @@ -14,6 +14,7 @@ import com.kms.yg.df.domain.dto.DfrwDto; import com.kms.yg.df.mapper.BsSgcDfAqrwMapper; import com.kms.yg.df.mapper.BsSgcDfDfrwMapper; import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper; +import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; @@ -47,7 +48,11 @@ public class BsSgcDfDfrwService extends BaseService(sp.getPageNum(), sp.getPageSize()), wrapper); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isBlank(sp.getData().getDikeCode())&&StringUtils.isBlank(new BsSgcDfSafeJbxx().getAdcdQx())){ + return page; + } + page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper); List records = page.getRecords(); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDsjService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDsjService.java index fe802d90..ffb0de87 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDsjService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDsjService.java @@ -1,9 +1,18 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.sz.domain.BsSgcSzGzsc; +import com.kms.yg.sz.mapper.BsSgcSzGzscMapper; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.df.mapper.BsSgcDfDsjMapper; import com.kms.yg.df.domain.BsSgcDfDsj; +import com.shuili.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 堤防工程大事记Service接口 * @@ -12,5 +21,22 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcDfDsjService extends BaseService{ + @Autowired + private BsSgcDfDsjMapper bsSgcDfDsjMapper; + + public Page getPage(SearchParam sp){ + BsSgcDfDsj data = sp.getData(); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){ + return page; + } + List list = bsSgcDfDsjMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeName(), data.getAdcdQx(), data.getDikeCode()); + Integer size = bsSgcDfDsjMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeName(), data.getAdcdQx(), data.getDikeCode()).size(); + page.setTotal(size); + page.setRecords(list); + return page; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java index 372cfe16..3d4ce721 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java @@ -35,6 +35,9 @@ public class BsSgcDfFxwzService extends BaseServicepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcDfFxwzMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(), data.getDikeName(), data.getPersonName(), adcd,data.getMaterialName()); Integer count = bsSgcDfFxwzMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(), data.getDikeName(), 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 d38587f0..870597d5 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 @@ -89,7 +89,6 @@ public class BsSgcDfFzrService extends BaseService public IPage selectPage(SearchParam sp) { BsSgcDfFzr data = sp.getData(); - Map params = sp.getParams(); String adcd=null; if (StringUtils.isNotEmpty(data.getAdcd())) { @@ -97,11 +96,14 @@ public class BsSgcDfFzrService extends BaseService }else { adcd=data.getAdcdQx(); } + Page page = new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(data.getDikeCode())){ + return page; + } List list =bsSgcDfFzrMapper.getList(data.getId(), data.getDikeCode(), adcd, (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),data.getDikeName()); - Page page = new Page<>(); page.setRecords(list); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGltzService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGltzService.java index 8b3d6904..9bf62864 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGltzService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGltzService.java @@ -1,9 +1,18 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.sz.domain.BsSgcSzGltz; +import com.kms.yg.sz.mapper.BsSgcSzGltzMapper; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.df.mapper.BsSgcDfGltzMapper; import com.kms.yg.df.domain.BsSgcDfGltz; +import com.shuili.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 堤防管理体制Service接口 * @@ -12,5 +21,22 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcDfGltzService extends BaseService{ + @Autowired + private BsSgcDfGltzMapper bsSgcDfGltzMapper; + + public Page getPage(SearchParam sp){ + BsSgcDfGltz data = sp.getData(); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){ + return page; + } + List list = bsSgcDfGltzMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeName(), data.getAdcdQx(), data.getDikeCode()); + Integer size = bsSgcDfGltzMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeName(), data.getAdcdQx(), data.getDikeCode()).size(); + page.setTotal(size); + page.setRecords(list); + return page; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGzscService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGzscService.java index 967fbc2d..4bdd5837 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGzscService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGzscService.java @@ -1,9 +1,18 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.sz.domain.BsSgcSzGzsc; +import com.kms.yg.sz.mapper.BsSgcSzGzscMapper; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.df.mapper.BsSgcDfGzscMapper; import com.kms.yg.df.domain.BsSgcDfGzsc; +import com.shuili.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 堤防工作手册Service接口 * @@ -12,5 +21,22 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcDfGzscService extends BaseService{ + @Autowired + private BsSgcDfGzscMapper bsSgcDfGzscMapper; + + public Page getPage(SearchParam sp){ + BsSgcDfGzsc data = sp.getData(); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){ + return page; + } + List list = bsSgcDfGzscMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeName(), data.getAdcdQx(), data.getDikeCode()); + Integer size = bsSgcDfGzscMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeName(), data.getAdcdQx(), data.getDikeName()).size(); + page.setTotal(size); + page.setRecords(list); + return page; + } } 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 a5fa5fc1..8a9e168a 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 @@ -8,6 +8,7 @@ import com.kms.yg.df.domain.BsSgcDfJfgl; import com.kms.yg.df.mapper.BsSgcDfJfglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,11 +35,15 @@ public class BsSgcDfJfglService extends BaseService sp) { BsSgcDfJfgl data = sp.getData(); + Page page = new Page<>(); + + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){ + return page; + } List list= bsSgcDfJfglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getDikeCode()); - Page page = new Page<>(); page.setRecords(list); page.setTotal(list.size()); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java index fe15d0d0..f3d6d902 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java @@ -7,6 +7,7 @@ import com.kms.yg.sz.domain.BsSgcSzYaxx; import com.kms.yg.sz.mapper.BsSgcSzYaxxMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,11 +26,14 @@ public class BsSgcDfYaxxService extends BaseService getPage(SearchParam sp){ BsSgcDfYaxx data = sp.getData(); + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcDfYaxxMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(), data.getDikeName(), data.getType(), data.getAdcdQx()); Integer count = bsSgcDfYaxxMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getDikeCode(), data.getDikeName(), data.getType(), data.getAdcdQx()).size(); - Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); page.setRecords(list); page.setTotal(count); return page; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java index deeea1f4..f24a2176 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java @@ -9,6 +9,7 @@ import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -59,11 +60,14 @@ public class BsSgcDfYhxxService extends BaseService getPage(SearchParam sp){ BsSgcDfYhxx data = sp.getData(); + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getDikeCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcSzYhxxMapper.getList(sp.getPageNum(),sp.getPageSize(), data.getDikeName(),data.getDikeName(), data.getInspectionType(),data.getAdcdQx()); int size = bsSgcSzYhxxMapper.getCount(sp.getPageNum(),sp.getPageSize(), data.getDikeName(),data.getDikeName(), data.getInspectionType(),data.getAdcdQx()).size(); - Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); page.setRecords(list); page.setTotal(size); return page; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDsjController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDsjController.java index 4b8e124a..f060b635 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDsjController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDsjController.java @@ -53,7 +53,8 @@ public class BsSgcSzDsjController extends BaseController @ApiOperation("水闸工程大事记列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzDsjService.selectPage(sp); + + return bsSgcSzDsjService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java index 5c078c55..8f7cf925 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +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; @@ -68,6 +69,9 @@ public class BsSgcSzFxzzController extends BaseController { BsSgcSzFxzz data = sp.getData(); LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); + if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return new Page(sp.getPageNum(),sp.getPageSize()); + } if (StringUtils.isNotEmpty(data.getWagaName())){ lw.eq(BsSgcSzFxzz::getWagaName,data.getWagaName()); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGltzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGltzController.java index c43aa323..f7982547 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGltzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGltzController.java @@ -53,7 +53,7 @@ public class BsSgcSzGltzController extends BaseController @ApiOperation("堤防管理体制列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzGltzService.selectPage(sp); + return bsSgcSzGltzService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGzscController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGzscController.java index 78dc729f..3820779d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGzscController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGzscController.java @@ -53,7 +53,7 @@ public class BsSgcSzGzscController extends BaseController @ApiOperation("水闸工作手册列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzGzscService.selectPage(sp); + return bsSgcSzGzscService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzhjs.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzhjs.java index b5f9dc5d..61fc4d62 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzhjs.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzhjs.java @@ -1,13 +1,15 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -19,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_bzhjs") @Data @ApiModel("水闸标准化建设") -public class BsSgcSzBzhjs extends BaseEntity +public class BsSgcSzBzhjs extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -71,5 +73,10 @@ public class BsSgcSzBzhjs extends BaseEntity @TableField(exist = false) private String adcd; - + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode(); + } + return this.wagaCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java index 59921dc1..35725420 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java @@ -2,12 +2,14 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - +import org.springframework.util.StringUtils; /** @@ -19,7 +21,7 @@ import lombok.Data; @TableName("bs_sgc_sz_dagl") @Data @ApiModel("水闸档案管理") -public class BsSgcSzDagl extends BaseEntity +public class BsSgcSzDagl extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -70,6 +72,11 @@ public class BsSgcSzDagl extends BaseEntity @TableField(exist = false) private String adcd; - + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode(); + } + return this.wagaCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDsj.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDsj.java index 4c5b6694..15260de2 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDsj.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDsj.java @@ -1,14 +1,18 @@ package com.kms.yg.sz.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -20,7 +24,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_dsj") @Data @ApiModel("水闸工程大事记") -public class BsSgcSzDsj extends BaseEntity +public class BsSgcSzDsj extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -77,4 +81,13 @@ public class BsSgcSzDsj extends BaseEntity @ApiModelProperty("督促和稽查情况") private String owerDept; + @TableField(exist = false) + private String adcd; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode(); + } + return this.wagaCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGltz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGltz.java index 4a08ca13..6231ae06 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGltz.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGltz.java @@ -1,12 +1,15 @@ package com.kms.yg.sz.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_gltz") @Data @ApiModel("堤防管理体制") -public class BsSgcSzGltz extends BaseEntity +public class BsSgcSzGltz extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -54,4 +57,14 @@ public class BsSgcSzGltz extends BaseEntity @ApiModelProperty("附件") private String owerDept; + @TableField(exist = false) + private String adcd; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode(); + } + return this.wagaCode; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGzsc.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGzsc.java index cc6247cc..1daa3409 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGzsc.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGzsc.java @@ -1,12 +1,15 @@ package com.kms.yg.sz.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_gzsc") @Data @ApiModel("水闸工作手册") -public class BsSgcSzGzsc extends BaseEntity +public class BsSgcSzGzsc extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -49,4 +52,13 @@ public class BsSgcSzGzsc extends BaseEntity @ApiModelProperty("操作手册附件") private String owerDept; + @TableField(exist = false) + private String adcd; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode(); + } + return this.wagaCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJfgl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJfgl.java index aa8a5212..83e2cad7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJfgl.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJfgl.java @@ -1,13 +1,15 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -19,7 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_jfgl") @Data @ApiModel("经费管理") -public class BsSgcSzJfgl extends BaseEntity +public class BsSgcSzJfgl extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -86,6 +88,11 @@ public class BsSgcSzJfgl extends BaseEntity @TableField(exist = false) private String adcd; - + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode(); + } + return this.wagaCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDsjMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDsjMapper.java index b20675e7..47366f04 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDsjMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDsjMapper.java @@ -1,9 +1,14 @@ package com.kms.yg.sz.mapper; +import com.kms.yg.df.domain.BsSgcDfGzsc; +import com.kms.yg.sz.domain.BsSgcSzGzsc; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzDsj; +import java.util.List; + /** * 水闸工程大事记Mapper接口 * @@ -12,5 +17,19 @@ import com.kms.yg.sz.domain.BsSgcSzDsj; */ @Repository public interface BsSgcSzDsjMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaName") String wagaName, + @Param("adcd") String adcd, + @Param("wagaCode") String wagaCode + ); + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaName") String wagaName, + @Param("adcd") String adcd, + @Param("wagaCode") String wagaCode + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGltzMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGltzMapper.java index 2370cfe8..4ec40a3b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGltzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGltzMapper.java @@ -1,9 +1,12 @@ package com.kms.yg.sz.mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzGltz; +import java.util.List; + /** * 堤防管理体制Mapper接口 * @@ -12,5 +15,19 @@ import com.kms.yg.sz.domain.BsSgcSzGltz; */ @Repository public interface BsSgcSzGltzMapper extends BaseMapper { + ListgetList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaName") String wagaName, + @Param("adcd") String adcd, + @Param("wagaCode") String wagaCode + ); + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaName") String wagaName, + @Param("adcd") String adcd, + @Param("wagaCode") String wagaCode + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGzscMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGzscMapper.java index d50af2b1..78f4e49c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGzscMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGzscMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.sz.mapper; +import com.kms.yg.sz.domain.BsSgcSzGltz; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzGzsc; +import java.util.List; + /** * 水闸工作手册Mapper接口 * @@ -12,5 +16,20 @@ import com.kms.yg.sz.domain.BsSgcSzGzsc; */ @Repository public interface BsSgcSzGzscMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaName") String wagaName, + @Param("adcd") String adcd, + @Param("wagaCode") String wagaCode + ); + + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaName") String wagaName, + @Param("adcd") String adcd, + @Param("wagaCode") String wagaCode + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java index 9d6f778a..2954cf4b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java @@ -22,5 +22,6 @@ public interface BsSgcSzJfglMapper extends BaseMapper { @Param("adcd") String adcd, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java index 517df6ba..544a20c6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java @@ -20,7 +20,7 @@ public interface BsSgcSzYaxxMapper extends BaseMapper { @Param("pageSize") int pageSize, @Param("wagaCode")String wagaCode, @Param("wagaName") String wagaName, - @Param("inspectionType")String inspectionType, + @Param("type")String type, @Param("adcd")String adcd ); @@ -29,7 +29,7 @@ public interface BsSgcSzYaxxMapper extends BaseMapper { @Param("pageSize") int pageSize, @Param("wagaCode")String wagaCode, @Param("wagaName") String wagaName, - @Param("inspectionType")String inspectionType, + @Param("type")String type, @Param("adcd")String adcd ); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java index 1e2f5868..d04e3aac 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java @@ -11,6 +11,7 @@ import com.kms.yg.sz.domain.BsSgcSzBydyzb; import com.kms.yg.sz.mapper.BsSgcSzBydyzbMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,6 +31,10 @@ public class BsSgcSzBydyzbService extends BaseService sp){ BsSgcSzBydyzb data = sp.getData(); + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcSzBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getWagaName(), data.getWagaCode(), data.getPowerType(), data.getAdcdQx()); for (BsSgcSzBydyzb zb:list){ @@ -40,7 +45,6 @@ public class BsSgcSzBydyzbService extends BaseServicepage=new Page<>(sp.getPageNum(),sp.getPageSize()); page.setTotal(size); page.setRecords(list); return page; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java index 389e2d04..53990ab3 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java @@ -56,6 +56,9 @@ public class BsSgcSzBzbpService extends BaseService page = new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(projectInfo.getWagaCode())){ + return page; + } List infoPage = bsSgcSzBzbpMapper.selectList1(sp.getPageNum(),sp.getPageSize(), projectInfo.getWagaName(),adcd,projectInfo.getWagaCode()); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java index 6cd16918..ff7cb6e6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java @@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzJfgl; import com.kms.yg.sz.mapper.BsSgcSzBzhjsMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,11 +35,15 @@ public class BsSgcSzBzhjsService extends BaseService sp) { BsSgcSzBzhjs data = sp.getData(); + Page page = new Page<>(); + + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } List list= bsSgcSzBzhjsMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode()); + data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode()); - Page page = new Page<>(); page.setRecords(list); page.setTotal(list.size()); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java index eabb54f1..2bfe7a6c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java @@ -7,6 +7,7 @@ import com.kms.yg.sz.domain.BsSgcSzDagl; import com.kms.yg.sz.mapper.BsSgcSzDaglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,12 +32,19 @@ public class BsSgcSzDaglService extends BaseService sp) { BsSgcSzDagl data = sp.getData(); - - + Page page = new Page<>(); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } + String adcd=null; + if (StringUtils.isNotEmpty(data.getAdcd())){ + adcd= sysXzqhService.getSubString(data.getAdcd()); + }else { + adcd=data.getAdcdQx(); + } List list = bsSgcSzDaglMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode(),data.getUnit()); + adcd, "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode(),data.getUnit()); - Page page = new Page<>(); page.setTotal(list.size()); page.setRecords(list); return page; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDsjService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDsjService.java index 689e26b6..9ac0ec15 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDsjService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDsjService.java @@ -1,9 +1,18 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.sz.domain.BsSgcSzGzsc; +import com.kms.yg.sz.mapper.BsSgcSzGzscMapper; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.sz.mapper.BsSgcSzDsjMapper; import com.kms.yg.sz.domain.BsSgcSzDsj; +import com.shuili.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 水闸工程大事记Service接口 * @@ -13,4 +22,22 @@ import org.springframework.stereotype.Service; @Service public class BsSgcSzDsjService extends BaseService{ + @Autowired + private BsSgcSzDsjMapper bsSgcSzDsjMapper; + + public Page getPage(SearchParam sp){ + BsSgcSzDsj data = sp.getData(); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } + List list = bsSgcSzDsjMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getAdcdQx(), data.getWagaCode()); + Integer size = bsSgcSzDsjMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getAdcdQx(), data.getWagaCode()).size(); + + page.setTotal(size); + page.setRecords(list); + return page; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java index 4f5620ea..ae0d628a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java @@ -33,11 +33,15 @@ public class BsSgcSzFxwzService extends BaseService(sp.getPageNum(),sp.getPageSize()); + + if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcSzFxwzMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(), data.getWagaName(), data.getPersonName() , adcd, data.getMaterialName()); Integer count = bsSgcSzFxwzMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(), data.getWagaName(), data.getPersonName() , adcd, data.getMaterialName()).size(); - Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); page.setRecords(list); page.setTotal(count); return page; 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 4470562c..460977ff 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 @@ -96,10 +96,16 @@ public class BsSgcSzFzrService extends BaseService }else { adcd=data.getAdcdQx(); } + Page page = new Page<>(sp.getPageNum(),sp.getPageSize()); + + if (StringUtils.isEmpty(adcd)&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } + List list = bsSgcSzFzrMapper.getList(data.getId(), data.getWagaName(), adcd, sp.getData().getWagaCode(), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); - Page page = new Page<>(); + page.setRecords(list); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGltzService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGltzService.java index 407f52ab..aacc6161 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGltzService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGltzService.java @@ -1,9 +1,16 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.sz.mapper.BsSgcSzGltzMapper; import com.kms.yg.sz.domain.BsSgcSzGltz; +import com.shuili.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 堤防管理体制Service接口 * @@ -12,5 +19,22 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcSzGltzService extends BaseService{ + @Autowired + private BsSgcSzGltzMapper bsSgcSzGltzMapper; + + public PagegetPage(SearchParam sp){ + BsSgcSzGltz data = sp.getData(); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } + List list = bsSgcSzGltzMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getAdcdQx(), data.getWagaCode()); + Integer size = bsSgcSzGltzMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getAdcdQx(), data.getWagaCode()).size(); + page.setTotal(size); + page.setRecords(list); + return page; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGzscService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGzscService.java index 50260369..df1a1f16 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGzscService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGzscService.java @@ -1,9 +1,18 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.df.domain.BsSgcDfGltz; +import com.kms.yg.df.mapper.BsSgcDfGltzMapper; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.sz.mapper.BsSgcSzGzscMapper; import com.kms.yg.sz.domain.BsSgcSzGzsc; +import com.shuili.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 水闸工作手册Service接口 * @@ -12,5 +21,22 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcSzGzscService extends BaseService{ + @Autowired + private BsSgcSzGzscMapper bsSgcSzGzscMapper; + + public Page getPage(SearchParam sp){ + BsSgcSzGzsc data = sp.getData(); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } + List list = bsSgcSzGzscMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getAdcdQx(), data.getWagaCode()); + Integer size = bsSgcSzGzscMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getAdcdQx(), data.getWagaCode()).size(); + page.setTotal(size); + page.setRecords(list); + return page; + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java index 0d35d5ce..f5cc39d0 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java @@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzJfgl; import com.kms.yg.sz.mapper.BsSgcSzJfglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,11 +34,14 @@ public class BsSgcSzJfglService extends BaseService sp) { BsSgcSzJfgl data = sp.getData(); + Page page = new Page<>(); + if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){ + return page; + } List list= bsSgcSzJfglMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + data.getAdcdQx(), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode()); - Page page = new Page<>(); page.setRecords(list); page.setTotal(list.size()); 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 8a24e7c5..d40c7a16 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 @@ -45,7 +45,11 @@ public class BsSgcSzSzrwService extends BaseService(sp.getPageNum(), sp.getPageSize()), wrapper); + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isBlank(sp.getData().getWagaCode())&&StringUtils.isBlank(new BsSgcSzSafeJbxx().getAdcdQx())){ + return page; + } + page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper); List records = page.getRecords(); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java index 5d69a4d1..b370c1a1 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java @@ -5,6 +5,7 @@ import com.kms.yg.sz.domain.BsSgcSzYaxx; import com.kms.yg.sz.mapper.BsSgcSzYaxxMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,11 +24,14 @@ public class BsSgcSzYaxxService extends BaseServicegetPage(SearchParam sp){ BsSgcSzYaxx data = sp.getData(); + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcSzYaxxMapper.getList(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(), data.getWagaName(), data.getType(), data.getAdcdQx()); Integer count = bsSgcSzYaxxMapper.getCount(sp.getPageNum(), sp.getPageSize(), data.getWagaCode(), data.getWagaName(), data.getType(), data.getAdcdQx()).size(); - Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); page.setRecords(list); page.setTotal(count); return page; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java index 559281ee..394c75c3 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java @@ -32,11 +32,14 @@ public class BsSgcSzYhxxService extends BaseService getPage(SearchParam sp){ BsSgcSzYhxx data = sp.getData(); + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + if (StringUtils.isEmpty(data.getWagaCode())&&StringUtils.isEmpty(data.getAdcdQx())){ + return page; + } List list = bsSgcSzYhxxMapper.getList(sp.getPageNum(),sp.getPageSize(), data.getWagaCode(),data.getWagaName(), data.getInspectionType(),data.getAdcdQx()); int size = bsSgcSzYhxxMapper.getCount(sp.getPageNum(),sp.getPageSize(), data.getWagaCode(),data.getWagaName(), data.getInspectionType(),data.getAdcdQx()).size(); - Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); page.setRecords(list); page.setTotal(size); return page; diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDsjMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDsjMapper.xml new file mode 100644 index 00000000..f068825b --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDsjMapper.xml @@ -0,0 +1,65 @@ + + + + + + select sd.id,sd. dike_code,sd. dike_name,sd.year,sd. highest_level, sd.discharge_volume, + sd.abnormal_condition, sd.conclusion, sd.Supervise, + sj.adcd + from bs_sgc_df_dsj sd + left join att_dike_base sj on sd.dike_code = sj.dike_CODE + + + + + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGltzMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGltzMapper.xml new file mode 100644 index 00000000..bebf4aae --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGltzMapper.xml @@ -0,0 +1,60 @@ + + + + + + select sd.id,sd.dike_code,sd. dike_name,sd. type, sd.file, + sj.adcd + from bs_sgc_df_gltz sd + left join att_dike_base sj on sd.dike_code = sj.dike_CODE + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGzscMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGzscMapper.xml new file mode 100644 index 00000000..64523c8c --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGzscMapper.xml @@ -0,0 +1,59 @@ + + + + + + select sd.id,sd. dike_code,sd. dike_name, sd.file, + sj.adcd + from bs_sgc_df_gzsc sd + left join att_dike_base sj on sd.dike_code = sj.dike_CODE + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml index 662da5b7..fd630a00 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml @@ -33,7 +33,9 @@ and sj.dike_name LIKE concat('%',#{dikeName},'%') - + + and sj.dike_CODE=#{dikeCode} + and sj.adcd like concat(#{adcd},'%') diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDsjMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDsjMapper.xml new file mode 100644 index 00000000..18ae2504 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDsjMapper.xml @@ -0,0 +1,65 @@ + + + + + + select sd.id,sd. waga_code,sd. waga_name,sd.year,sd. highest_level, sd.discharge_volume, + sd.abnormal_condition, sd.conclusion, sd.Supervise, + sj.adcd + from bs_sgc_sz_dsj sd + left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE + + + + + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGltzMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGltzMapper.xml new file mode 100644 index 00000000..0f10e3b3 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGltzMapper.xml @@ -0,0 +1,60 @@ + + + + + + select sd.id,sd. waga_code,sd. waga_name,sd. type, sd.file, + sj.adcd + from bs_sgc_sz_gltz sd + left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGzscMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGzscMapper.xml new file mode 100644 index 00000000..036b7b4e --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGzscMapper.xml @@ -0,0 +1,59 @@ + + + + + + select sd.id,sd. waga_code,sd. waga_name, sd.file, + sj.adcd + from bs_sgc_sz_gzsc sd + left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml index b43d01e7..d4fdd310 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml @@ -30,6 +30,9 @@ and sj.waga_type = #{wagaType} + + and sj.WAGA_CODE=#{wagaCode} + and sj.waga_name LIKE concat('%',#{wagaName},'%')