From bbd08366b2bd752b1e40dfcd1a6139616780cee1 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Tue, 18 Mar 2025 01:59:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=89=B4=E5=AE=9A=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcDfBydyzbController.java | 18 ++++++++- .../com/kms/yg/df/domain/BsSgcDfBydyzb.java | 3 ++ .../java/com/kms/yg/df/domain/BsSgcDfFzr.java | 3 ++ .../com/kms/yg/df/domain/dto/DfrwDto.java | 2 + .../kms/yg/df/service/BsSgcDfAqrwService.java | 8 ++-- .../kms/yg/df/service/BsSgcDfDfrwService.java | 10 +++++ ...oller.java => AttRessBasesController.java} | 33 +++++++-------- .../controller/BsSgcResBydyzbController.java | 21 +++++++++- .../controller/BsSgcResFxzzController.java | 14 +++---- .../{AttResBase.java => AttRessBase.java} | 2 +- .../com/kms/yg/res/domain/BsSgcResBydyzb.java | 4 ++ ...BaseMapper.java => AttResBasesMapper.java} | 4 +- ...seService.java => AttResBasesService.java} | 7 ++-- .../controller/BsSgcSzBydyzbController.java | 17 +++++++- .../com/kms/yg/sz/domain/BsSgcSzBydyzb.java | 4 ++ .../java/com/kms/yg/sz/domain/BsSgcSzFzr.java | 2 + .../com/kms/yg/sz/domain/dto/SzrwDto.java | 2 + .../kms/yg/sz/mapper/BsSgcSzFzrMapper.java | 1 + .../kms/yg/sz/service/BsSgcSzAqrwService.java | 8 ++-- .../kms/yg/sz/service/BsSgcSzFzrService.java | 2 +- .../kms/yg/sz/service/BsSgcSzSzrwService.java | 10 +++++ .../yxgh/common/enums/StaticIndexEnum.java | 4 +- .../resources/mapper/system/SysDeptMapper.xml | 4 +- .../resources/mapper/system/SysUserMapper.xml | 8 +--- .../mapper/yg/df/BsSgcDfAqrwMapper.xml | 40 ++++++------------- .../mapper/yg/sz/BsSgcSzAqrwMapper.xml | 35 +++++----------- .../mapper/yg/sz/BsSgcSzFzrMapper.xml | 3 ++ 27 files changed, 165 insertions(+), 104 deletions(-) rename shuili-system/src/main/java/com/kms/yg/res/controller/{AttResBaseController.java => AttRessBasesController.java} (72%) rename shuili-system/src/main/java/com/kms/yg/res/domain/{AttResBase.java => AttRessBase.java} (98%) rename shuili-system/src/main/java/com/kms/yg/res/mapper/{AttResBaseMapper.java => AttResBasesMapper.java} (67%) rename shuili-system/src/main/java/com/kms/yg/res/service/{AttResBaseService.java => AttResBasesService.java} (56%) 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 b6475927..4b10350d 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 @@ -1,11 +1,16 @@ package com.kms.yg.df.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; 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.service.BsSgcDfBydyService; import com.kms.yg.df.service.BsSgcDfBydyzbService; +import com.kms.yg.sz.domain.BsSgcSzBydy; +import com.kms.yg.sz.domain.BsSgcSzBydyzb; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -35,7 +40,8 @@ public class BsSgcDfBydyzbController extends BaseController { @Autowired private BsSgcDfBydyzbService bsSgcSzBydyzbService; - + @Autowired + private BsSgcDfBydyService bsSgcDfBydyService; @Autowired private SysXzqhService sysXzqhService; @@ -49,7 +55,15 @@ public class BsSgcDfBydyzbController extends BaseController @ApiOperation("水闸备用电源主列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzBydyzbService.selectPage(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; } /** 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 253e46e0..12bdcb16 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 @@ -1,5 +1,6 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; @@ -57,4 +58,6 @@ public class BsSgcDfBydyzb extends BaseEntity @ApiModelProperty("水闸名称") private String relation; + @TableField(exist = false) + private String total; } 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 f5832111..235ad311 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 @@ -100,6 +100,9 @@ public class BsSgcDfFzr extends BaseEntity @ApiModelProperty("防汛负责人类型") private String personType; + @ApiModelProperty("安全负责人类型") + private String safetyType; + /** 类型 */ @Excel(name = "类型") @ApiModelProperty("类型") diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java index 50abe3a3..40ed8e62 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfrwDto.java @@ -12,6 +12,8 @@ public class DfrwDto { private String id; + private String taskName; + private String dikeName; private String dikeType; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java index 1accecab..1fed75ea 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java @@ -171,25 +171,25 @@ public class BsSgcDfAqrwService extends BaseService sp) { Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); @@ -48,8 +54,12 @@ public class BsSgcDfDfrwService extends BaseServicelw=new LambdaQueryWrapper<>(); + BsSgcDfAqrw bsSgcDfAqrw = bsSgcDfAqrwMapper.selectOne(lw.eq(BsSgcDfAqrw::getId, record.getTaskId())); + DfrwDto szrwDto = new DfrwDto(); szrwDto.setId(record.getId()); + szrwDto.setTaskName(bsSgcDfAqrw.getTaskName()); szrwDto.setDikeName(bsSgcSzSafeJbxx.getDikeName()); szrwDto.setDikeType(bsSgcSzSafeJbxx.getDikeType()); szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd()); diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/AttResBaseController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/AttRessBasesController.java similarity index 72% rename from shuili-system/src/main/java/com/kms/yg/res/controller/AttResBaseController.java rename to shuili-system/src/main/java/com/kms/yg/res/controller/AttRessBasesController.java index 6ab73353..40ff7709 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/controller/AttResBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/AttRessBasesController.java @@ -3,6 +3,7 @@ package com.kms.yg.res.controller; import java.util.Arrays; import java.util.List; +import com.kms.yg.res.service.AttResBasesService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -27,8 +28,8 @@ import com.shuili.common.mybaitsplus.BeanToWrapper; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.enums.BusinessType; -import com.kms.yg.res.domain.AttResBase; -import com.kms.yg.res.service.AttResBaseService; +import com.kms.yg.res.domain.AttRessBase; + /** @@ -40,10 +41,10 @@ import com.kms.yg.res.service.AttResBaseService; @RestController @RequestMapping("/res/base") @Api(tags = "水库基本信息") -public class AttResBaseController extends BaseController +public class AttRessBasesController extends BaseController { @Autowired - private AttResBaseService attResBaseService; + private AttResBasesService AttRessBaseService; /** @@ -51,9 +52,9 @@ public class AttResBaseController extends BaseController */ @PostMapping("/list") @ApiOperation("水库基本信息列表") - public IPage list(@RequestBody SearchParam sp) + public IPage list(@RequestBody SearchParam sp) { - return attResBaseService.selectPage(sp); + return AttRessBaseService.selectPage(sp); } /** @@ -62,10 +63,10 @@ public class AttResBaseController extends BaseController @Log(title = "水库基本信息导出", businessType = BusinessType.EXPORT) @PostMapping("/export") @ApiOperation("水库基本信息导出") - public AjaxResult export(@RequestBody AttResBase attResBase) + public AjaxResult export(@RequestBody AttRessBase AttRessBase) { - List list = attResBaseService.listByIds(attResBase.getIds()); - ExcelUtil util = new ExcelUtil<>(AttResBase.class); + List list = AttRessBaseService.listByIds(AttRessBase.getIds()); + ExcelUtil util = new ExcelUtil<>(AttRessBase.class); return util.exportExcel(list, "base"); } @@ -76,7 +77,7 @@ public class AttResBaseController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(attResBaseService.getById(id)); + return AjaxResult.success(AttRessBaseService.getById(id)); } /** @@ -85,10 +86,10 @@ public class AttResBaseController extends BaseController @Log(title = "水库基本信息新增", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("水库基本信息新增") - public AjaxResult add(@RequestBody AttResBase attResBase) + public AjaxResult add(@RequestBody AttRessBase AttRessBase) { - BaseEntityUtils.preInsert(attResBase); - return toAjax(attResBaseService.save(attResBase)); + BaseEntityUtils.preInsert(AttRessBase); + return toAjax(AttRessBaseService.save(AttRessBase)); } /** @@ -97,9 +98,9 @@ public class AttResBaseController extends BaseController @ApiOperation("水库基本信息修改") @Log(title = "水库基本信息修改", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody AttResBase attResBase) + public AjaxResult edit(@RequestBody AttRessBase AttRessBase) { - return toAjax(attResBaseService.updateById(attResBase)); + return toAjax(AttRessBaseService.updateById(AttRessBase)); } /** @@ -110,6 +111,6 @@ public class AttResBaseController extends BaseController @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { - return toAjax(attResBaseService.removeByIds(Arrays.asList(ids))); + return toAjax(AttRessBaseService.removeByIds(Arrays.asList(ids))); } } diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java index 5f438e3f..32668fd0 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResBydyzbController.java @@ -1,12 +1,19 @@ package com.kms.yg.res.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfBydy; +import com.kms.yg.df.domain.BsSgcDfBydyzb; import com.kms.yg.res.domain.BsSgcResBydyzb; import com.kms.yg.res.service.BsSgcResBydyzbService; +import com.kms.yg.sz.domain.BsSgcSzBydy; +import com.kms.yg.sz.domain.BsSgcSzBydyzb; +import com.kms.yg.sz.service.BsSgcSzBydyService; +import com.kms.yg.sz.service.BsSgcSzBydyzbService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -36,6 +43,8 @@ public class BsSgcResBydyzbController extends BaseController @Autowired private BsSgcResBydyzbService bsSgcSzBydyzbService; + @Autowired + private BsSgcSzBydyService bsSgcSzBydyService; @Autowired private SysXzqhService sysXzqhService; @@ -49,7 +58,17 @@ public class BsSgcResBydyzbController extends BaseController @ApiOperation("水闸备用电源主列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzBydyzbService.selectPage(sp); + + IPage bsSgcSzBydyzbIPage = bsSgcSzBydyzbService.selectPage(sp); + List records = bsSgcSzBydyzbIPage.getRecords(); + for (BsSgcResBydyzb zb:records){ + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + int count = bsSgcSzBydyService.count(lw.eq(BsSgcSzBydy::getBydyzbId, zb.getId())); + zb.setTotal(String.valueOf(count)); + } + + + return bsSgcSzBydyzbIPage; } /** diff --git a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java index da82b860..813e3680 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java +++ b/shuili-system/src/main/java/com/kms/yg/res/controller/BsSgcResFxzzController.java @@ -8,11 +8,11 @@ import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.res.domain.AttResBase; +import com.kms.yg.res.domain.AttRessBase; import com.kms.yg.res.domain.BsSgcResFxzz; import com.kms.yg.res.domain.BsSgcResFxzzDto; import com.kms.yg.res.domain.BsSgcResFxzzcy; -import com.kms.yg.res.service.AttResBaseService; +import com.kms.yg.res.service.AttResBasesService; import com.kms.yg.res.service.BsSgcResFxzzService; import com.kms.yg.res.service.BsSgcResFxzzcyService; import com.shuili.common.annotation.Log; @@ -46,7 +46,7 @@ public class BsSgcResFxzzController extends BaseController private BsSgcResFxzzService bsSgcSzFxzzService; @Autowired - private AttResBaseService bsSgcSzSafeJbxxService; + private AttResBasesService bsSgcSzSafeJbxxService; @Autowired private BsSgcResFxzzcyService bsSgcSzFxzzcyService; @@ -99,8 +99,8 @@ public class BsSgcResFxzzController extends BaseController public AjaxResult add(@RequestBody BsSgcResFxzzDto dto) { String dikeCode = dto.getResCode(); - AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class) - .eq(AttResBase::getResCode, dikeCode)); + AttRessBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttRessBase.class) + .eq(AttRessBase::getResCode, dikeCode)); byId.setRemark("4"); bsSgcSzSafeJbxxService.updateById(byId); @@ -128,8 +128,8 @@ public class BsSgcResFxzzController extends BaseController public AjaxResult edit(@RequestBody BsSgcResFxzz bsSgcSzFxzz) { String dikeCode = bsSgcSzFxzz.getResCode(); - AttResBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttResBase.class) - .eq(AttResBase::getResCode, dikeCode)); + AttRessBase byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(AttRessBase.class) + .eq(AttRessBase::getResCode, dikeCode)); byId.setRemark("4"); bsSgcSzSafeJbxxService.updateById(byId); return toAjax(bsSgcSzFxzzService.updateById(bsSgcSzFxzz)); diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/AttResBase.java b/shuili-system/src/main/java/com/kms/yg/res/domain/AttRessBase.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/res/domain/AttResBase.java rename to shuili-system/src/main/java/com/kms/yg/res/domain/AttRessBase.java index 8819a6a0..8210f680 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/domain/AttResBase.java +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/AttRessBase.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("att_res_base") @Data @ApiModel("水库基本信息") -public class AttResBase extends BaseEntity +public class AttRessBase extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java index 846a82ff..a9b8e6e7 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java +++ b/shuili-system/src/main/java/com/kms/yg/res/domain/BsSgcResBydyzb.java @@ -1,5 +1,6 @@ package com.kms.yg.res.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; @@ -56,4 +57,7 @@ public class BsSgcResBydyzb extends BaseEntity @ApiModelProperty("水闸名称") private String relation; + @TableField(exist = false) + private String total; + } diff --git a/shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBasesMapper.java similarity index 67% rename from shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBaseMapper.java rename to shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBasesMapper.java index 3c795643..63297e81 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBaseMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/res/mapper/AttResBasesMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.res.mapper; +import com.kms.yg.res.domain.AttRessBase; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.res.domain.AttResBase; /** * 水库基本信息Mapper接口 @@ -11,6 +11,6 @@ import com.kms.yg.res.domain.AttResBase; * @date 2025-03-12 */ @Repository -public interface AttResBaseMapper extends BaseMapper { +public interface AttResBasesMapper extends BaseMapper { } diff --git a/shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java b/shuili-system/src/main/java/com/kms/yg/res/service/AttResBasesService.java similarity index 56% rename from shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java rename to shuili-system/src/main/java/com/kms/yg/res/service/AttResBasesService.java index e1b0e012..9baac79d 100644 --- a/shuili-system/src/main/java/com/kms/yg/res/service/AttResBaseService.java +++ b/shuili-system/src/main/java/com/kms/yg/res/service/AttResBasesService.java @@ -1,8 +1,9 @@ package com.kms.yg.res.service; +import com.kms.yg.res.domain.AttRessBase; +import com.kms.yg.res.mapper.AttResBasesMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.res.mapper.AttResBaseMapper; -import com.kms.yg.res.domain.AttResBase; + import org.springframework.stereotype.Service; /** * 水库基本信息Service接口 @@ -11,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2025-03-12 */ @Service -public class AttResBaseService extends BaseService{ +public class AttResBasesService extends BaseService{ } 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 eecf7f11..86665f44 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 @@ -1,10 +1,13 @@ package com.kms.yg.sz.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzBydy; import com.kms.yg.sz.domain.BsSgcSzBydyzb; +import com.kms.yg.sz.service.BsSgcSzBydyService; import com.kms.yg.sz.service.BsSgcSzBydyzbService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; @@ -35,6 +38,8 @@ public class BsSgcSzBydyzbController extends BaseController { @Autowired private BsSgcSzBydyzbService bsSgcSzBydyzbService; + @Autowired + private BsSgcSzBydyService bsSgcSzBydyService; @Autowired private SysXzqhService sysXzqhService; @@ -49,7 +54,17 @@ public class BsSgcSzBydyzbController extends BaseController @ApiOperation("水闸备用电源主列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzBydyzbService.selectPage(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)); + } + + + return bsSgcSzBydyzbIPage; } /** 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 3b9bd71b..118539ae 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,5 +1,6 @@ package com.kms.yg.sz.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,6 +39,9 @@ public class BsSgcSzBydyzb extends BaseEntity @ApiModelProperty("水闸名称") private String wagaName; + @TableField(exist = false) + private String total; + /** $column.columnComment */ @Excel(name = "水闸名称") @ApiModelProperty("水闸名称") 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 ab46e668..d3a1ff4b 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 @@ -100,6 +100,8 @@ public class BsSgcSzFzr extends BaseEntity @ApiModelProperty("防汛负责人类型") private String personType; + @ApiModelProperty("安全负责人类型") + private String safetyType; /** 类型 */ @Excel(name = "类型") @ApiModelProperty("类型") diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java index 00f83404..fd405177 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/dto/SzrwDto.java @@ -12,6 +12,8 @@ public class SzrwDto { private String id; + private String taskName; + private String wagaName; private String wagaType; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java index 93fff33e..048283d0 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java @@ -36,6 +36,7 @@ public interface BsSgcSzFzrMapper extends BaseMapper { List getList(@Param("id") String id, @Param("wageName") String wageName, @Param("adcd") String adcd, + @Param("wagaCode")String wagaCode, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, @Param("pageSize") int pageSize); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java index 2830a18a..37753b6c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java @@ -170,25 +170,25 @@ public class BsSgcSzAqrwService extends BaseService Map params = sp.getParams(); - List list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()), + List list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()),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 51819a3c..ba2ed0b0 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 @@ -1,12 +1,15 @@ 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.sz.domain.BsSgcSzAqrw; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.domain.dto.SzrwDto; +import com.kms.yg.sz.mapper.BsSgcSzAqrwMapper; import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; import com.shuili.common.core.domain.SearchParam; @@ -33,6 +36,8 @@ public class BsSgcSzSzrwService extends BaseService sp) { Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); @@ -43,12 +48,17 @@ public class BsSgcSzSzrwService extends BaseServicelw=new LambdaQueryWrapper<>(); + BsSgcSzAqrw bsSgcSzAqrw = bsSgcSzAqrwMapper.selectOne(lw.eq(BsSgcSzAqrw::getId, record.getTaskId())); + if (ObjectUtil.isNull(bsSgcSzSafeJbxx)) { continue; } SzrwDto szrwDto = new SzrwDto(); szrwDto.setId(record.getId()); + szrwDto.setTaskName(bsSgcSzAqrw.getTaskName()); szrwDto.setWagaName(bsSgcSzSafeJbxx.getWagaName()); szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType()); szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index 2a0c661d..95b9e368 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -7,7 +7,7 @@ import com.kms.system.service.SysXzqhService; import com.kms.yg.cz.service.AttStBaseService; import com.kms.yg.cz.service.AttStMpService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.res.service.AttResBaseService; +import com.kms.yg.res.service.AttResBasesService; import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.kms.yg.sz.service.BsSgcSzSzrwService; @@ -325,7 +325,7 @@ public enum StaticIndexEnum { YZT_SK_SUM("水库", sp -> { Map map =new HashMap<>(); - AttResBaseService service = SpringUtils.getBean(AttResBaseService.class); + AttResBasesService service = SpringUtils.getBean(AttResBasesService.class); map.put("sum",String.valueOf(service.count())); return map; }, "座", "0"), diff --git a/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml b/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml index e2e89cf6..3eb5c4a9 100644 --- a/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -21,7 +21,7 @@ - + @@ -38,7 +38,7 @@ select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag, - d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background, + d.del_flag, d.create_uid, d.create_time, d.pc_logo, d.pc_background, d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id, d.xzqh_name from sys_dept d diff --git a/shuili-system/src/main/resources/mapper/system/SysUserMapper.xml b/shuili-system/src/main/resources/mapper/system/SysUserMapper.xml index c296cf3c..89ecda95 100644 --- a/shuili-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/shuili-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -23,7 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -63,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.is_pc_user,u.invitee,u.is_first,u.id,u.password, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.remark, + select u.is_pc_user,u.invitee,u.is_first,u.id,u.password, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.real_name,u.card_no,u.department,u.post,u.professional, d.id,d.xzqh_id,d.parent_id,d.tag as dtag, d.dept_name as ddept_name, d.order_num as dorder_num, d.leader as dleader, d.status as dept_status, d.pc_logo, d.pc_background, d.admin_logo, r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status @@ -74,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id =#{taskId} and ss.`status`='0' - + GROUP BY LEFT(sj.adcd,4) - - - GROUP BY sj.adcd - + diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml index 72df526b..2b829768 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml @@ -23,52 +23,37 @@ 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 169b46fd..3dd8b579 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -68,6 +68,9 @@ and sj.WAGA_NAME LIKE concat('%',#{wageName},'%') + + and sj.WAGA_CODE =#{wagaCode} + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};