From ad8633449a61832a4c7e09a5ec1fbdb9a08c2ea7 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 1 Apr 2026 11:49:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E6=82=A3=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=92=8C=E6=95=B4=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hidden/HiddenAcceptRecordController.java | 7 ++ .../project/web/hidden/HiddenController.java | 3 +- .../HiddenRectificationRecordController.java | 9 ++ .../hidden/HiddenAcceptRecordUpdateExe.java | 76 +++++++++++++++ .../HiddenRectificationRecordUpdateExe.java | 50 ++++++++++ ...tyEnvironmentalInspectionDefendAddExe.java | 11 ++- ...yEnvironmentalInspectionUserUpdateExe.java | 15 ++- .../command/query/hidden/HiddenQueryExe.java | 7 +- ...SafetyEnvironmentalInspectionQueryExe.java | 9 +- .../hidden/HiddenAcceptRecordServiceImpl.java | 7 ++ .../HiddenRectificationRecordServiceImpl.java | 5 + .../service/hidden/HiddenServiceImpl.java | 5 + .../hidden/HiddenAcceptRecordServiceI.java | 2 + .../HiddenRectificationRecordServiceI.java | 2 + .../project/api/hidden/HiddenServiceI.java | 3 + .../hidden/HiddenAcceptRecordCO.java | 9 +- .../hidden/HiddenRectificationRecordCO.java | 3 + .../SafetyEnvironmentalInspectionCO.java | 23 ++++- .../SafetyEnvironmentalInspectionUserCO.java | 16 +++- .../hidden/HiddenAcceptRecordAcceptCmd.java | 50 ++++++++++ .../key/project/dto/hidden/HiddenPageQry.java | 11 +++ .../HiddenRectificationRecordUpdateCmd.java | 21 ++--- .../SafetyEnvironmentalInspectionAddCmd.java | 4 +- ...afetyEnvironmentalInspectionUpdateCmd.java | 2 +- .../model/hidden/HiddenAcceptRecordE.java | 20 +++- .../hidden/HiddenRectificationRecordE.java | 14 +++ .../hidden/HiddenAcceptRecordDO.java | 9 +- .../dataobject/hidden/HiddenDO.java | 16 ++++ .../hidden/HiddenRectificationRecordDO.java | 3 + .../SafetyEnvironmentalInspectionDO.java | 3 + .../SafetyEnvironmentalInspectionUserDO.java | 13 +++ .../persistence/mapper/HiddenMapper.java | 8 ++ .../SafetyEnvironmentalInspectionMapper.java | 2 + ...fetyEnvironmentalInspectionUserMapper.java | 6 ++ .../repository/hidden/HiddenRepository.java | 6 ++ .../impl/hidden/HiddenRepositoryImpl.java | 34 ++++++- ...EnvironmentalInspectionRepositoryImpl.java | 5 + ...ronmentalInspectionUserRepositoryImpl.java | 16 ++-- ...fetyEnvironmentalInspectionRepository.java | 2 + .../main/resources/mapper/HiddenMapper.xml | 94 +++++++++++++++++++ .../SafetyEnvironmentalInspectionMapper.xml | 59 ++++++++++-- ...afetyEnvironmentalInspectionUserMapper.xml | 21 ++++- 42 files changed, 617 insertions(+), 64 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAcceptCmd.java diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java index 9f16b40..d89c0a0 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenAcceptRecordController.java @@ -8,6 +8,7 @@ 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.hidden.HiddenAcceptRecordServiceI; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; @@ -78,5 +79,11 @@ public class HiddenAcceptRecordController { hiddenAcceptRecordService.edit(hiddenAcceptRecordUpdateCmd); return SingleResponse.buildSuccess(); } + @ApiOperation("验收") + @PostMapping("/accept") + public SingleResponse accept(@Validated @RequestBody HiddenAcceptRecordAcceptCmd cmd) { + hiddenAcceptRecordService.accept(cmd); + return SingleResponse.buildSuccess(); + } } 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 de3d210..e650c85 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 @@ -55,7 +55,7 @@ public class HiddenController { @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new HiddenCO()); + return hiddenService.getInfoById(id); } @ApiOperation("删除") @@ -78,5 +78,6 @@ public class HiddenController { hiddenService.edit(hiddenUpdateCmd); return SingleResponse.buildSuccess(); } + } diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java index 3727f43..14596e2 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenRectificationRecordController.java @@ -78,5 +78,14 @@ public class HiddenRectificationRecordController { hiddenRectificationRecordService.edit(hiddenRectificationRecordUpdateCmd); return SingleResponse.buildSuccess(); } + + @ApiOperation("隐患整改") + @PostMapping("/rectification") + public SingleResponse rectification(@Validated @RequestBody HiddenRectificationRecordUpdateCmd hiddenRectificationRecordUpdateCmd) { + hiddenRectificationRecordService.rectification(hiddenRectificationRecordUpdateCmd); + return SingleResponse.buildSuccess(); + } + + } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java index 373f8eb..bd151f7 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java @@ -1,14 +1,32 @@ package com.zcloud.key.project.command.hidden; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.key.project.domain.gateway.hidden.HiddenAcceptRecordGateway; +import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionUserGateway; import com.zcloud.key.project.domain.model.hidden.HiddenAcceptRecordE; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; +import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * web-app @@ -20,6 +38,10 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class HiddenAcceptRecordUpdateExe { private final HiddenAcceptRecordGateway hiddenAcceptRecordGateway; + private final HiddenRepository hiddenRepository; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway; @Transactional(rollbackFor = Exception.class) public void execute(HiddenAcceptRecordUpdateCmd hiddenAcceptRecordUpdateCmd) { @@ -30,5 +52,59 @@ public class HiddenAcceptRecordUpdateExe { throw new BizException("修改失败"); } } + + @Transactional(rollbackFor = Exception.class) + public void acceptExecute(HiddenAcceptRecordAcceptCmd cmd) { + // 生成验收记录 + HiddenAcceptRecordE hiddenAcceptRecordE = new HiddenAcceptRecordE(); + BeanUtils.copyProperties(cmd, hiddenAcceptRecordE); + SSOUser ssoUser = AuthContext.getCurrentUser(); + hiddenAcceptRecordE.init(ssoUser); + boolean res = hiddenAcceptRecordGateway.add(hiddenAcceptRecordE); + // 修改隐患状态 + Integer hiddenState = 3; + if (cmd.getState() == 0){ + hiddenState = 4; + } + hiddenRepository.updateState(cmd.getHiddenId(), hiddenState); + + if (cmd.getState() == 1){ // 验收通过 + // 判断隐患是否全部验收完成， + List stateList = new ArrayList<>(); + stateList.add(1); + stateList.add(2); + stateList.add(4); + Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList); + if(count == 0) { + // 修改安全环保检查隐患验收操作记录为完成 + SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + inspectionUserDO.setInspectionId(cmd.getForeignKey()); + inspectionUserDO.setUserId(ssoUser.getUserId()); + inspectionUserDO.setType(8); + inspectionUserDO.setStatus(1); + inspectionUserDO.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); + // 生成安全环保检查归档操作记录（直接完成） + SafetyEnvironmentalInspectionUserE inspectionUserFileE = new SafetyEnvironmentalInspectionUserE(); + inspectionUserFileE.init(cmd.getForeignKey(), 1, 9, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId()); + safetyEnvironmentalInspectionUserGateway.add(inspectionUserFileE); + // 如果是修改安全环保检查状态为归档 + safetyEnvironmentalInspectionRepository.updateStatus(cmd.getForeignKey(), 5); + } + } else if (cmd.getState() == 0){ // 验收未通过 + // 将修改安全环保检查隐患整改操作记录改为未完成 + SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + inspectionUserDO.setInspectionId(cmd.getForeignKey()); + inspectionUserDO.setUserId(ssoUser.getUserId()); + inspectionUserDO.setType(7); + inspectionUserDO.setStatus(0); + inspectionUserDO.setSignatureTime(null); + safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); + } + + if (!res) { + throw new BizException("修改失败"); + } + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java index bfdef2e..2d166da 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenRectificationRecordUpdateExe.java @@ -1,14 +1,26 @@ package com.zcloud.key.project.command.hidden; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.key.project.domain.gateway.hidden.HiddenRectificationRecordGateway; +import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionUserGateway; import com.zcloud.key.project.domain.model.hidden.HiddenRectificationRecordE; +import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; import com.zcloud.key.project.dto.hidden.HiddenRectificationRecordUpdateCmd; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + /** * web-app @@ -20,6 +32,10 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class HiddenRectificationRecordUpdateExe { private final HiddenRectificationRecordGateway hiddenRectificationRecordGateway; + private final HiddenRepository hiddenRepository; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; + private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; + private final SafetyEnvironmentalInspectionUserGateway safetyEnvironmentalInspectionUserGateway; @Transactional(rollbackFor = Exception.class) public void execute(HiddenRectificationRecordUpdateCmd hiddenRectificationRecordUpdateCmd) { @@ -30,5 +46,39 @@ public class HiddenRectificationRecordUpdateExe { throw new BizException("修改失败"); } } + @Transactional(rollbackFor = Exception.class) + public void rectificationExecute(HiddenRectificationRecordUpdateCmd cmd) { + HiddenRectificationRecordE hiddenRectificationRecordE = new HiddenRectificationRecordE(); + SSOUser ssoUser = AuthContext.getCurrentUser(); + BeanUtils.copyProperties(cmd, hiddenRectificationRecordE); + hiddenRectificationRecordE.init(ssoUser); + boolean res = hiddenRectificationRecordGateway.add(hiddenRectificationRecordE); + hiddenRepository.updateState(cmd.getHiddenId(), 2); + // 增加安全环保检查隐患验收操作记录 + Long acceptCount = safetyEnvironmentalInspectionUserRepository.countByInspectionId(cmd.getForeignKey(), null, 8); + if (acceptCount == 0){ + SafetyEnvironmentalInspectionUserE inspectionUserAcceptE = new SafetyEnvironmentalInspectionUserE(); + inspectionUserAcceptE.init(cmd.getForeignKey(), 0, 8, ssoUser.getTenantId(), ssoUser.getOrgId(), ssoUser.getUserId()); + safetyEnvironmentalInspectionUserGateway.add(inspectionUserAcceptE); + } + // 判断隐患是否全部整改完成， + List stateList = new ArrayList<>(); + stateList.add(1); + stateList.add(4); + Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList); + if (count == 0){// 全部整改完成 + // 修改安全环保检查隐患整改操作记录为完成 + SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); + inspectionUserDO.setInspectionId(cmd.getForeignKey()); + inspectionUserDO.setUserId(ssoUser.getUserId()); + inspectionUserDO.setType(7); + inspectionUserDO.setStatus(1); + inspectionUserDO.setSignatureTime(LocalDateTime.now()); + safetyEnvironmentalInspectionUserRepository.editUserInfo(inspectionUserDO); + } + if (!res) { + throw new BizException("修改失败"); + } + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java index f98a8c8..e104349 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java @@ -10,6 +10,7 @@ import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspect import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionUserE; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionDefendAddCmd; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDefendDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; @@ -17,6 +18,7 @@ import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.time.LocalDateTime; import java.util.List; @@ -57,11 +59,16 @@ public class SafetyEnvironmentalInspectionDefendAddExe { SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE = new SafetyEnvironmentalInspectionDefendE(); BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionDefendE); safetyEnvironmentalInspectionDefendE.init(); + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId()); + Integer type = 3; + if (inspectionDO != null && !ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){ + type = 6; + } // 判断是否申辩 SafetyEnvironmentalInspectionUserDO safetyEnvironmentalInspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); safetyEnvironmentalInspectionUserDO.setInspectionId(cmd.getInspectionId()); safetyEnvironmentalInspectionUserDO.setUserId(ssoUser.getUserId()); - safetyEnvironmentalInspectionUserDO.setType(3); + safetyEnvironmentalInspectionUserDO.setType(type); safetyEnvironmentalInspectionUserDO.setSignatureTime(LocalDateTime.now()); if(cmd.getIsDefend() == 1){ // 申辩 // 将确认人改为不通过 @@ -82,7 +89,7 @@ public class SafetyEnvironmentalInspectionDefendAddExe { safetyEnvironmentalInspectionUserDO.setStatus(1); safetyEnvironmentalInspectionUserRepository.editUserInfo(safetyEnvironmentalInspectionUserDO); - SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId()); + if(inspectionDO.getHiddenNumber() > 0){ // 有隐患，将安全环保检查状态改为3-待隐患整改 safetyEnvironmentalInspectionRepository.updateStatus(cmd.getInspectionId(), 3); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java index 75c70de..9a8b5c7 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUserUpdateExe.java @@ -12,10 +12,12 @@ import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmen import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; +import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; /** @@ -49,19 +51,24 @@ public class SafetyEnvironmentalInspectionUserUpdateExe { inspectionUserE.initVerify(ssoUser); SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); BeanUtils.copyProperties(inspectionUserE, inspectionUserDO); - + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId()); + // 没有申辩过的安全环保检查 safetyEnvironmentalInspectionUser 下一步type 是2 否则 下一步type是 + Integer type = 2; + if (inspectionDO != null && !ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){ + type = 5; + } + inspectionUserDO.setType(type); // 修改自己的检查信息 safetyEnvironmentalInspectionUserRepository.verifyEdit(inspectionUserDO); if (cmd.getStatus() == 1){ // 如果通过 // 查询是否所有人都核实， - Long count = safetyEnvironmentalInspectionUserRepository.countByInspectionId(inspectionUserE.getInspectionId(), 0, 2); + Long count = safetyEnvironmentalInspectionUserRepository.countByInspectionId(inspectionUserE.getInspectionId(), 0, type); if (count == 0){ // 如果都核实了，则将安全环保检查改为待确认 safetyEnvironmentalInspectionRepository.updateStatus(inspectionUserE.getInspectionId(), 2); // SafetyEnvironmentalInspectionUser 增加下一步，确认人 SafetyEnvironmentalInspectionUserE affirmUser = new SafetyEnvironmentalInspectionUserE(); - SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(inspectionUserE.getInspectionId()); - affirmUser.init(cmd.getInspectionId(), 0, 3, inspectionDO.getXgfMasterUserCorpinfoId(), inspectionDO.getXgfMasterUserDepartmentId(), inspectionDO.getXgfMasterUserId()); + affirmUser.init(cmd.getInspectionId(), 0, type+1, inspectionDO.getXgfMasterUserCorpinfoId(), inspectionDO.getXgfMasterUserDepartmentId(), inspectionDO.getXgfMasterUserId()); safetyEnvironmentalInspectionUserGateway.add(affirmUser); } } else if (cmd.getStatus() == 2){ // 如果不通过 diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java index ee76dea..529e581 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java @@ -1,10 +1,11 @@ package com.zcloud.key.project.command.query.hidden; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.hidden.HiddenCoConvertor; -import com.zcloud.key.project.dto.hidden.HiddenPageQry; import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +import com.zcloud.key.project.dto.hidden.HiddenPageQry; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import lombok.AllArgsConstructor; @@ -38,5 +39,9 @@ public class HiddenQueryExe { List examCenterCOS = hiddenCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + public SingleResponse getInfoByIdExecute(Long id) { + HiddenDO hiddenDO = hiddenRepository.getInfoById(id); + return null; + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java index 2b8a7e6..f2d5b35 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java @@ -21,6 +21,7 @@ import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmen import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.util.List; import java.util.Map; @@ -50,8 +51,12 @@ public class SafetyEnvironmentalInspectionQueryExe { * @return */ public SafetyEnvironmentalInspectionCO queryById(Long id) { - SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getById(id); - List inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId()); + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getInfoById(id); + Integer type = 2; + if (!ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){ + type = 5; + } + List inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId(), type); List inspectionContentDOs = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(inspectionDO.getInspectionId()); List hiddenDOs = hiddenRepository.listAllByInspectionId(inspectionDO.getInspectionId()); List inspectionUserCOS = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(inspectionUserDOs); diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java index 2768849..7a01794 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenAcceptRecordServiceImpl.java @@ -7,6 +7,7 @@ import com.zcloud.key.project.command.hidden.HiddenAcceptRecordAddExe; import com.zcloud.key.project.command.hidden.HiddenAcceptRecordRemoveExe; import com.zcloud.key.project.command.hidden.HiddenAcceptRecordUpdateExe; import com.zcloud.key.project.command.query.hidden.HiddenAcceptRecordQueryExe; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; @@ -46,6 +47,12 @@ public class HiddenAcceptRecordServiceImpl implements HiddenAcceptRecordServiceI hiddenAcceptRecordUpdateExe.execute(hiddenAcceptRecordUpdateCmd); } + @Override + public void accept(HiddenAcceptRecordAcceptCmd cmd) { + + hiddenAcceptRecordUpdateExe.acceptExecute(cmd); + } + @Override public void remove(Long id) { hiddenAcceptRecordRemoveExe.execute(id); diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java index 4775785..9fe14f3 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenRectificationRecordServiceImpl.java @@ -46,6 +46,11 @@ public class HiddenRectificationRecordServiceImpl implements HiddenRectification hiddenRectificationRecordUpdateExe.execute(hiddenRectificationRecordUpdateCmd); } + @Override + public void rectification(HiddenRectificationRecordUpdateCmd cmd) { + hiddenRectificationRecordUpdateExe.rectificationExecute(cmd); + } + @Override public void remove(Long id) { hiddenRectificationRecordRemoveExe.execute(id); diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java index e489564..83411aa 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java @@ -55,5 +55,10 @@ public class HiddenServiceImpl implements HiddenServiceI { public void removeBatch(Long[] ids) { hiddenRemoveExe.execute(ids); } + + @Override + public SingleResponse getInfoById(Long id) { + return hiddenQueryExe.getInfoByIdExecute(id); + } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java index d58a481..e638a1f 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenAcceptRecordServiceI.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.api.hidden; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAcceptCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordAddCmd; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordPageQry; import com.zcloud.key.project.dto.hidden.HiddenAcceptRecordUpdateCmd; @@ -19,6 +20,7 @@ public interface HiddenAcceptRecordServiceI { SingleResponse add(HiddenAcceptRecordAddCmd cmd); void edit(HiddenAcceptRecordUpdateCmd cmd); + void accept(HiddenAcceptRecordAcceptCmd cmd); void remove(Long id); diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java index 5f1e7ee..8a69914 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenRectificationRecordServiceI.java @@ -20,6 +20,8 @@ public interface HiddenRectificationRecordServiceI { void edit(HiddenRectificationRecordUpdateCmd cmd); + void rectification(HiddenRectificationRecordUpdateCmd cmd); + void remove(Long id); void removeBatch(Long[] ids); diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java index f69f938..55d44ac 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java @@ -20,8 +20,11 @@ public interface HiddenServiceI { void edit(HiddenUpdateCmd cmd); + void remove(Long id); void removeBatch(Long[] ids); + + SingleResponse getInfoById(Long id); } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java index 71db449..82ece39 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java @@ -24,9 +24,12 @@ public class HiddenAcceptRecordCO extends ClientObject { //隐患主键id @ApiModelProperty(value = "隐患主键id") private String hiddenId; - //安全检查id - @ApiModelProperty(value = "安全检查id") - private String inspectionId; + //外键id + @ApiModelProperty(value = "外键id") + private String foreignKey; + //是否合格 0-否 1-是 + @ApiModelProperty(value = "是否合格 0-否 1-是") + private Integer state; //验收人部门id @ApiModelProperty(value = "验收人部门id") private Long acceptDepartmentId; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java index 1c1ef74..da7c214 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenRectificationRecordCO.java @@ -24,6 +24,9 @@ public class HiddenRectificationRecordCO extends ClientObject { //隐患主键id @ApiModelProperty(value = "隐患主键id") private String hiddenId; + //来源ID外键 + @ApiModelProperty(value = "来源ID外键") + private String foreignKey; //安全检查id @ApiModelProperty(value = "安全检查id") private String inspectionId; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java index 78fd126..4725c51 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.clientobject.inspection; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; import com.zcloud.key.project.dto.hidden.HiddenAddCmd; @@ -54,11 +55,11 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject { private String place; //检查开始时间 @ApiModelProperty(value = "检查开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeStart; //检查结束时间 @ApiModelProperty(value = "检查结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeEnd; //状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩) @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)") @@ -76,6 +77,20 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject { @ApiModelProperty(value = "企业名称") private String corpName; + @ApiModelProperty(value = "检查人") + private String inspectionUserName; + @ApiModelProperty(value = "被检查单位") + private String inspectedCorpinfoName; + @ApiModelProperty(value = "被检查单位现场负责人") + private String xgfMasterUserName; + @ApiModelProperty(value = "被检查单位现场负责人部门") + private Long xgfMasterUserDepartmentId; + @ApiModelProperty(value = "被检查单位现场负责人企业") + private Long xgfMasterUserCorpinfoId; + @ApiModelProperty(value = "辖区单位名称") + private String areaDepartmentName; + @ApiModelProperty(value = "重点作业名称") + private String projectName; @ApiModelProperty(value = "检查人员", name = "inspectionUserList", required = true) private List inspectionUserList; @@ -91,11 +106,11 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject { //创建时间 @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; //更新时间 @ApiModelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; //创建人ID @ApiModelProperty(value = "创建人ID") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java index ebbf85a..129b623 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionUserCO.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.clientobject.inspection; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,6 +33,15 @@ public class SafetyEnvironmentalInspectionUserCO extends ClientObject { //检查人部门id @ApiModelProperty(value = "检查人部门id") private Long departmentId; + //检查人企业名称 + @ApiModelProperty(value = "检查人企业名称") + private String corpName; + //检查人部门名称 + @ApiModelProperty(value = "检查人部门名称") + private String departmentName; + //检查人名称 + @ApiModelProperty(value = "检查人名称") + private String userName; //检查人人员id @ApiModelProperty(value = "检查人人员id") private Long userId; @@ -49,15 +59,15 @@ public class SafetyEnvironmentalInspectionUserCO extends ClientObject { private String signature; //核实时间 @ApiModelProperty(value = "核实时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime signatureTime; //创建时间 @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; //更新时间 @ApiModelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; //创建人ID @ApiModelProperty(value = "创建人ID") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAcceptCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAcceptCmd.java new file mode 100644 index 0000000..16733cb --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAcceptRecordAcceptCmd.java @@ -0,0 +1,50 @@ +package com.zcloud.key.project.dto.hidden; + +import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-20 11:33:08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HiddenAcceptRecordAcceptCmd extends Command { + @ApiModelProperty(value = "业务主键id", name = "hiddenAcceptRecordId", required = true) + private String hiddenAcceptRecordId; + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) + @NotEmpty(message = "隐患主键id不能为空") + private String hiddenId; + + @ApiModelProperty(value = "是否合格 0-否 1-是", name = "state", required = true) + @NotNull(message = "是否合格不能为空") + private Integer state; + @ApiModelProperty(value = "外键id", name = "inspectionId", required = true) + private String foreignKey; + @ApiModelProperty(value = "验收人部门id", name = "acceptDepartmentId", required = true) + private Long acceptDepartmentId; + @ApiModelProperty(value = "验收人id", name = "acceptUserId", required = true) + private Long acceptUserId; + @ApiModelProperty(value = "验收时间", name = "acceptTime", required = true) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime acceptTime; + + + @ApiModelProperty(value = "打回意见", name = "打回意见", required = true) + private String rejectOpinion; + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java index e7cc439..52aab71 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java @@ -3,6 +3,8 @@ package com.zcloud.key.project.dto.hidden; import com.alibaba.cola.dto.PageQuery; import lombok.Data; +import java.util.List; + /** * web-client @@ -24,5 +26,14 @@ public class HiddenPageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ private String likeHiddenId; + private String hiddenDesc; + private Integer source; + private String startTime; + private String endTime; + private String projectName; + private String hiddenFindUserName; + + private List stateList; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java index bcd2869..9fd8075 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenRectificationRecordUpdateCmd.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.hidden; import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -22,26 +23,18 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class HiddenRectificationRecordUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") - private Long id; + @ApiModelProperty(value = "业务主键id", name = "hiddenRectificationRecordId", required = true) - @NotEmpty(message = "业务主键id不能为空") private String hiddenRectificationRecordId; + @ApiModelProperty(value = "外键id", name = "foreignKey", required = true) + private String foreignKey; + @ApiModelProperty(value = "隐患主键id", name = "hiddenId", required = true) @NotEmpty(message = "隐患主键id不能为空") private String hiddenId; - @ApiModelProperty(value = "安全检查id", name = "inspectionId", required = true) - @NotEmpty(message = "安全检查id不能为空") - private String inspectionId; - @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId", required = true) - @NotNull(message = "整改人部门id不能为空") - private Long rectificationDepartmentId; - @ApiModelProperty(value = "整改人id", name = "rectificationUserId", required = true) - @NotNull(message = "整改人id不能为空") - private Long rectificationUserId; @ApiModelProperty(value = "整改时间", name = "rectificationTime", required = true) - @NotEmpty(message = "整改时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @NotNull(message = "整改时间不能为空") private LocalDateTime rectificationTime; @ApiModelProperty(value = "整改描述", name = "rectificationDesc", required = true) @NotEmpty(message = "整改描述不能为空") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java index 334f90a..645751c 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionAddCmd.java @@ -57,16 +57,14 @@ public class SafetyEnvironmentalInspectionAddCmd extends Command { private String place; @ApiModelProperty(value = "检查开始时间", name = "timeStart", required = true) - @NotNull(message = "检查结束时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeStart; @ApiModelProperty(value = "检查结束时间", name = "timeEnd", required = true) - @NotNull(message = "检查结束时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeEnd; - @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true) + @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患处理,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true) private Integer status; @ApiModelProperty(value = "关联隐患数", name = "hiddenNumber", required = true) diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java index 71b1c5e..17a0c1d 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionUpdateCmd.java @@ -53,7 +53,7 @@ public class SafetyEnvironmentalInspectionUpdateCmd extends Command { @ApiModelProperty(value = "检查结束时间", name = "timeEnd", required = true) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeEnd; - @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患整改,4-待隐患验收,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true) + @ApiModelProperty(value = "状态(0-暂存,1-待核实,2-待确认,3-待隐患处理,5-检查归档,6-核实打回,7-被检查申辩)", name = "status", required = true) private Integer status; @ApiModelProperty(value = "关联隐患数", name = "hiddenNumber", required = true) private Integer hiddenNumber; 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 9f58c9a..6717541 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 @@ -1,7 +1,10 @@ package com.zcloud.key.project.domain.model.hidden; +import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; import lombok.Data; +import org.springframework.util.ObjectUtils; import java.time.LocalDateTime; @@ -19,8 +22,10 @@ public class HiddenAcceptRecordE extends BaseE { private String hiddenAcceptRecordId; //隐患主键id private String hiddenId; - //安全检查id - private String inspectionId; + //外键id + private String foreignKey; + //是否合格 0-否 1-是 + private Integer state; //验收人部门id private Long acceptDepartmentId; //验收人id @@ -51,5 +56,16 @@ public class HiddenAcceptRecordE extends BaseE { private Long orgId; //环境 private String env; + + public void init(SSOUser ssoUser){ + if (ObjectUtils.isEmpty(this.hiddenAcceptRecordId)){ + this.setHiddenAcceptRecordId(Tools.get32UUID()); + } + if(ObjectUtils.isEmpty(this.acceptTime)){ + this.setAcceptTime(LocalDateTime.now()); + } + this.setAcceptDepartmentId(ssoUser.getOrgId()); + this.setAcceptUserId(ssoUser.getUserId()); + } } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenRectificationRecordE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenRectificationRecordE.java index 5ee3df0..2c67e2b 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenRectificationRecordE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenRectificationRecordE.java @@ -1,7 +1,10 @@ package com.zcloud.key.project.domain.model.hidden; +import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; import lombok.Data; +import org.springframework.util.ObjectUtils; import java.time.LocalDateTime; @@ -19,6 +22,8 @@ public class HiddenRectificationRecordE extends BaseE { private String hiddenRectificationRecordId; //隐患主键id private String hiddenId; + //隐患主键id + private String foreignKey; //安全检查id private String inspectionId; //整改人部门id @@ -53,5 +58,14 @@ public class HiddenRectificationRecordE extends BaseE { private Long orgId; //环境 private String env; + + public void init(SSOUser ssoUser){ + if (ObjectUtils.isEmpty(this.hiddenRectificationRecordId)){ + this.setHiddenRectificationRecordId(Tools.get32UUID()); + } + this.setRectificationDepartmentId(ssoUser.getOrgId()); + this.setRectificationUserId(ssoUser.getUserId()); + } + } 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 18678de..87ebe1d 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 @@ -26,9 +26,12 @@ public class HiddenAcceptRecordDO extends BaseDO { //隐患主键id @ApiModelProperty(value = "隐患主键id") private String hiddenId; - //安全检查id - @ApiModelProperty(value = "安全检查id") - private String inspectionId; + //外键id + @ApiModelProperty(value = "外键id") + private String foreignKey; + //是否合格 0-否 1-是 + @ApiModelProperty(value = "是否合格 0-否 1-是") + private Integer state; //验收人部门id @ApiModelProperty(value = "验收人部门id") private Long acceptDepartmentId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java index a423cab..e2247fb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java @@ -1,5 +1,6 @@ package com.zcloud.key.project.persistence.dataobject.hidden; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import io.swagger.annotations.ApiModelProperty; @@ -85,6 +86,21 @@ public class HiddenDO extends BaseDO { @ApiModelProperty(value = "验收人id", name = "acceptUserId") private Long acceptUserId; + //整改人姓名 + @ApiModelProperty(value = "整改人姓名") + @TableField(exist = false) + private String rectificationUserName; + + //发现人姓名 + @ApiModelProperty(value = "发现人姓名") + @TableField(exist = false) + private String hiddenFindUserName; + + //重点作业名称 + @ApiModelProperty(value = "重点作业名称") + @TableField(exist = false) + private String projectName; + public HiddenDO(String hiddenId) { this.hiddenId = hiddenId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java index 48466bd..08c18f7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenRectificationRecordDO.java @@ -26,6 +26,9 @@ public class HiddenRectificationRecordDO extends BaseDO { //隐患主键id @ApiModelProperty(value = "隐患主键id") private String hiddenId; + //来源ID外键 + @ApiModelProperty(value = "来源ID外键") + private String foreignKey; //安全检查id @ApiModelProperty(value = "安全检查id") private String inspectionId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java index 42c3ce3..0c580e4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDO.java @@ -90,6 +90,9 @@ public class SafetyEnvironmentalInspectionDO extends BaseDO { @ApiModelProperty(value = "被检查单位现场负责人企业") @TableField(exist = false) private Long xgfMasterUserCorpinfoId; + @ApiModelProperty(value = "辖区单位名称") + @TableField(exist = false) + private String areaDepartmentName; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java index 8c454b8..be0899c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionUserDO.java @@ -1,5 +1,6 @@ package com.zcloud.key.project.persistence.dataobject.inspection; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import io.swagger.annotations.ApiModelProperty; @@ -32,6 +33,18 @@ public class SafetyEnvironmentalInspectionUserDO extends BaseDO { //检查人部门id @ApiModelProperty(value = "检查人部门id") private Long departmentId; + //检查人企业名称 + @ApiModelProperty(value = "检查人企业名称") + @TableField(exist = false) + private String corpName; + //检查人部门名称 + @ApiModelProperty(value = "检查人部门名称") + @TableField(exist = false) + private String departmentName; + //检查人名称 + @ApiModelProperty(value = "检查人名称") + @TableField(exist = false) + private String userName; //检查人人员id @ApiModelProperty(value = "检查人人员id") private Long userId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java index 51d8b11..8fb6911 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java @@ -1,8 +1,13 @@ package com.zcloud.key.project.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; /** * web-infrastructure @@ -12,6 +17,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface HiddenMapper extends BaseMapper { + IPage selectListPage(IPage page, @Param("params") Map params, String menuPerms); + + HiddenDO getInfoById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java index e6579f4..211366f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java @@ -22,5 +22,7 @@ public interface SafetyEnvironmentalInspectionMapper extends BaseMapper { + List selectListByInspectionId(@Param("params") Map params); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java index fe70be4..b43633a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java @@ -23,5 +23,11 @@ public interface HiddenRepository extends BaseRepository { List listAllByInspectionId(String inspectionId); void deleteBatch(Map params); + + void updateState(String hiddenId, Integer state); + + Long countByForeignKey(String foreignKey, List state); + + HiddenDO getInfoById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java index 98eb1e9..e8a3ff9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java @@ -1,5 +1,6 @@ package com.zcloud.key.project.persistence.repository.impl.hidden; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -14,6 +15,7 @@ import com.zcloud.key.project.persistence.mapper.HiddenMapper; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import java.util.List; import java.util.Map; @@ -32,10 +34,7 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = hiddenMapper.selectPage(iPage, queryWrapper); + IPage result = hiddenMapper.selectListPage(iPage, params, null); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -72,5 +71,32 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("hidden_id", hiddenId); + updateWrapper.eq("delete_enum", "FALSE"); + updateWrapper.set("state", state); + hiddenMapper.update(null, updateWrapper); + } + + @Override + public Long countByForeignKey(String foreignKey, List stateList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("foreign_key", foreignKey); + if(stateList != null && stateList.size() > 0){ + queryWrapper.in("state", stateList); + } + + queryWrapper.eq("delete_enum", "FALSE"); + return hiddenMapper.selectCount(queryWrapper); + } + + @Override + public HiddenDO getInfoById(Long id) { + return hiddenMapper.getInfoById(id); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java index c72eedb..6cfc12b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java @@ -56,5 +56,10 @@ public class SafetyEnvironmentalInspectionRepositoryImpl extends BaseRepositoryI public SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId) { return safetyEnvironmentalInspectionMapper.getByInspectionId(inspectionId); } + + @Override + public SafetyEnvironmentalInspectionDO getInfoById(Long id) { + return safetyEnvironmentalInspectionMapper.getInfoById(id); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java index 80e3f7f..938d011 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java @@ -16,6 +16,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -68,12 +69,13 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit @Override public List listAllByInspectionId(String inspectionId, Integer type) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("inspection_id", inspectionId); - queryWrapper.eq("delete_enum", "FALSE"); - queryWrapper.orderByDesc("create_time"); - queryWrapper.eq("type", type); - return safetyEnvironmentalInspectionUserMapper.selectList(queryWrapper); + Map params = new HashMap(); + params.put("inspectionId", inspectionId); + if (!ObjectUtils.isEmpty(type)){ + params.put("type", type); + } + + return safetyEnvironmentalInspectionUserMapper.selectListByInspectionId(params); } @Override @@ -81,7 +83,7 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("inspection_id", inspectionUserDO.getInspectionId()); updateWrapper.eq("user_id", inspectionUserDO.getUserId()); - updateWrapper.eq("type", 2); + updateWrapper.eq("type", inspectionUserDO.getType()); updateWrapper.eq("delete_enum", "FALSE"); updateWrapper.set("user_remarks", inspectionUserDO.getUserRemarks()); updateWrapper.set("status", inspectionUserDO.getStatus()); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java index 6473414..d7c7318 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionRepository.java @@ -20,5 +20,7 @@ public interface SafetyEnvironmentalInspectionRepository extends BaseRepository< void updateStatus(String inspectionId, Integer status, Integer defendFlag); SafetyEnvironmentalInspectionDO getByInspectionId(String inspectionId); + + SafetyEnvironmentalInspectionDO getInfoById(Long id); } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index 21b515d..34eda59 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -3,5 +3,99 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml index 08eea1d..350bd2a 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml @@ -10,6 +10,7 @@ GROUP_CONCAT(DISTINCT iuu.name) inspection_user_name, indc.corp_name inspected_corpinfo_name, xmu.name xgf_master_user_name + FROM safety_environmental_inspection i left join key_project kp on kp.key_project_id = i.key_project_id @@ -17,6 +18,7 @@ left join ( SELECT inspection_id, + department_id, user_id, type, ROW_NUMBER() OVER ( @@ -32,7 +34,7 @@ left join user xmu on xmu.id = i.xgf_master_user_id where i.delete_enum = 'FALSE' - and i.place = #{params.place} + and i.place LIKE CONCAT('%', #{params.place}, '%') and creu.name LIKE CONCAT('%', #{params.createName}, '%') @@ -53,10 +55,17 @@ and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%') + + and i.status in + + #{status} + + + + GROUP BY i.id HAVING inspection_user_name LIKE CONCAT('%', #{params.inspectionUserName}, '%') - GROUP BY i.id ORDER BY CASE WHEN i.status = 6 THEN 0 ELSE 1 END, i.create_time desc @@ -65,15 +74,47 @@ + + diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml index 45eea1a..713383c 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml @@ -3,6 +3,25 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +