From df456a1672ce25306bb2d964a1a6c9d0e9b66979 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Mon, 31 Mar 2025 04:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcDfBydyzbController.java | 11 +- .../df/controller/BsSgcDfBzbpController.java | 66 ++------- .../df/controller/BsSgcDfFxwzController.java | 22 +-- .../df/controller/BsSgcDfFxzzController.java | 18 ++- .../df/controller/BsSgcDfYaxxController.java | 3 +- .../df/controller/BsSgcDfYhxxController.java | 2 +- .../com/kms/yg/df/domain/BsSgcDfBydyzb.java | 16 ++- .../com/kms/yg/df/domain/BsSgcDfDfrw.java | 9 +- .../com/kms/yg/df/domain/BsSgcDfFxwz.java | 16 ++- .../com/kms/yg/df/domain/BsSgcDfFxzz.java | 13 +- .../java/com/kms/yg/df/domain/BsSgcDfFzr.java | 12 +- .../com/kms/yg/df/domain/BsSgcDfYaxx.java | 15 +- .../com/kms/yg/df/domain/BsSgcDfYhxx.java | 15 +- .../kms/yg/df/mapper/BsSgcDfBydyzbMapper.java | 20 +++ .../kms/yg/df/mapper/BsSgcDfBzbpMapper.java | 4 +- .../kms/yg/df/mapper/BsSgcDfFxwzMapper.java | 21 +++ .../kms/yg/df/mapper/BsSgcDfYaxxMapper.java | 21 +++ .../kms/yg/df/mapper/BsSgcDfYhxxMapper.java | 21 +++ .../yg/df/service/BsSgcDfBydyzbService.java | 33 +++++ .../kms/yg/df/service/BsSgcDfBzbpService.java | 4 +- .../kms/yg/df/service/BsSgcDfDfrwService.java | 13 +- .../kms/yg/df/service/BsSgcDfFxwzService.java | 30 ++++ .../kms/yg/df/service/BsSgcDfFzrService.java | 9 +- .../kms/yg/df/service/BsSgcDfYaxxService.java | 20 +++ .../kms/yg/df/service/BsSgcDfYhxxService.java | 16 +++ .../controller/BsSgcSzBydyzbController.java | 10 +- .../sz/controller/BsSgcSzBzbpController.java | 128 ++++-------------- .../sz/controller/BsSgcSzFxwzController.java | 19 +-- .../sz/controller/BsSgcSzFxzzController.java | 16 +++ .../controller/BsSgcSzSafeJbxxController.java | 2 +- .../sz/controller/BsSgcSzSzrwController.java | 2 + .../sz/controller/BsSgcSzYaxxController.java | 3 +- .../sz/controller/BsSgcSzYhxxController.java | 3 +- .../com/kms/yg/sz/domain/BsSgcSzBydyzb.java | 16 ++- .../com/kms/yg/sz/domain/BsSgcSzBzbp.java | 12 +- .../com/kms/yg/sz/domain/BsSgcSzFxwz.java | 15 +- .../com/kms/yg/sz/domain/BsSgcSzFxzz.java | 12 +- .../java/com/kms/yg/sz/domain/BsSgcSzFzr.java | 15 +- .../com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java | 2 +- .../com/kms/yg/sz/domain/BsSgcSzSzrw.java | 9 ++ .../com/kms/yg/sz/domain/BsSgcSzYaxx.java | 17 ++- .../com/kms/yg/sz/domain/BsSgcSzYhxx.java | 16 ++- .../kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java | 21 +++ .../kms/yg/sz/mapper/BsSgcSzBzbpMapper.java | 4 +- .../kms/yg/sz/mapper/BsSgcSzFxwzMapper.java | 19 +++ .../kms/yg/sz/mapper/BsSgcSzYaxxMapper.java | 19 +++ .../kms/yg/sz/mapper/BsSgcSzYhxxMapper.java | 21 +++ .../yg/sz/service/BsSgcSzBydyzbService.java | 31 +++++ .../kms/yg/sz/service/BsSgcSzBzbpService.java | 7 +- .../kms/yg/sz/service/BsSgcSzFxwzService.java | 31 ++++- .../kms/yg/sz/service/BsSgcSzFzrService.java | 12 +- .../kms/yg/sz/service/BsSgcSzSzrwService.java | 13 +- .../kms/yg/sz/service/BsSgcSzYaxxService.java | 18 +++ .../kms/yg/sz/service/BsSgcSzYhxxService.java | 14 ++ .../mapper/yg/df/BsSgcDfBydyzbMapper.xml | 65 +++++++++ .../mapper/yg/df/BsSgcDfBzbpMapper.xml | 6 + .../mapper/yg/df/BsSgcDfFxwzMapper.xml | 78 +++++++++++ .../mapper/yg/df/BsSgcDfFzrMapper.xml | 3 + .../mapper/yg/df/BsSgcDfYaxxMapper.xml | 71 ++++++++++ .../mapper/yg/df/BsSgcDfYhxxMapper.xml | 75 ++++++++++ .../mapper/yg/sz/BsSgcSzBydyzbMapper.xml | 65 +++++++++ .../mapper/yg/sz/BsSgcSzBzbpMapper.xml | 6 + .../mapper/yg/sz/BsSgcSzFxwzMapper.xml | 77 +++++++++++ .../mapper/yg/sz/BsSgcSzFzrMapper.xml | 3 + .../mapper/yg/sz/BsSgcSzYaxxMapper.xml | 71 ++++++++++ .../mapper/yg/sz/BsSgcSzYhxxMapper.xml | 75 ++++++++++ 66 files changed, 1274 insertions(+), 258 deletions(-) create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBydyzbMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFxwzMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYaxxMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBydyzbMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFxwzMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYaxxMapper.xml diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java index e150995a..c2329b9b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java @@ -2,6 +2,7 @@ package com.kms.yg.df.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; @@ -55,15 +56,9 @@ public class BsSgcDfBydyzbController extends BaseController @ApiOperation("堤防备用电源主列表") public IPage list(@RequestBody SearchParam sp) { - IPage bsSgcDfBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp); - List records = bsSgcDfBydyzbIPage.getRecords(); - for (BsSgcDfBydyzb zb:records){ - LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); - int count = bsSgcDfBydyService.count(lw.eq(BsSgcDfBydy::getBydyzbId, zb.getId())); - zb.setTotal(String.valueOf(count)); - } - return bsSgcDfBydyzbIPage; + Page page = bsSgcSzBydyzbService.getPage(sp); + return page; } /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java index 7f1f22a8..0b72b96a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java @@ -89,66 +89,24 @@ public class BsSgcDfBzbpController extends BaseController { BsSgcDfBzbp projectInfo = sp.getData(); - String adcd = null; - if (projectInfo != null) { - adcd = projectInfo.getAdcd(); - } - - SysUser sysUser = UserUtils.getUser(); - if (sysUser.getUserName().equals("admin")) { - if (projectInfo != null && projectInfo.getAdcd() != null) { - String infoAdcd = projectInfo.getAdcd(); - QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); - SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==5) { - infoAdcd = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==4) { - infoAdcd = xzqh.getXzqhdm().substring(0, 4); - - }else { - infoAdcd = xzqh.getXzqhdm(); - } - return bsSgcDfBzbpService.getStatistics(sp,infoAdcd); - }else { - return bsSgcDfBzbpService.getStatistics(sp,null); - } - - }else if (adcd == null) { - SysUser user = UserUtils.getUser(); - String deptId = user.getDeptId(); - SysDept sysDept = sysDeptService.get(deptId); - String xzqhId = sysDept.getXzqhId(); - SysXzqh xzqh = sysXzqhService.getById(xzqhId); - String substring = ""; - if (xzqh.getLayer()==5) { - substring = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==4) { - substring = xzqh.getXzqhdm().substring(0, 4); - - }else { - substring = xzqh.getXzqhdm(); - } - - return bsSgcDfBzbpService.getStatistics(sp,substring); - }else { + String infoAdcd = null; + if (StringUtils.isNotEmpty(projectInfo.getAdcd())) { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); - + sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==5) { - adcd = xzqh.getXzqhdm().substring(0, 2); + if (xzqh.getLayer() == 5) { + infoAdcd = xzqh.getXzqhdm().substring(0, 2); - } else if (xzqh.getLayer()==4) { - adcd = xzqh.getXzqhdm().substring(0, 4); + } else if (xzqh.getLayer() == 4) { + infoAdcd = xzqh.getXzqhdm().substring(0, 4); - }else { - adcd = xzqh.getXzqhdm(); + } else { + infoAdcd = xzqh.getXzqhdm(); } - return bsSgcDfBzbpService.getStatistics(sp, adcd); + return bsSgcDfBzbpService.getStatistics(sp, infoAdcd); + }else { + return bsSgcDfBzbpService.getStatistics(sp, projectInfo.getAdcdQx()); } } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java index 305da561..3009b2fe 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java @@ -1,11 +1,13 @@ package com.kms.yg.df.controller; 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; import com.kms.yg.df.domain.BsSgcDfFxwz; import com.kms.yg.df.service.BsSgcDfFxwzService; +import com.kms.yg.sz.domain.BsSgcSzFxwz; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -50,24 +52,8 @@ public class BsSgcDfFxwzController extends BaseController @ApiOperation("水闸防汛物资列表") public IPage list(@RequestBody SearchParam sp) { - List conditionViews = new ArrayList<>(); - ConditionView conditionView = new ConditionView(); - ConditionView cv = new ConditionView(); - BsSgcDfFxwz data = sp.getData(); - if(data!=null&&StringUtils.isNotEmpty(data.getPersonName())){ - cv.setName("person_name"); - cv.setValue(data.getPersonName()); - cv.setType(MongoOperType.LIKE); - } - if(data!=null&&StringUtils.isNotEmpty(data.getMaterialName())){ - conditionView.setName("material_name"); - conditionView.setValue(data.getMaterialName()); - conditionView.setType(MongoOperType.LIKE); - } - conditionViews.add(conditionView); - conditionViews.add(cv); - sp.setConditionViews(conditionViews); - return bsSgcSzFxwzService.selectPage(sp); + Page page = bsSgcSzFxwzService.getPage(sp); + return page; } /** 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 ac154e16..92aa5c1e 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 @@ -1,8 +1,10 @@ package com.kms.yg.df.controller; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.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; @@ -18,6 +20,7 @@ import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -63,7 +66,20 @@ public class BsSgcDfFxzzController extends BaseController @ApiOperation("防汛组织列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzFxzzService.selectPage(sp); + BsSgcDfFxzz data = sp.getData(); + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(data.getDikeName())){ + lw.eq(BsSgcDfFxzz::getDikeName,data.getDikeName()); + } + if (StringUtils.isNotEmpty(data.getDikeCode())){ + lw.eq(BsSgcDfFxzz::getDikeCode,data.getDikeCode()); + } + if (StringUtils.isNotEmpty(data.getAdcd())){ + lw.likeRight(BsSgcDfFxzz::getAdcd,sysXzqhService.getSubString(data.getAdcd())); + }else { + lw.likeRight(BsSgcDfFxzz::getAdcd,data.getAdcdQx()); + } + return bsSgcSzFxzzService.page(new Page<>(sp.getPageNum(),sp.getPageSize()),lw); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java index 1581c815..eab657b8 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java @@ -48,7 +48,8 @@ public class BsSgcDfYaxxController extends BaseController @ApiOperation("水闸预案列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzYaxxService.selectPage(sp); + + return bsSgcSzYaxxService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java index e54de716..bdf34210 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java @@ -87,7 +87,7 @@ public class BsSgcDfYhxxController extends BaseController @ApiOperation("水闸隐患信息列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzYhxxService.selectPage(sp); + return bsSgcSzYhxxService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java index 12bdcb16..829dd2d4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.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_bydyzb") @Data @ApiModel("水闸备用电源主") -public class BsSgcDfBydyzb extends BaseEntity +public class BsSgcDfBydyzb extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -60,4 +62,14 @@ public class BsSgcDfBydyzb extends BaseEntity @TableField(exist = false) private String total; + + @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/BsSgcDfDfrw.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java index a6efe134..bb44413a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java @@ -2,6 +2,7 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +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; @@ -9,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.util.StringUtils; import java.util.Date; @@ -71,5 +73,10 @@ public class BsSgcDfDfrw extends BaseEntity private String relation; private String status; - + 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/BsSgcDfFxwz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java index 660e2f98..762b4692 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java @@ -1,12 +1,16 @@ 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.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; import java.util.Date; @@ -19,7 +23,7 @@ import java.util.Date; @TableName("bs_sgc_df_fxwz") @Data @ApiModel("水闸防汛物资") -public class BsSgcDfFxwz extends BaseEntity +public class BsSgcDfFxwz extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -91,4 +95,14 @@ public class BsSgcDfFxwz extends BaseEntity @ApiModelProperty("保质期") private String shelfLife; + + @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/BsSgcDfFxzz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.java index e4586b26..5ec0cd6a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.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_fxzz") @Data @ApiModel("防汛组织") -public class BsSgcDfFxzz extends BaseEntity +public class BsSgcDfFxzz extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -93,5 +95,10 @@ public class BsSgcDfFxzz extends BaseEntity private String dikeCode; - + 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/BsSgcDfFzr.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java index 235ad311..1dd20b52 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java @@ -3,11 +3,14 @@ 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.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; import java.util.Date; @@ -22,7 +25,7 @@ import java.util.Date; @TableName("bs_sgc_df_fzr") @Data @ApiModel("水闸负责人") -public class BsSgcDfFzr extends BaseEntity +public class BsSgcDfFzr extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -121,7 +124,12 @@ public class BsSgcDfFzr extends BaseEntity - + 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/BsSgcDfYaxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java index 5c0f7b78..f6ffe416 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java @@ -1,12 +1,16 @@ 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.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; import java.util.Date; @@ -21,7 +25,7 @@ import java.util.Date; @TableName("bs_sgc_df_yaxx") @Data @ApiModel("水闸预案") -public class BsSgcDfYaxx extends BaseEntity +public class BsSgcDfYaxx extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -96,4 +100,13 @@ public class BsSgcDfYaxx extends BaseEntity @ApiModelProperty("图片") private String relation; + @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/BsSgcDfYhxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java index a1d8cb8d..7f34dad7 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java @@ -1,12 +1,16 @@ 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.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; import java.math.BigDecimal; import java.util.Date; @@ -21,7 +25,7 @@ import java.util.Date; @TableName("bs_sgc_df_yhxx") @Data @ApiModel("水闸隐患信息") -public class BsSgcDfYhxx extends BaseEntity +public class BsSgcDfYhxx extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -121,4 +125,13 @@ public class BsSgcDfYhxx extends BaseEntity @ApiModelProperty("水闸类型") private String relation; + @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/BsSgcDfBydyzbMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java index 295d876e..92dbea83 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java @@ -2,8 +2,11 @@ package com.kms.yg.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfBydyzb; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 水闸备用电源主Mapper接口 * @@ -12,5 +15,22 @@ import org.springframework.stereotype.Repository; */ @Repository public interface BsSgcDfBydyzbMapper extends BaseMapper { + ListgetList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("powerType")String powerType, + @Param("adcd")String adcd + ); + + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("powerType")String powerType, + @Param("adcd")String adcd + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java index 14e564f1..e3dc9184 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java @@ -17,6 +17,6 @@ import java.util.Map; @Repository public interface BsSgcDfBzbpMapper extends BaseMapper { - List selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd); - List> getStatistics(@Param("embankmentName") String embankmentCode,@Param("adcd")String adcd); + List selectList1(@Param("pageNum") int pageNum,@Param("pageSize") int pageSize,@Param("embankmentName") String embankmentCode,@Param("adcd") String adcd,@Param("dikeCode")String dikeCode); + List> getStatistics(@Param("embankmentName") String embankmentCode,@Param("adcd")String adcd,@Param("dikeCode")String dikeCode); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxwzMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxwzMapper.java index 85fc2759..efbbc654 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxwzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxwzMapper.java @@ -1,10 +1,14 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.df.domain.BsSgcDfFxwz; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzFxwz; +import java.util.List; + /** * 水闸防汛物资Mapper接口 * @@ -14,4 +18,21 @@ import com.kms.yg.sz.domain.BsSgcSzFxwz; @Repository public interface BsSgcDfFxwzMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("personName")String personName, + @Param("adcd")String adcd, + @Param("materialName")String materialName); + + List getCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("personName")String personName, + @Param("adcd")String adcd, + @Param("materialName")String materialName); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java index f8052752..2212445b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java @@ -2,8 +2,12 @@ package com.kms.yg.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfYaxx; +import com.kms.yg.sz.domain.BsSgcSzYaxx; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 水闸预案Mapper接口 * @@ -13,4 +17,21 @@ import org.springframework.stereotype.Repository; @Repository public interface BsSgcDfYaxxMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("type")String type, + @Param("adcd")String adcd + ); + + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("type")String type, + @Param("adcd")String adcd + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java index b8b3cde8..4e336230 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java @@ -2,6 +2,7 @@ package com.kms.yg.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfYhxx; +import com.kms.yg.sz.domain.BsSgcSzYhxx; import com.kms.yg.sz.domain.dto.PieDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -22,4 +23,24 @@ public interface BsSgcDfYhxxMapper extends BaseMapper { List getHistogram(@Param("layer") Integer layer, @Param("adcd") String xzqh); + + + ListgetList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("inspectionType")String inspectionType, + @Param("adcd")String adcd + ); + + + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("dikeCode")String dikeCode, + @Param("dikeName") String dikeName, + @Param("inspectionType")String inspectionType, + @Param("adcd")String adcd + ); } 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 31103b60..3c63c432 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 @@ -1,10 +1,19 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; +import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 水闸备用电源主Service接口 * @@ -14,4 +23,28 @@ import org.springframework.stereotype.Service; @Service public class BsSgcDfBydyzbService extends BaseService{ + @Autowired + private BsSgcDfBydyzbMapper bsSgcDfBydyzbMapper; + @Autowired + private BsSgcDfBydyService bsSgcDfBydyService; + + + public Page getPage(SearchParam sp){ + BsSgcDfBydyzb data = sp.getData(); + List list = bsSgcDfBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeCode(), data.getDikeName(), data.getPowerType(), data.getAdcdQx()); + for (BsSgcDfBydyzb zb:list){ + LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); + int count = bsSgcDfBydyService.count(lw.eq(BsSgcDfBydy::getBydyzbId, zb.getId())); + zb.setTotal(String.valueOf(count)); + } + Integer size = bsSgcDfBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getDikeCode(), data.getDikeName(), data.getPowerType(), data.getAdcdQx()).size(); + + Pagepage=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 384449ec..14fe6fbf 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 @@ -54,7 +54,7 @@ public class BsSgcDfBzbpService extends BaseService page = new Page<>(sp.getPageNum(),sp.getPageSize()); List infoPage = bsSgcDfBzbpMapper - .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd); + .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd,projectInfo.getDikeCode()); Page bsSgcDfBzbpPage = new Page<>(); bsSgcDfBzbpPage.setRecords(infoPage); @@ -66,7 +66,7 @@ public class BsSgcDfBzbpService extends BaseServicegetStatistics(SearchParam sp, String adcd){ BsSgcDfBzbp projectInfo = sp.getData(); - List> statistics = bsSgcDfBzbpMapper.getStatistics(projectInfo.getDikeName(), adcd); + List> statistics = bsSgcDfBzbpMapper.getStatistics(projectInfo.getDikeName(), adcd,projectInfo.getDikeCode()); Mapmap=new HashMap<>(); for ( MapintegerMap:statistics){ map.put((String) integerMap.get("name"), Math.toIntExact((Long) integerMap.get("num"))); 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 e4d45536..2942ba09 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 @@ -2,7 +2,9 @@ package com.kms.yg.df.service; 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.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.df.domain.BsSgcDfAqrw; @@ -41,15 +43,20 @@ public class BsSgcDfDfrwService extends BaseService sp) { - Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isNotBlank(sp.getData().getDikeCode())){ + wrapper.eq("dike_code",sp.getData().getDikeCode()); + } + Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper); List records = page.getRecords(); List list = new ArrayList<>(); for (BsSgcDfDfrw record : records) { String dikeCode = record.getDikeCode(); - BsSgcDfSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) - .eq(BsSgcDfSafeJbxx::getDikeCode,dikeCode)); + BsSgcDfSafeJbxx bsSgcSzSafeJbxx=new BsSgcDfSafeJbxx(); + bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + .eq(BsSgcDfSafeJbxx::getDikeCode,dikeCode).likeRight(BsSgcDfSafeJbxx::getAdcd,bsSgcSzSafeJbxx.getAdcdQx())); if (ObjectUtil.isNull(bsSgcSzSafeJbxx)) { continue; } 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 34001712..372cfe16 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 @@ -1,9 +1,18 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfFxwz; import com.kms.yg.df.mapper.BsSgcDfFxwzMapper; +import com.kms.yg.sz.domain.BsSgcSzFxwz; +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; + +import java.util.List; + /** * 水闸防汛物资Service接口 * @@ -13,4 +22,25 @@ import org.springframework.stereotype.Service; @Service public class BsSgcDfFxwzService extends BaseService{ + @Autowired + private SysXzqhService sysXzqhService; + @Autowired + private BsSgcDfFxwzMapper bsSgcDfFxwzMapper; + public Page getPage(SearchParam sp){ + BsSgcDfFxwz data = sp.getData(); + String adcd=null; + if (StringUtils.isNotEmpty(data.getAdcd())){ + adcd=sysXzqhService.getSubString(adcd); + }else { + adcd=data.getAdcdQx(); + } + Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + 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(), + data.getPersonName(), adcd,data.getMaterialName()).size(); + page.setRecords(list); + page.setTotal(count); + return page; + } } 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 ebe78a5d..d38587f0 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 @@ -12,6 +12,7 @@ import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper; 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; @@ -90,8 +91,14 @@ public class BsSgcDfFzrService extends BaseService BsSgcDfFzr data = sp.getData(); Map params = sp.getParams(); + String adcd=null; + if (StringUtils.isNotEmpty(data.getAdcd())) { + adcd=sysXzqhService.getSubString(data.getAdcd()); + }else { + adcd=data.getAdcdQx(); + } - List list =bsSgcDfFzrMapper.getList(data.getId(), data.getDikeCode(), sysXzqhService.getSubString(data.getAdcd()), + List list =bsSgcDfFzrMapper.getList(data.getId(), data.getDikeCode(), adcd, (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),data.getDikeName()); Page page = new Page<>(); 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 8a4233a9..fe15d0d0 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 @@ -1,10 +1,17 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.df.domain.BsSgcDfYaxx; import com.kms.yg.df.mapper.BsSgcDfYaxxMapper; +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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 水闸预案Service接口 * @@ -13,5 +20,18 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcDfYaxxService extends BaseService{ + @Autowired + private BsSgcDfYaxxMapper bsSgcDfYaxxMapper; + public Page getPage(SearchParam sp){ + BsSgcDfYaxx data = sp.getData(); + 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 f96f31c6..deeea1f4 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 @@ -1,10 +1,13 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfYhxx; import com.kms.yg.df.mapper.BsSgcDfYhxxMapper; +import com.kms.yg.sz.domain.BsSgcSzYhxx; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,4 +55,17 @@ public class BsSgcDfYhxxService extends BaseService getPage(SearchParam sp){ + BsSgcDfYhxx data = sp.getData(); + 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/BsSgcSzBydyzbController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java index 86665f44..9125e72d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java @@ -55,15 +55,7 @@ public class BsSgcSzBydyzbController extends BaseController public IPage list(@RequestBody SearchParam sp) { - IPage bsSgcSzBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp); - List records = bsSgcSzBydyzbIPage.getRecords(); - for (BsSgcSzBydyzb zb:records){ - LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); - int count = bsSgcSzBydyService.count(lw.eq(BsSgcSzBydy::getBydyzbId, zb.getId())); - zb.setTotal(String.valueOf(count)); - } - - + IPage bsSgcSzBydyzbIPage = bsSgcSzBydyzbService.getPage(sp); return bsSgcSzBydyzbIPage; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java index d1c1f042..1617c7df 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java @@ -19,6 +19,7 @@ import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; @@ -72,64 +73,26 @@ public class BsSgcSzBzbpController extends BaseController public IPage list(@RequestBody SearchParam sp) { BsSgcSzBzbp projectInfo = sp.getData(); - String adcd = null; - if (projectInfo != null) { - adcd = projectInfo.getAdcd(); - } - - SysUser sysUser = UserUtils.getUser(); - if (sysUser.getUserName().equals("admin")) { - if (projectInfo != null && projectInfo.getAdcd() != null) { - String infoAdcd = projectInfo.getAdcd(); - QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); - SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==5) { - infoAdcd = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==4) { - infoAdcd = xzqh.getXzqhdm().substring(0, 4); - - }else { - infoAdcd = xzqh.getXzqhdm(); - } - return bsSgcSzBzbpService.selectPage(sp,infoAdcd); - }else { - return bsSgcSzBzbpService.selectPage(sp,null); - } - - }else if (adcd == null) { - SysUser user = UserUtils.getUser(); - SysDept dept = user.getDept(); - SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId()); - String substring = ""; - if (xzqh.getLayer()==5) { - substring = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==4) { - substring = xzqh.getXzqhdm().substring(0, 4); - - }else { - substring = xzqh.getXzqhdm(); - } - - return bsSgcSzBzbpService.selectPage(sp,substring); - }else { + String infoAdcd = null; + if (StringUtils.isNotEmpty(projectInfo.getAdcd())) { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==5) { - adcd = xzqh.getXzqhdm().substring(0, 2); + if (xzqh.getLayer() == 5) { + infoAdcd = xzqh.getXzqhdm().substring(0, 2); - } else if (xzqh.getLayer()==4) { - adcd = xzqh.getXzqhdm().substring(0, 4); + } else if (xzqh.getLayer() == 4) { + infoAdcd = xzqh.getXzqhdm().substring(0, 4); - }else { - adcd = xzqh.getXzqhdm(); + } else { + infoAdcd = xzqh.getXzqhdm(); } - return bsSgcSzBzbpService.selectPage(sp, adcd); + return bsSgcSzBzbpService.selectPage(sp, infoAdcd); + }else { + return bsSgcSzBzbpService.selectPage(sp, projectInfo.getAdcdQx()); } + } @PostMapping("/statistics") @@ -137,63 +100,24 @@ public class BsSgcSzBzbpController extends BaseController public Map getStatistics(@RequestBody SearchParam sp) { BsSgcSzBzbp projectInfo = sp.getData(); - String adcd = null; - if (projectInfo != null) { - adcd = projectInfo.getAdcd(); - } - - SysUser sysUser = UserUtils.getUser(); - if (sysUser.getUserName().equals("admin")) { - if (projectInfo != null && projectInfo.getAdcd() != null) { - String infoAdcd = projectInfo.getAdcd(); - QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); - SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==5) { - infoAdcd = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==4) { - infoAdcd = xzqh.getXzqhdm().substring(0, 4); - - }else { - infoAdcd = xzqh.getXzqhdm(); - } - return bsSgcSzBzbpService.getStatistics(sp,infoAdcd); - }else { - return bsSgcSzBzbpService.getStatistics(sp,null); - } - - }else if (adcd == null) { - SysUser user = UserUtils.getUser(); - SysDept dept = user.getDept(); - SysXzqh xzqh = sysXzqhService.getById(dept.getXzqhId()); - String substring = ""; - if (xzqh.getLayer()==5) { - substring = xzqh.getXzqhdm().substring(0, 2); - - } else if (xzqh.getLayer()==4) { - substring = xzqh.getXzqhdm().substring(0, 4); - - }else { - substring = xzqh.getXzqhdm(); - } - - return bsSgcSzBzbpService.getStatistics(sp,substring); - }else { + String infoAdcd = null; + if (StringUtils.isNotEmpty(projectInfo.getAdcd())) { QueryWrapper sysXzqhQueryWrapper = new QueryWrapper<>(); - sysXzqhQueryWrapper.eq("XZQHDM", adcd); + sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd); SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper); - if (xzqh.getLayer()==5) { - adcd = xzqh.getXzqhdm().substring(0, 2); + if (xzqh.getLayer() == 5) { + infoAdcd = xzqh.getXzqhdm().substring(0, 2); - } else if (xzqh.getLayer()==4) { - adcd = xzqh.getXzqhdm().substring(0, 4); + } else if (xzqh.getLayer() == 4) { + infoAdcd = xzqh.getXzqhdm().substring(0, 4); - }else { - adcd = xzqh.getXzqhdm(); + } else { + infoAdcd = xzqh.getXzqhdm(); } - return bsSgcSzBzbpService.getStatistics(sp, adcd); + return bsSgcSzBzbpService.getStatistics(sp, infoAdcd); + }else { + return bsSgcSzBzbpService.getStatistics(sp, projectInfo.getAdcdQx()); } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java index 351a6213..1c52170f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java @@ -3,6 +3,7 @@ package com.kms.yg.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; 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; @@ -22,6 +23,7 @@ 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; /** @@ -54,22 +56,9 @@ public class BsSgcSzFxwzController extends BaseController @ApiOperation("水闸防汛物资列表") public IPage list(@RequestBody SearchParam sp) { - IPage bsSgcSzFxwzIPage = bsSgcSzFxwzService.selectPage(sp); - List records = bsSgcSzFxwzIPage.getRecords(); + Page page = bsSgcSzFxwzService.getPage(sp); - for (BsSgcSzFxwz record : records) { - String wagaCode = record.getWagaCode(); - BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) - .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode),false); - - if (ObjectUtils.isNotEmpty(one)) { - record.setWagaName(one.getWagaName()); - } - - } - bsSgcSzFxwzIPage.setRecords(records); - - return bsSgcSzFxwzIPage; + return page; } /** 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 94ccba7c..5c078c55 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 @@ -1,11 +1,13 @@ package com.kms.yg.sz.controller; 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.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfFxzz; import com.kms.yg.sz.domain.BsSgcSzFxzz; import com.kms.yg.sz.domain.BsSgcSzFxzzcy; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; @@ -18,6 +20,7 @@ import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -63,6 +66,19 @@ public class BsSgcSzFxzzController extends BaseController @ApiOperation("防汛组织列表") public IPage list(@RequestBody SearchParam sp) { + BsSgcSzFxzz data = sp.getData(); + LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(data.getWagaName())){ + lw.eq(BsSgcSzFxzz::getWagaName,data.getWagaName()); + } + if (StringUtils.isNotEmpty(data.getWagaCode())){ + lw.eq(BsSgcSzFxzz::getWagaCode,data.getWagaCode()); + } + if (StringUtils.isNotEmpty(data.getAdcd())){ + lw.likeRight(BsSgcSzFxzz::getAdcd,sysXzqhService.getSubString(data.getAdcd())); + }else { + lw.likeRight(BsSgcSzFxzz::getAdcd,data.getAdcdQx()); + } return bsSgcSzFxzzService.selectPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index f2b3a015..5535b217 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java @@ -123,7 +123,7 @@ public class BsSgcSzSafeJbxxController extends BaseController { page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) - .eq(data.getAdcd()!=null,BsSgcSzSafeJbxx::getWagaCode,data.getWageCode()) + .eq(data.getWagaCode()!=null,BsSgcSzSafeJbxx::getWagaCode,data.getWagaCode()) .like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType()) .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus()) diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java index 7d9fa307..9abb449b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java @@ -48,6 +48,8 @@ public class BsSgcSzSzrwController extends BaseController @ApiOperation("水闸鉴定任务关联列表") public IPage list(@RequestBody SearchParam sp) { + + return bsSgcSzSzrwService.selectPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java index e39a3a61..5f8c8058 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java @@ -48,7 +48,8 @@ public class BsSgcSzYaxxController extends BaseController @ApiOperation("水闸预案列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzYaxxService.selectPage(sp); + + return bsSgcSzYaxxService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java index 12a63693..248d16f2 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java @@ -92,7 +92,8 @@ public class BsSgcSzYhxxController extends BaseController @ApiOperation("水闸隐患信息列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzYhxxService.selectPage(sp); + + return bsSgcSzYhxxService.getPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java index 118539ae..0c0c17bb 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydyzb.java @@ -1,6 +1,8 @@ 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 com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +10,7 @@ import lombok.Data; import com.shuili.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -20,7 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_bydyzb") @Data @ApiModel("水闸备用电源主") -public class BsSgcSzBydyzb extends BaseEntity +public class BsSgcSzBydyzb extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -62,4 +64,14 @@ public class BsSgcSzBydyzb extends BaseEntity @ApiModelProperty("水闸名称") private String relation; + @TableField(exist = false) + private String adcd; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.wagaCode; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java index 073d0d8b..a8cfa72c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java @@ -3,11 +3,14 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +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; import java.util.Date; @@ -21,7 +24,7 @@ import java.util.Date; @TableName("bs_sgc_sz_bzbp") @Data @ApiModel("水闸标识标牌") -public class BsSgcSzBzbp extends BaseEntity +public class BsSgcSzBzbp extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -105,4 +108,11 @@ public class BsSgcSzBzbp extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss:SSS",timezone="GMT+8") private Date sortTime; + + 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/BsSgcSzFxwz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java index 26622c86..efa39fdf 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java @@ -1,12 +1,16 @@ package com.kms.yg.sz.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +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; import java.util.Date; @@ -19,7 +23,7 @@ import java.util.Date; @TableName("bs_sgc_sz_fxwz") @Data @ApiModel("水闸防汛物资") -public class BsSgcSzFxwz extends BaseEntity +public class BsSgcSzFxwz extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -93,4 +97,13 @@ public class BsSgcSzFxwz extends BaseEntity @ApiModelProperty("保质期") private String shelfLife; + @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/BsSgcSzFxzz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java index b61564a2..c053abf0 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.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_fxzz") @Data @ApiModel("防汛组织") -public class BsSgcSzFxzz extends BaseEntity +public class BsSgcSzFxzz extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -92,6 +94,12 @@ public class BsSgcSzFxzz extends BaseEntity private String wagaType; private String wagaCode; + 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/BsSgcSzFzr.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java index d3a1ff4b..361983ca 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java @@ -3,11 +3,14 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +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; import java.util.Date; @@ -22,7 +25,7 @@ import java.util.Date; @TableName("bs_sgc_sz_fzr") @Data @ApiModel("水闸负责人") -public class BsSgcSzFzr extends BaseEntity +public class BsSgcSzFzr extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -119,9 +122,11 @@ public class BsSgcSzFzr extends BaseEntity 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/BsSgcSzSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java index 6cec8fb3..f6dd727b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java @@ -310,7 +310,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd { @JsonFormat(pattern = "yyyy-MM-dd") private Date checkDate; - public String getWageCode() { + public String getWagaCode() { if (StringUtils.isEmpty(this.wagaCode)) { this.wagaCode = AuthorityDikeCodeService.getAuthorityWagaCode(); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSzrw.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSzrw.java index f52a249b..c43a059b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSzrw.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSzrw.java @@ -2,6 +2,8 @@ package com.kms.yg.sz.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -11,6 +13,7 @@ import com.shuili.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; import lombok.NoArgsConstructor; +import org.springframework.util.StringUtils; /** @@ -72,4 +75,10 @@ public class BsSgcSzSzrw extends BaseEntity private String status; + 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/BsSgcSzYaxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYaxx.java index 8c1a66ac..4b96401d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYaxx.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYaxx.java @@ -1,7 +1,11 @@ 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 com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -9,7 +13,7 @@ import lombok.Data; import com.shuili.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; - +import org.springframework.util.StringUtils; /** @@ -21,7 +25,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("bs_sgc_sz_yaxx") @Data @ApiModel("水闸预案") -public class BsSgcSzYaxx extends BaseEntity +public class BsSgcSzYaxx extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -96,4 +100,13 @@ public class BsSgcSzYaxx extends BaseEntity @ApiModelProperty("图片") private String relation; + @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/BsSgcSzYhxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYhxx.java index 4bb8bb5a..37218111 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYhxx.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzYhxx.java @@ -2,7 +2,11 @@ package com.kms.yg.sz.domain; import java.math.BigDecimal; 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; @@ -10,6 +14,7 @@ import com.shuili.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; import com.shuili.common.core.domain.BaseEntity; +import org.springframework.util.StringUtils; /** @@ -21,7 +26,7 @@ import com.shuili.common.core.domain.BaseEntity; @TableName("bs_sgc_sz_yhxx") @Data @ApiModel("水闸隐患信息") -public class BsSgcSzYhxx extends BaseEntity +public class BsSgcSzYhxx extends BaseEntity implements IAdcd { private static final long serialVersionUID = 1L; @@ -121,4 +126,13 @@ public class BsSgcSzYhxx extends BaseEntity @ApiModelProperty("水闸类型") private String relation; + @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/BsSgcSzBydyzbMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java index 99ae2a89..06981e54 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfBydyzb; import com.kms.yg.sz.domain.BsSgcSzBydyzb; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 水闸备用电源主Mapper接口 * @@ -12,5 +16,22 @@ import org.springframework.stereotype.Repository; */ @Repository public interface BsSgcSzBydyzbMapper extends BaseMapper { + List getList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("powerType")String powerType, + @Param("adcd")String adcd + ); + + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("powerType")String powerType, + @Param("adcd")String adcd + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java index b78e8a42..7c92b65a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java @@ -17,7 +17,7 @@ import java.util.Map; @Repository public interface BsSgcSzBzbpMapper extends BaseMapper { - List selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("wagaName") String sluiceName, @Param("adcd") String adcd); - List> getStatistics(@Param("wagaName") String sluiceName, @Param("adcd")String adcd); + List selectList1(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("wagaName") String sluiceName, @Param("adcd") String adcd,@Param("wagaCode")String wagaCode); + List> getStatistics(@Param("wagaName") String sluiceName, @Param("adcd")String adcd,@Param("wagaCode")String wagaCode); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java index dcb4e220..51a957c7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sz.domain.BsSgcSzFxwz; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 水闸防汛物资Mapper接口 * @@ -12,5 +16,20 @@ import org.springframework.stereotype.Repository; */ @Repository public interface BsSgcSzFxwzMapper extends BaseMapper { + List getList(@Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("personName")String personName, + @Param("adcd")String adcd, + @Param("materialName")String materialName); + + List getCount(@Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("personName")String personName, + @Param("adcd")String adcd, + @Param("materialName")String materialName); } 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 f4474982..517df6ba 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 @@ -2,8 +2,11 @@ package com.kms.yg.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzYaxx; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 水闸预案Mapper接口 * @@ -12,5 +15,21 @@ import org.springframework.stereotype.Repository; */ @Repository public interface BsSgcSzYaxxMapper extends BaseMapper { + ListgetList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("inspectionType")String inspectionType, + @Param("adcd")String adcd + ); + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("inspectionType")String inspectionType, + @Param("adcd")String adcd + ); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java index 259b85b8..0f3039e7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java @@ -22,4 +22,25 @@ public interface BsSgcSzYhxxMapper extends BaseMapper { List getHistogram(@Param("layer") Integer layer, @Param("adcd") String xzqh); + + ListgetList( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("inspectionType")String inspectionType, + @Param("adcd")String adcd + ); + + + ListgetCount( + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCode, + @Param("wagaName") String wagaName, + @Param("inspectionType")String inspectionType, + @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 8a780cb8..1e2f5868 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 @@ -1,10 +1,21 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.df.service.BsSgcDfBydyService; +import com.kms.yg.sz.domain.BsSgcSzBydy; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 水闸备用电源主Service接口 * @@ -13,5 +24,25 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcSzBydyzbService extends BaseService{ + @Autowired + private BsSgcSzBydyzbMapper bsSgcSzBydyzbMapper; + @Autowired + private BsSgcSzBydyService bsSgcSzBydyService; + public Page getPage(SearchParam sp){ + BsSgcSzBydyzb data = sp.getData(); + List list = bsSgcSzBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getWagaCode(), data.getPowerType(), data.getAdcdQx()); + for (BsSgcSzBydyzb zb:list){ + LambdaQueryWrapper lw=new LambdaQueryWrapper<>(); + int count = bsSgcSzBydyService.count(lw.eq(BsSgcSzBydy::getBydyzbId, zb.getId())); + zb.setTotal(String.valueOf(count)); + } + Integer size = bsSgcSzBydyzbMapper.getList(sp.getPageNum(), sp.getPageSize(), + data.getWagaName(), data.getWagaCode(), data.getPowerType(), data.getAdcdQx()).size(); + Pagepage=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 e25e9275..389e2d04 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 @@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper; 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; @@ -37,6 +38,7 @@ public class BsSgcSzBzbpService extends BaseService page = new Page<>(sp.getPageNum(),sp.getPageSize()); List infoPage = bsSgcSzBzbpMapper.selectList1(sp.getPageNum(),sp.getPageSize(), - projectInfo.getWagaName(),adcd); + projectInfo.getWagaName(),adcd,projectInfo.getWagaCode()); Page bzbpPage = new Page<>(); @@ -67,8 +69,7 @@ public class BsSgcSzBzbpService extends BaseServicegetStatistics(SearchParam sp, String adcd){ BsSgcSzBzbp projectInfo = sp.getData(); - - List> statistics = bsSgcSzBzbpMapper.getStatistics(projectInfo.getWagaName(), adcd); + List> statistics = bsSgcSzBzbpMapper.getStatistics(projectInfo.getWagaName(), adcd,projectInfo.getWagaCode()); Mapmap=new HashMap<>(); for ( MapintegerMap:statistics){ 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 e44ba8ed..4f5620ea 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 @@ -1,9 +1,18 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzFxwz; import com.kms.yg.sz.mapper.BsSgcSzFxwzMapper; +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; + +import java.util.List; + /** * 水闸防汛物资Service接口 * @@ -12,5 +21,25 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcSzFxwzService extends BaseService{ - + @Autowired + private SysXzqhService sysXzqhService; + @Autowired + private BsSgcSzFxwzMapper bsSgcSzFxwzMapper; + public PagegetPage(SearchParam sp){ + BsSgcSzFxwz data = sp.getData(); + String adcd=null; + if (StringUtils.isNotEmpty(data.getAdcd())){ + adcd=sysXzqhService.getSubString(adcd); + }else { + adcd=data.getAdcdQx(); + } + 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 a4e8f40a..607649f7 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 @@ -11,6 +11,7 @@ import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper; import com.kms.yg.sz.mapper.BsSgcSzFzrMapper; 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; @@ -89,9 +90,14 @@ public class BsSgcSzFzrService extends BaseService BsSgcSzFzr data = sp.getData(); Map params = sp.getParams(); - - List list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()),sp.getData().getWagaCode(), - (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); + String adcd=null; + if (StringUtils.isNotEmpty(data.getAdcd())) { + adcd = sysXzqhService.getSubString(data.getAdcd()); + }else { + adcd=data.getAdcdQx(); + } + List list = bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), adcd, sp.getData().getWagaCode(), + (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); Page page = new Page<>(); 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 49096b26..8a24e7c5 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 @@ -2,7 +2,9 @@ package com.kms.yg.sz.service; 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.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sz.domain.BsSgcSzAqrw; @@ -39,15 +41,20 @@ public class BsSgcSzSzrwService extends BaseService sp) { - Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + QueryWrapper wrapper = BeanToWrapper.getWrapper(sp); + if (StringUtils.isNotBlank(sp.getData().getWagaCode())){ + wrapper.eq("waga_code",sp.getData().getWagaCode()); + } + Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper); List records = page.getRecords(); List list = new ArrayList<>(); for (BsSgcSzSzrw record : records) { String wagaId = record.getWagaCode(); - BsSgcSzSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) - .eq(BsSgcSzSafeJbxx::getWagaCode, wagaId)); + BsSgcSzSafeJbxx bsSgcSzSafeJbxx=new BsSgcSzSafeJbxx(); + bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaId).likeRight(BsSgcSzSafeJbxx::getAdcd,bsSgcSzSafeJbxx.getAdcdQx())); LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); BsSgcSzAqrw bsSgcSzAqrw = bsSgcSzAqrwMapper.selectOne(lw.eq(BsSgcSzAqrw::getId, record.getTaskId())); 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 2846d816..5d69a4d1 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 @@ -1,10 +1,15 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 水闸预案Service接口 * @@ -13,5 +18,18 @@ import org.springframework.stereotype.Service; */ @Service public class BsSgcSzYaxxService extends BaseService{ + @Autowired + private BsSgcSzYaxxMapper bsSgcSzYaxxMapper; + public PagegetPage(SearchParam sp){ + BsSgcSzYaxx data = sp.getData(); + 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 350427bf..559281ee 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 @@ -1,10 +1,12 @@ package com.kms.yg.sz.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzYhxx; import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper; +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; @@ -28,6 +30,18 @@ public class BsSgcSzYhxxService extends BaseService getPage(SearchParam sp){ + BsSgcSzYhxx data = sp.getData(); + 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; + } + public List getPie(Integer layer, String xzqh) { return bsSgcSzYhxxMapper.getPie(layer, sysXzqhService.getSubString(xzqh)); diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBydyzbMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBydyzbMapper.xml new file mode 100644 index 00000000..211b6836 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBydyzbMapper.xml @@ -0,0 +1,65 @@ + + + + + + select sd.id, sd.dike_code, sd.power_type, sd.dike_name, sd.create_uid, sd.update_uid, sd.create_time, + sd.update_time, sd.ower_dept, sd.remark, sd.relation, + sj.* + from bs_sgc_df_bydyzb 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/BsSgcDfBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml index 861df5e5..15eb9336 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml @@ -33,6 +33,9 @@ and adcd like concat(#{adcd},'%') + + and embankment_code=#{dikeCode} + GROUP BY embankment_code ORDER BY create_time DESC @@ -51,6 +54,9 @@ and adcd like concat(#{adcd},'%') + + and embankment_code=#{dikeCode} + GROUP BY adcd diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFxwzMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFxwzMapper.xml new file mode 100644 index 00000000..31c920ae --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFxwzMapper.xml @@ -0,0 +1,78 @@ + + + + + + select sd.id, sd.material_name, sd.person_name, sd.person_phone,sd.person_level, + sd.material_number, sd.procurement_time, sd.material_type,sd.shelf_life, + sj.* + from bs_sgc_df_fxwz 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/BsSgcDfFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml index ca6f628e..5eaff758 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml @@ -71,6 +71,9 @@ and sj.dike_CODE =#{dikeCode} + + and sj.adcd like concat(#{adcd},'%') + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYaxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYaxxMapper.xml new file mode 100644 index 00000000..a74d0c64 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYaxxMapper.xml @@ -0,0 +1,71 @@ + + + + + + select sd.id, sd.dike_id, sd.dike_code, sd.dike_name, sd.dike_type, + sd.engineer_scale, sd.person_name, sd.type, sd.implementation_time, sd.plan_content, sd.photo, + sj.* + from bs_sgc_df_yaxx 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/BsSgcDfYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml index e9b2987d..1c2f6d69 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml @@ -91,4 +91,79 @@ GROUP BY sy.`status` + + + + select sd.id, sd.dike_code, proposer, find_time, address, inspection_type, instrument, + danger_detail, photo, sd.status, cost, finish_method, result, sd.dike_name, sd.dike_type, + head, + processing_time, + sj.* + from bs_sgc_df_yhxx sd + left join att_dike_base sj on sd.dike_code = sj.dike_CODE + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBydyzbMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBydyzbMapper.xml new file mode 100644 index 00000000..43cd9c84 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBydyzbMapper.xml @@ -0,0 +1,65 @@ + + + + + + select sd.id, sd.waga_code, sd.power_type, sd.waga_name, sd.create_uid, sd.update_uid, sd.create_time, + sd.update_time, sd.ower_dept, sd.remark, sd.relation, + sj.* + from bs_sgc_sz_bydyzb 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/BsSgcSzBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml index 8b0621a6..fab0919c 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzbpMapper.xml @@ -33,6 +33,9 @@ and adcd like concat(#{adcd},'%') + + and waga_code=#{wagaCode} + GROUP BY waga_code ORDER BY create_time DESC @@ -51,6 +54,9 @@ and adcd like concat(#{adcd},'%') + + and adcd =#{wagaCode} + GROUP BY adcd diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFxwzMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFxwzMapper.xml new file mode 100644 index 00000000..ff8bc8eb --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFxwzMapper.xml @@ -0,0 +1,77 @@ + + + + + + select sd.id, sd.material_name, sd.person_name, sd.person_phone,sd.person_level, + sd.material_number, sd.procurement_time, sd.material_type,sd.shelf_life, + sj.* + from bs_sgc_sz_fxwz 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/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml index ebf663cc..d9a14966 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -71,6 +71,9 @@ and sj.WAGA_CODE =#{wagaCode} + + and sj.adcd like concat(#{adcd},'%') + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYaxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYaxxMapper.xml new file mode 100644 index 00000000..4c7e54ee --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYaxxMapper.xml @@ -0,0 +1,71 @@ + + + + + + select sd.id, sd.waga_id, sd.waga_code, sd.waga_name, sd.waga_type, + sd.engineer_scale, sd.person_name, sd.type, sd.implementation_time, sd.plan_content, sd.photo, + sj.* + from bs_sgc_sz_yaxx 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/BsSgcSzYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml index 7e8843ed..53e5c3ce 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml @@ -90,4 +90,79 @@ GROUP BY sy.`status` + + + + select sd.id, sd.waga_code, proposer, find_time, address, inspection_type, instrument, + danger_detail, photo, sd.status, cost, finish_method, result, sd.waga_name, sd.waga_type, + head, + processing_time, + sj.* + from bs_sgc_sz_yhxx sd + left join att_waga_base sj on sd.waga_code = sj.WAGA_CODE + + + + + + + + + + + + + + + + + + + + + + + + + + + +