From 545094dc79d88e13c8fc7833c5b2c861c2888ed4 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 1 Dec 2025 09:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemUserController.java | 5 ++++- .../service/impl/SystemUserServiceImpl.java | 15 +++++++++++---- .../XzSecurityDangerFieldController.java | 2 +- .../XzSecurityDangerReviewVerifyController.java | 8 +++++++- .../service/IXzSecurityDangerFieldService.java | 5 +++-- .../impl/XzSecurityDangerFieldServiceImpl.java | 12 +++++++++--- 6 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index 28aa273a9..9671aa4d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -177,7 +177,10 @@ public class SystemUserController { @ApiImplicitParam(name = "userId", required = false, value = "用户id", paramType = "body"), @ApiImplicitParam(name = "roleName", required = false, value = "角色名称", paramType = "body"), @ApiImplicitParam(name = "isSupervisingRoleName", required = false, value = "1监理角色名称的人", paramType = "body"), - @ApiImplicitParam(name = "safeQualityRegionIdForDuty", required = false, value = "安全区域id（多个，分割）查责任人", paramType = "body"), + @ApiImplicitParam(name = "safeQualityRegionIdForDuty", required = false, value = "安全区域id（多个，分割）查整改人", paramType = "body"), + @ApiImplicitParam(name = "safeQualityRegionIdForReview", required = false, value = "安全区域id（多个，分割）查复查人", paramType = "body"), + @ApiImplicitParam(name = "qualityRegionIdForDuty", required = false, value = "质量区域id（多个，分割）查整改人", paramType = "body"), + @ApiImplicitParam(name = "qualityRegionIdForReview", required = false, value = "质量区域id（多个，分割）查复查人", paramType = "body"), @ApiImplicitParam(name = "teamIdList", required = false, value = "班组idList", paramType = "body"), @ApiImplicitParam(name = "departmentIdList", required = false, value = "部门idList", paramType = "body"), }) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index e9dba96e6..d6ad613da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -993,14 +993,22 @@ public class SystemUserServiceImpl extends ServiceImpl map, String safeQualityRegionIdForDuty, Function getUserIds) { if (StrUtil.isNotBlank(safeQualityRegionIdForDuty)) { List userIds = qualityRegionService.list(new LambdaQueryWrapper() .in(QualityRegion::getId, StrUtil.split(safeQualityRegionIdForDuty, ","))).stream().flatMap(r -> { - if (StrUtil.isBlank(r.getSecurityDutyIds())) { + String uids = getUserIds.apply(r); + if (StrUtil.isBlank(uids)) { return null; } else { - return StrUtil.split(r.getSecurityDutyIds(), ",").stream(); + return StrUtil.split(uids, ",").stream(); } }).filter(Objects::nonNull).collect(Collectors.toList()); userIds.add("0"); @@ -1010,7 +1018,6 @@ public class SystemUserServiceImpl extends ServiceImpl companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(projectSn); + List companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(projectSn, 2); List fieldList = companyConfigs.stream().map(vo -> { XzSecurityDangerField field = new XzSecurityDangerField(); BeanUtil.copyProperties(vo, field); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerReviewVerifyController.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerReviewVerifyController.java index 58450149e..860c5a928 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerReviewVerifyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerReviewVerifyController.java @@ -30,6 +30,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.HashMap; import java.util.List; +import java.util.Objects; /** @@ -187,7 +188,7 @@ public class XzSecurityDangerReviewVerifyController { * @param dto */ private void saveFieldForProject(XzSecurityDangerReviewVerifyDto dto) { - List companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(dto.getSn()); + List companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(dto.getSn(),dto.getCompanyProjectType()); xzSecurityDangerFieldService.remove(new LambdaQueryWrapper() .eq(XzSecurityDangerField::getSn, dto.getSn()) .eq(XzSecurityDangerField::getCompanyProjectType, dto.getCompanyProjectType()) @@ -233,6 +234,11 @@ public class XzSecurityDangerReviewVerifyController { dto.setModType(modType); dto.setSn(projectSn); dto.setCompanyProjectType(2); + if (Objects.equals(modType, 1) && dto.getReviewRoleName() == null) { + dto.setReviewRoleName(""); + } else if (Objects.equals(modType, 2) && dto.getVerifyRoleName() == null) { + dto.setVerifyRoleName(""); + } save(dto); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldService.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldService.java index db4fb9844..90aa3d043 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldService.java @@ -72,10 +72,11 @@ public interface IXzSecurityDangerFieldService extends IService getCompanyConfigs(String projectSn); + List getCompanyConfigs(String sn, Integer companyProjectType); void saveAll(SaveAllXzSecurityDangerFieldDto dto); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldServiceImpl.java index 956f46958..c5da0e0f6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldServiceImpl.java @@ -137,7 +137,7 @@ public class XzSecurityDangerFieldServiceImpl extends ServiceImpl list = this.queryList(param); if (Objects.equals(companyProjectType, 2) && CollUtil.isEmpty(list)) { //项目不存在，查询企业配置 - list = this.getCompanyConfigs(sn); + list = this.getCompanyConfigs(sn, 2); if (CollUtil.isEmpty(list)) { list = JSON.parseArray(ResourceUtil.readUtf8Str("init/data/xzSecurityDangerField.json"), XzSecurityDangerFieldVo.class); } @@ -151,11 +151,17 @@ public class XzSecurityDangerFieldServiceImpl extends ServiceImpl getCompanyConfigs(String projectSn) { + public List getCompanyConfigs(String sn, Integer companyProjectType) { List list; - String headquartersSn = companyService.getHeadquartersSnByProjectSn(projectSn); + String headquartersSn; + if (Objects.equals(companyProjectType, 2)) { + headquartersSn = companyService.getHeadquartersSnByProjectSn(sn); + } else { + headquartersSn = sn; + } HashMap map = new HashMap<>(); map.put("sn", headquartersSn); + map.put("recordType", 1); map.put("companyProjectType", 1); list = this.queryList(map); return list;