From cd65c72f423c45d884490ab550c78ef82f4f0510 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Thu, 14 May 2026 15:27:08 +0800 Subject: [PATCH] 5-14 - fix --- .../project/web/hidden/HiddenController.java | 22 ++++++++++++++++++- .../web/project/KeyProjectController.java | 1 + .../query/project/KeyProjectQueryExe.java | 6 ++--- .../dto/hidden/HiddenAcceptRecordAddCmd.java | 3 +++ .../key/project/dto/hidden/HiddenAddCmd.java | 10 +++++++++ .../model/hidden/HiddenAcceptRecordE.java | 2 ++ .../hidden/HiddenAcceptRecordDO.java | 3 +++ .../main/resources/mapper/HiddenMapper.xml | 16 +++++++++++--- 8 files changed, 56 insertions(+), 7 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java index e650c85..50fca04 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java @@ -7,8 +7,12 @@ import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.key.project.api.ai.AiAlarmServiceI; +import com.zcloud.key.project.api.hidden.HiddenFindUserServiceI; import com.zcloud.key.project.api.hidden.HiddenServiceI; +import com.zcloud.key.project.dto.ai.AiAlarmPageQry; import com.zcloud.key.project.dto.hidden.HiddenAddCmd; +import com.zcloud.key.project.dto.hidden.HiddenFindUserAddCmd; import com.zcloud.key.project.dto.hidden.HiddenPageQry; import com.zcloud.key.project.dto.hidden.HiddenUpdateCmd; import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; @@ -32,12 +36,28 @@ import java.util.ArrayList; @AllArgsConstructor public class HiddenController { private final HiddenServiceI hiddenService; + private final HiddenFindUserServiceI hiddenFindUserService; + private final AiAlarmServiceI aiAlarmService; + @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody HiddenAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); - return hiddenService.add(cmd); + SingleResponse result = hiddenService.add(cmd); + + // 添加ai报警发现人信息 + if (cmd.getSource() == 1) { + HiddenFindUserAddCmd hiddenFindUserAddCmd = new HiddenFindUserAddCmd(); + hiddenFindUserAddCmd.setHiddenId(result.getData().getHiddenId()); + hiddenFindUserAddCmd.setForeignKey(result.getData().getForeignKey()); + hiddenFindUserAddCmd.setFindCorpId(cmd.getFindCorpId()); + hiddenFindUserAddCmd.setFindDepartmentId(cmd.getFindDepartmentId()); + hiddenFindUserAddCmd.setFindUserId(cmd.getFindUserId()); + hiddenFindUserService.add(hiddenFindUserAddCmd); + } + + return result; } @ApiOperation("分页") diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java index d953b20..b2848d6 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java @@ -47,6 +47,7 @@ public class KeyProjectController { @ApiOperation("重点作业管理分页") @PostMapping("/list") public PageResponse page(@RequestBody KeyProjectPageQry qry) { + return keyProjectService.listPage(qry); } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java index 658bcf4..bdbbc7e 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java @@ -177,9 +177,9 @@ public class KeyProjectQueryExe { } public PageResponse xgfCorpStatistics(XgfCorpStatisticsPageQry qry) { - if(CollUtil.isEmpty(qry.getJurisdictionCorpinfoIdList())){ - return PageResponse.of(null,0,0, 0); - } +// if(CollUtil.isEmpty(qry.getJurisdictionCorpinfoIdList())){ +// return PageResponse.of(null,0,0, 0); +// } Map params = PageQueryHelper.toHashMap(qry); params.put("xgfCorpinfoId",AuthContext.getTenantId()); diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAddCmd.java index 21109dd..a591450 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAddCmd.java @@ -42,5 +42,8 @@ public class HiddenAcceptRecordAddCmd extends Command { @NotEmpty(message = "验收时间不能为空") private LocalDateTime acceptTime; + @ApiModelProperty(value = "打回意见", name = "rejectOpinion", required = true) + private String rejectOpinion; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java index 4568f80..cdf4ce7 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java @@ -99,5 +99,15 @@ public class HiddenAddCmd extends Command { private List hiddenFindUserList; + // 发现人公司id + @ApiModelProperty(value = "发现人公司id", name = "findCorpId", required = true) + private Long findCorpId; + // 发现部门id - 默认为当前登录部门 + @ApiModelProperty(value = "发现部门id", name = "findDepartmentId") + private Long findDepartmentId; + // 发现人id - 默认为当前登录人 + @ApiModelProperty(value = "发现人id", name = "findUserId") + private Long findUserId; + } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java index 6717541..d4b026a 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenAcceptRecordE.java @@ -56,6 +56,8 @@ public class HiddenAcceptRecordE extends BaseE { private Long orgId; //环境 private String env; + // 打回意见 + private String rejectOpinion; public void init(SSOUser ssoUser){ if (ObjectUtils.isEmpty(this.hiddenAcceptRecordId)){ diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java index 7cbca21..c35761e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenAcceptRecordDO.java @@ -50,6 +50,9 @@ public class HiddenAcceptRecordDO extends BaseDO { //验收时间 @ApiModelProperty(value = "验收时间") private LocalDateTime acceptTime; + //打回意见 + @ApiModelProperty(value = "打回意见") + private String rejectOpinion; public HiddenAcceptRecordDO(String hiddenAcceptRecordId) { this.hiddenAcceptRecordId = hiddenAcceptRecordId; diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index 30f2b3c..6f24f7b 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -11,7 +11,7 @@ au.name as accept_user_name, GROUP_CONCAT(DISTINCT hfu.name) find_user_name, GROUP_CONCAT(DISTINCT hfd.name) find_department_name, - kp.project_name, + IFNULL(kp.project_name, kp2.project_name) AS project_name, MAX(hrr.rectification_time) as rectification_time, MAX(har.accept_time) as accept_time from @@ -24,6 +24,8 @@ left join safety_environmental_inspection i on i.inspection_id = h.foreign_key left join key_project kp on kp.key_project_id = i.key_project_id + left join ai_alarm aa on h.source = 1 and h.foreign_key = aa.id + left join key_project kp2 on kp2.key_project_id = aa.key_project_id left join hidden_rectification_record hrr on hrr.hidden_id = h.hidden_id and hrr.delete_enum = 'FALSE' left join hidden_accept_record har on har.hidden_id = h.hidden_id and har.delete_enum = 'FALSE' and har.state = 1 @@ -42,7 +44,11 @@ and h.create_time <= #{params.endTime} - and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%') + and ( + kp.project_name LIKE CONCAT('%', #{params.projectName}, '%') + OR + kp2.project_name LIKE CONCAT('%', #{params.projectName}, '%') + ) and ru.name LIKE CONCAT('%', #{params.rectificationUserName}, '%') @@ -60,7 +66,11 @@ and h.state = #{params.state} - and kp.xgf_corpinfo_id = #{params.xgfCorpinfoId} + and ( + kp.xgf_corpinfo_id = #{params.xgfCorpinfoId} + OR + kp2.xgf_corpinfo_id = #{params.xgfCorpinfoId} + ) and EXISTS (