From feda467c7354a215356b44a11334dcecbb274dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Fri, 21 Mar 2025 18:32:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysXzqhController.java | 14 ++- .../java/com/kms/common/utils/UserUtils.java | 7 ++ .../kms/system/service/SysXzqhService.java | 64 +----------- .../yxgh/common/dto/ApprovalSearchDto.java | 22 +++++ .../common/dto/ObjectStatisticQueDto.java | 9 ++ .../yxgh/common/enums/StaticIndexEnum.java | 5 +- .../com/kms/yxgh/df/domain/DfSysUserRole.java | 26 +++++ .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 12 +++ .../yxgh/df/mapper/DfSysUserRoleMapper.java | 15 +++ .../df/service/AuthorityDikeCodeService.java | 99 +++++++++++++++++++ .../service/DfCheckingProblemV2Service.java | 19 +++- .../df/service/DfCheckingRecordV2Service.java | 5 +- .../yxgh/df/service/DfCheckingV2Service.java | 5 + .../kms/yxgh/df/service/DfYhV2Service.java | 4 +- .../kms/yxgh/dw/dto/DwRecordSearchV2Dto.java | 11 +++ .../service/DwCheckingProblemV2Service.java | 5 + .../dw/service/DwCheckingRecordV2Service.java | 4 + .../yxgh/dw/service/DwCheckingV2Service.java | 4 + .../kms/yxgh/dw/service/DwYhV2Service.java | 4 + .../yxgh/sz/dto/v2/SzRecordSearchV2Dto.java | 12 +++ .../service/SzCheckingProblemV2Service.java | 5 +- .../sz/service/SzCheckingRecordV2Service.java | 5 +- .../yxgh/sz/service/SzCheckingV2Service.java | 4 + .../kms/yxgh/sz/service/SzYhV2Service.java | 4 + .../resources/mapper/yxgh/DfYhV2Mapper.xml | 3 + .../resources/mapper/yxgh/DwYhV2Mapper.xml | 3 + .../resources/mapper/yxgh/SzYhV2Mapper.xml | 3 + 27 files changed, 297 insertions(+), 76 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 83640c39..5acfc9b5 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -9,6 +9,8 @@ import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; +import com.kms.yxgh.df.service.DfCheckingProblemV2Service; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +import java.util.Objects; /** @@ -43,6 +46,8 @@ public class SysXzqhController extends BaseController { @Autowired private SysDeptService sysDeptService; + @Autowired + private DfCheckingProblemV2Service dfCheckingProblemV2Service; @GetMapping("/getGuangDong") public AjaxResult getGuangDong() { @@ -98,10 +103,13 @@ public class SysXzqhController extends BaseController { @ApiOperation("通用行政区划") public AjaxResult common(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) { if (StringUtils.isEmpty(xzqhdm)) { - SysUser user = UserUtils.getUser(); - String deptId = user.getDeptId(); - SysDept sysDept = sysDeptService.getById(deptId); + SysDept sysDept = sysDeptService.getById(Objects.requireNonNull(UserUtils.getUser()).getDeptId()); + RoleJudgeDto roleDeptDistrictCode = AuthorityDikeCodeService.getRoleDeptDistrictCode(); String xzqhId = sysDept.getXzqhId(); + // 权限切入 + if (!StringUtils.isEmpty(roleDeptDistrictCode.getXzqhId())) { + xzqhId=roleDeptDistrictCode.getXzqhId(); + } SysXzqh xzqh = sysXzqhService.getById(xzqhId); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm())) diff --git a/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java b/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java index f957e8cc..277fa591 100644 --- a/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java +++ b/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java @@ -7,6 +7,9 @@ import com.kms.system.mapper.SysDeptMapper; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysUserService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; +import com.kms.yxgh.df.service.DfCheckingProblemV2Service; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.utils.SpringUtils; @@ -70,6 +73,10 @@ public class UserUtils { cicd = xzqh.getXzqhdm(); } } + RoleJudgeDto roleDeptDistrictCode = AuthorityDikeCodeService.getRoleDeptDistrictCode(); + if (!StringUtils.isEmpty(roleDeptDistrictCode.getXzqhId())) { + cicd = roleDeptDistrictCode.getXzqhId(); + } return cicd; } diff --git a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java index d90b558f..412f53e9 100644 --- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java +++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java @@ -39,69 +39,7 @@ public class SysXzqhService extends BaseService { private SysXzqhMapper sysXzqhMapper; @Autowired - private static SysDeptService sysDeptService; - - @Autowired - private static SysRoleService sysRoleService; - - @Autowired - private static SysUserRoleService sysUserRoleService; - - @Autowired - private static BsSgcDfManateamService bsSgcDfManateamService; - - /** - * 获取当前用户部门所属行政区划 - * 如果当前登录用户角色编码属于(YW00143、YW00129、YW00164)则返回当前用户部门的行政区划代码 - *如果当前登录用户角色编码属于（YW00352/YW00402）中，则通过当前用户手机号去BS_SGC_DF_MANATEAM（数据库表）找到他在工程对象代码进行数据过滤； - * @return String - */ - public static RoleJudgeDto getRoleDeptDistrictCode() { - RoleJudgeDto dto=new RoleJudgeDto(); - SysUser user = UserUtils.getUser(); - List sysUserRoles = sysUserRoleService.list(new LambdaQueryWrapper().eq(SysUserRole::getUserId, user.getId())); - if (!CollectionUtils.isEmpty(sysUserRoles)) { - List roleIds = sysUserRoles.stream() - .map(SysUserRole::getRoleId) - .filter(roleId -> !StringUtils.isEmpty(roleId)) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(roleIds)) { - List sysRoleIds = sysRoleService.list(new LambdaQueryWrapper() - .in(SysRole::getId, roleIds) - ); - if (!CollectionUtils.isEmpty(sysRoleIds)) { - List roleCodes = sysRoleIds.stream() - .map(SysRole::getRoleKey) - .collect(Collectors.toList()); - if (roleCodes.contains("YW00143") - || roleCodes.contains("YW00129") - || roleCodes.contains("YW00164")) { - SysDept sysDept = sysDeptService.getById(user.getDeptId()); - if (!Objects.isNull(sysDept)) { - dto.setXzqhId(StringUtils.isEmpty(sysDept.getXzqhId()) - ? null:sysDept.getXzqhId()); - return dto; - } - } - if (roleCodes.contains("YW00352") - || roleCodes.contains("YW00402")) { - BsSgcDfManateam bsSgcDfManateam = bsSgcDfManateamService - .getById(new LambdaQueryWrapper() - .eq(!StringUtils.isEmpty(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber()) - .orderByDesc(BsSgcDfManateam::getCreateTime) - .last(" limit 1 ") - ); - if (!Objects.isNull(bsSgcDfManateam)) { - dto.setDikeCode(StringUtils.isEmpty(bsSgcDfManateam.getDikeCode()) - ? null:bsSgcDfManateam.getDikeCode()); - return dto; - } - } - } - } - } - return dto; - } + private SysDeptService sysDeptService; public Map get(List adcd) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java index e752150f..f91e22b9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.common.dto; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; @ApiModel("审批搜索") @Data @@ -20,4 +22,24 @@ public class ApprovalSearchDto { @ApiModelProperty("业务条件") private T condition; + + @ApiModelProperty(value = "堤防编码") + private String dikeCode; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + + @ApiModelProperty(value = "水闸编码") + private String wagaCode; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java index 9b8ff9cc..480d5713 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java @@ -3,9 +3,11 @@ package com.kms.yxgh.common.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.common.enums.ProjectCharEnum; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotNull; import java.util.Date; @@ -35,4 +37,11 @@ public class ObjectStatisticQueDto implements IAdcd { @ApiModelProperty(value = "结束时间", required = true) private Date endTime; + public String getCode() { + if (StringUtils.isEmpty(this.code)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + } 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 25ac0d04..da6211ac 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 @@ -26,10 +26,7 @@ import com.kms.yxgh.df.mapper.DfCheckingV2Mapper; import com.kms.yxgh.df.mapper.DfDangerousTaskItemRelMapper; import com.kms.yxgh.df.mapper.DfDangerousTaskMapper; import com.kms.yxgh.df.mapper.DfYhV2Mapper; -import com.kms.yxgh.df.service.DfCheckingProblemV2Service; -import com.kms.yxgh.df.service.DfDangerousTaskItemRelService; -import com.kms.yxgh.df.service.DfDangerousTaskService; -import com.kms.yxgh.df.service.DfYhV2Service; +import com.kms.yxgh.df.service.*; import com.kms.yxgh.dw.mapper.DwCheckingProblemV2Mapper; import com.kms.yxgh.dw.mapper.DwCheckingRecordV2Mapper; import com.kms.yxgh.dw.mapper.DwCheckingV2Mapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java new file mode 100644 index 00000000..8db23a72 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * 用户和角色关联 sys_user_role + * + * @author kms + */ +@TableName("sys_user_role") +@Data +@ApiModel("用户和角色关联表") +public class DfSysUserRole extends SyBaseEntity +{ + private String userId; + + + private String id; + + private String roleId; + + private String remark; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java index d164e35f..0ffe2045 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.df.dto.v2; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import java.util.Date; @@ -48,4 +50,14 @@ public class DfRecordSearchV2Dto { @ApiModelProperty(value = "结束时间") private Date endDate; + @ApiModelProperty(value = "堤防编码") + private String dikeCode; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java new file mode 100644 index 00000000..97f802bf --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfSysUserRole; +import org.springframework.stereotype.Repository; + +/** + * 害堤动物防治计划执行记录用药Mapper接口 + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfSysUserRoleMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java new file mode 100644 index 00000000..f2a955de --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java @@ -0,0 +1,99 @@ +package com.kms.yxgh.df.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.util.StringUtils; +import com.kms.common.utils.UserUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysRoleService; +import com.kms.yg.df.domain.BsSgcDfManateam; +import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yg.df.service.BsSgcDfManateamService; +import com.kms.yxgh.df.domain.DfSysUserRole; +import com.kms.yxgh.df.mapper.DfSysUserRoleMapper; +import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysRole; +import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.utils.SpringUtils; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * + * @author kms + * @date 2023-12-04 + */ +public class AuthorityDikeCodeService { + + + /** + * 获取当前用户部门所属行政区划 + * 如果当前登录用户角色编码属于(YW00143、YW00129、YW00164)则返回当前用户部门的行政区划代码 + *如果当前登录用户角色编码属于（YW00352/YW00402）中，则通过当前用户手机号去BS_SGC_DF_MANATEAM（数据库表）找到他在工程对象代码进行数据过滤； + * @return String + */ + public static RoleJudgeDto getRoleDeptDistrictCode() { + + SysDeptService sysDeptService = SpringUtils.getBean(SysDeptService.class); + SysRoleService sysRoleService = SpringUtils.getBean(SysRoleService.class); + DfSysUserRoleMapper dfSysUserRoleMapper = SpringUtils.getBean(DfSysUserRoleMapper.class); + BsSgcDfManateamService bsSgcDfManateamService = SpringUtils.getBean(BsSgcDfManateamService.class); + + RoleJudgeDto dto=new RoleJudgeDto(); + SysUser user = UserUtils.getUser(); + if (Objects.isNull(user)) { + return dto; + } + List sysUserRoles = dfSysUserRoleMapper.selectList(new LambdaQueryWrapper().eq(DfSysUserRole::getUserId, user.getId())); + if (!CollectionUtils.isEmpty(sysUserRoles)) { + List roleIds = sysUserRoles.stream() + .map(DfSysUserRole::getRoleId) + .filter(roleId -> !StringUtils.isEmpty(roleId)) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(roleIds)) { + List sysRoleIds = sysRoleService.list(new LambdaQueryWrapper() + .in(SysRole::getId, roleIds) + ); + if (!CollectionUtils.isEmpty(sysRoleIds)) { + List roleCodes = sysRoleIds.stream() + .map(SysRole::getRoleKey) + .collect(Collectors.toList()); + if (roleCodes.contains("YW00143") + || roleCodes.contains("YW00129") + || roleCodes.contains("YW00164")) { + SysDept sysDept = sysDeptService.getById(user.getDeptId()); + if (!Objects.isNull(sysDept)) { + dto.setXzqhId(StringUtils.isEmpty(sysDept.getXzqhId()) + ? null:sysDept.getXzqhId()); + return dto; + } + } + if (roleCodes.contains("YW00352") + || roleCodes.contains("YW00402")) { + BsSgcDfManateam bsSgcDfManateam = bsSgcDfManateamService + .getById(new LambdaQueryWrapper() + .eq(!StringUtils.isEmpty(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber()) + .orderByDesc(BsSgcDfManateam::getCreateTime) + .last(" limit 1 ") + ); + if (!Objects.isNull(bsSgcDfManateam)) { + dto.setDikeCode(StringUtils.isEmpty(bsSgcDfManateam.getDikeCode()) + ? null:bsSgcDfManateam.getDikeCode()); + return dto; + } + } + } + } + } + return dto; + } + + + public static String getAuthorityDikeCode() { + RoleJudgeDto roleDeptDistrictCode = getRoleDeptDistrictCode(); + return StringUtils.isEmpty(roleDeptDistrictCode.getDikeCode()) + ? null : roleDeptDistrictCode.getDikeCode(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java index 343dd692..0b496733 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -5,18 +5,34 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.UserUtils; +import com.kms.system.domain.SysUserRole; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysRoleService; +import com.kms.system.service.SysUserRoleService; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfManateam; +import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yg.df.service.BsSgcDfManateamService; import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import com.kms.yxgh.df.domain.DfSysUserRole; import com.kms.yxgh.df.domain.DfYhV2; import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; +import com.kms.yxgh.df.mapper.DfSysUserRoleMapper; import com.kms.yxgh.df.mapper.DfYhV2Mapper; import com.kms.yxgh.util.NumberConstant; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysRole; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.BeanUtils; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; @@ -37,7 +53,6 @@ public class DfCheckingProblemV2Service extends BaseService list(SearchParam sp) { DfRecordSearchV2Dto data = sp.getData(); if (ObjectUtils.isEmpty(data)) { @@ -83,6 +98,8 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.eq(DfCheckingProblemV2::getRecordId, recordId)); + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()),DfCheckingProblemV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); queryWrapper.orderByDesc(DfCheckingProblemV2::getCreateTime); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java index 612f4bd3..fb781ab3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -12,7 +12,6 @@ import com.kms.yxgh.df.domain.DfCheckingProblemV2; import com.kms.yxgh.df.domain.DfCheckingRecord; import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; import com.kms.yxgh.df.domain.DfYhV2; -import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper; @@ -41,7 +40,6 @@ public class DfCheckingRecordV2Service extends BaseService list(SearchParam sp) { // 分页参数 Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); @@ -57,6 +59,9 @@ public class DfCheckingV2Service extends BaseService queryWrapper.like(DfCheckingV2ProjectManage::getName, name)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + ,DfCheckingV2ProjectManage::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DfCheckingV2ProjectManage::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index 62267919..9083bcb5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java @@ -103,7 +103,9 @@ public class DfYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(DfYhV2::getRecordId, recordId)); } - + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DfYhV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DfYhV2::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java index 8461f211..05dcfe6d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.dw.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import java.util.Date; @@ -48,4 +50,13 @@ public class DwRecordSearchV2Dto { @ApiModelProperty(value = "结束时间") private Date endDate; + @ApiModelProperty(value = "堤防编码") + private String dikeCode; + + public String getCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java index a0095921..06ddbe7a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; +import com.kms.yxgh.df.domain.DfYhV2; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.DwCheckingProblemV2; import com.kms.yxgh.dw.domain.DwYhV2; import com.kms.yxgh.dw.dto.DwProblemV2Dto; @@ -85,6 +87,9 @@ public class DwCheckingProblemV2Service extends BaseService queryWrapper.eq(DwCheckingProblemV2::getRecordId, recordId)); + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DwCheckingProblemV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.ne(DwCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); queryWrapper.orderByDesc(DwCheckingProblemV2::getCreateTime); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java index ef4f873b..e229fcc7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java @@ -8,6 +8,7 @@ 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.yxgh.common.enums.DfYhV2StatusEnum; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.*; import com.kms.yxgh.dw.domain.DwCheckingRecord; import com.kms.yxgh.dw.dto.DwRecordDetailV2Dto; @@ -81,6 +82,9 @@ public class DwCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java index 5df52001..83d70439 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; 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.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.dw.domain.DwCheckingRecord; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectItem; @@ -58,6 +59,9 @@ public class DwCheckingV2Service extends BaseService queryWrapper.like(DwCheckingV2ProjectManage::getName, name)); } + queryWrapper.eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DwCheckingV2ProjectManage::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DwCheckingV2ProjectManage::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java index c2d2ccde..62e910dd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java @@ -16,6 +16,7 @@ import com.kms.yxgh.common.dto.DocV2Dto; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; import com.kms.yxgh.common.service.ApprovalService; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.DwCheckingProblemV2; import com.kms.yxgh.dw.domain.DwCheckingRecord; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage; @@ -100,6 +101,9 @@ public class DwYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(DwYhV2::getRecordId, recordId)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DwYhV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DwYhV2::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java index 5507d792..385744f2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.sz.dto.v2; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import java.util.Date; @@ -48,4 +50,14 @@ public class SzRecordSearchV2Dto { @ApiModelProperty(value = "结束时间") private Date endDate; + @ApiModelProperty(value = "堤防编码") + private String wagaCode; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java index b40cf312..1375576b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.DfCheckingProblemV2; import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.DwYhV2; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzYhV2; @@ -85,7 +86,9 @@ public class SzCheckingProblemV2Service extends BaseService queryWrapper.eq(SzCheckingProblemV2::getProblemLevel, recordId)); - + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , SzCheckingProblemV2::getWagaCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.ne(SzCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); queryWrapper.orderByDesc(SzCheckingProblemV2::getCreateTime); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java index 90b64816..fa892f90 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzCheckingRecord; @@ -82,7 +83,9 @@ public class SzCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java index 927352df..1b48da4e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.sz.domain.SzCheckingRecord; import com.kms.yxgh.sz.domain.SzCheckingV2ProjectItem; @@ -53,6 +54,9 @@ public class SzCheckingV2Service extends BaseService queryWrapper.like(SzCheckingV2ProjectManage::getName, name)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , SzCheckingV2ProjectManage::getWagaCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(SzCheckingV2ProjectManage::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java index f2fcba2b..6da6ac41 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java @@ -16,6 +16,7 @@ import com.kms.yxgh.common.dto.DocV2Dto; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; import com.kms.yxgh.common.service.ApprovalService; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzCheckingRecord; @@ -103,6 +104,9 @@ public class SzYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(SzYhV2::getRecordId, recordId)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , SzYhV2::getWagaCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(SzYhV2::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml index 1187c15c..22ad9340 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -64,6 +64,9 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} + + AND jl.dike_code = #{dto.dikeCode} + ORDER BY jl.update_time DESC diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml index 70a98698..64a578b9 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml @@ -64,6 +64,9 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} + + AND jl.dike_code = #{dto.dikeCode} + ORDER BY jl.update_time DESC diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml index d2a76c4a..03d01220 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml @@ -64,6 +64,9 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} + + AND jl.waga_code = #{dto.wagaCode} + ORDER BY jl.update_time DESC