From f62296ef2a693043a6954c77828fd418f664026d Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 2 Apr 2026 16:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E7=94=B3=E8=BE=A9=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=B5=81=E7=A8=8B=E5=9B=BE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/bootstrap.yml | 2 + ...vironmentalInspectionDefendController.java | 6 ++ ...EnvironmentalInspectionUserController.java | 7 ++ .../SafetyEnvironmentalInspectionAddExe.java | 38 +++++++--- ...afetyEnvironmentalInspectionUpdateExe.java | 73 +++++++++++++++---- .../command/query/hidden/HiddenQueryExe.java | 46 +++++++++++- ...EnvironmentalInspectionDefendQueryExe.java | 15 ++++ ...SafetyEnvironmentalInspectionQueryExe.java | 61 ++++++++++++++-- ...tyEnvironmentalInspectionUserQueryExe.java | 46 ++++++++++++ ...ironmentalInspectionDefendServiceImpl.java | 5 ++ ...nvironmentalInspectionUserServiceImpl.java | 8 ++ ...EnvironmentalInspectionDefendServiceI.java | 2 + ...tyEnvironmentalInspectionUserServiceI.java | 5 ++ .../hidden/HiddenAcceptRecordCO.java | 8 ++ .../dto/clientobject/hidden/HiddenCO.java | 23 ++++++ .../clientobject/hidden/HiddenFindUserCO.java | 12 +++ .../SafetyEnvironmentalInspectionCO.java | 3 + .../SafetyEnvironmentalInspectionFlowCO.java | 26 +++++++ .../SafetyEnvironmentalInspectionUserCO.java | 2 +- .../key/project/dto/hidden/HiddenAddCmd.java | 3 +- .../SafetyEnvironmentalInspectionPageQry.java | 2 + .../project/domain/enums/FlowTypeEnum.java | 56 ++++++++++++++ .../project/domain/model/hidden/HiddenE.java | 2 +- .../domain/model/hidden/HiddenFindUserE.java | 10 +++ .../hidden/HiddenAcceptRecordDO.java | 9 +++ .../dataobject/hidden/HiddenDO.java | 10 +++ .../dataobject/hidden/HiddenFindUserDO.java | 10 +++ .../hidden/HiddenRectificationRecordDO.java | 9 +++ .../SafetyEnvironmentalInspectionUserDO.java | 2 +- .../mapper/HiddenAcceptRecordMapper.java | 6 +- .../mapper/HiddenFindUserMapper.java | 7 ++ .../persistence/mapper/HiddenMapper.java | 2 + .../HiddenRectificationRecordMapper.java | 5 ++ ...tyEnvironmentalInspectionDefendMapper.java | 4 +- .../hidden/HiddenAcceptRecordRepository.java | 3 + .../hidden/HiddenFindUserRepository.java | 3 + .../HiddenRectificationRecordRepository.java | 5 ++ .../repository/hidden/HiddenRepository.java | 2 +- .../HiddenAcceptRecordRepositoryImpl.java | 6 ++ .../hidden/HiddenFindUserRepositoryImpl.java | 10 +++ ...ddenRectificationRecordRepositoryImpl.java | 6 ++ .../impl/hidden/HiddenRepositoryImpl.java | 4 +- ...nmentalInspectionDefendRepositoryImpl.java | 5 ++ ...ronmentalInspectionUserRepositoryImpl.java | 8 +- ...vironmentalInspectionDefendRepository.java | 2 + .../mapper/HiddenAcceptRecordMapper.xml | 19 +++++ .../resources/mapper/HiddenFindUserMapper.xml | 36 +++++++++ .../main/resources/mapper/HiddenMapper.xml | 57 ++++++--------- .../HiddenRectificationRecordMapper.xml | 18 +++++ ...etyEnvironmentalInspectionDefendMapper.xml | 13 +++- .../SafetyEnvironmentalInspectionMapper.xml | 3 + ...afetyEnvironmentalInspectionUserMapper.xml | 2 +- 52 files changed, 644 insertions(+), 83 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionFlowCO.java create mode 100644 web-domain/src/main/java/com/zcloud/key/project/domain/enums/FlowTypeEnum.java diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index d921869..47a7c0a 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -3,4 +3,6 @@ spring: import: - classpath:nacos.yml - classpath:sdk.yml +# - classpath:nacos-prod.yml +# - classpath:sdk-prod.yml - classpath:swagger.yml diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java index 7cc9cd3..92c01e9 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionDefendController.java @@ -65,6 +65,12 @@ public class SafetyEnvironmentalInspectionDefendController { return SingleResponse.of(safetyEnvironmentalInspectionDefendService.queryById(id)); } + @ApiOperation("查询安全环保检查申辩详情") + @GetMapping("/getInfoByInspectionId/{id}") + public SingleResponse getInfoByInspectionId(@PathVariable("id") Long id) { + return SingleResponse.of(safetyEnvironmentalInspectionDefendService.getInfoByInspectionId(id)); + } + @ApiOperation("删除") @DeleteMapping("/{id}") public Response remove(@PathVariable("id") Long id) { diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.java index 520f265..546623a 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/inspection/SafetyEnvironmentalInspectionUserController.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.inspection.SafetyEnvironmentalInspectionUserServiceI; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionFlowCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionUserCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserPageQry; @@ -34,6 +35,12 @@ import java.util.ArrayList; public class SafetyEnvironmentalInspectionUserController { private final SafetyEnvironmentalInspectionUserServiceI safetyEnvironmentalInspectionUserService; + + @ApiOperation("流程图") + @GetMapping("/getFlowChartByInspectionId/{inspectionId}") + public MultiResponse getFlowChartByInspectionId(@PathVariable("inspectionId") String inspectionId) { + return MultiResponse.of(safetyEnvironmentalInspectionUserService.getFlowChartByInspectionId(inspectionId)); + } @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody SafetyEnvironmentalInspectionUserAddCmd cmd) { diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java index b02301d..aec5383 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java @@ -34,8 +34,8 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** @@ -105,6 +105,25 @@ public class SafetyEnvironmentalInspectionAddExe { safetyEnvironmentalInspectionContentRepository.batchInsert(BeanUtil.copyToList(insContentList, SafetyEnvironmentalInspectionContentDO.class)); // 新增隐患数据 if (hiddenAddCmdList != null && hiddenAddCmdList.size() > 0){ + List findUserIds = hiddenAddCmdList.stream() + .map(HiddenAddCmd::getHiddenFindUserList) + .filter(Objects::nonNull) + .flatMap(List::stream) + .distinct() + .collect(Collectors.toList()); + Map userMap; + if (findUserIds != null && findUserIds.size() > 0){ + Map params = new HashMap<>(); + params.put("userIds", findUserIds); + List hiddenFindUserDOList = hiddenFindUserRepository.listByUserIds(params); + userMap = hiddenFindUserDOList.stream().collect(Collectors.toMap(HiddenFindUserDO::getFindUserId, v -> v)); + + } else { + userMap = new HashMap<>(); + } + // 初始化隐患发现人数据 + + // 初始化隐患数据 List hiddenFindUserList = new ArrayList(); hiddenAddCmdList.stream().forEach( @@ -114,8 +133,8 @@ public class SafetyEnvironmentalInspectionAddExe { } hiddenAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); hiddenAddCmd.setState(1); - hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId()); - hiddenAddCmd.setRectificationDepartmentId(safetyEnvironmentalInspectionE.getXgfMasterDepartmentId()); +// hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId()); +// hiddenAddCmd.setRectificationDepartmentId(safetyEnvironmentalInspectionE.getXgfMasterDepartmentId()); hiddenAddCmd.setRectificationUserId(safetyEnvironmentalInspectionE.getXgfMasterUserId()); hiddenAddCmd.setAcceptCorpId(ssoUser.getTenantId()); hiddenAddCmd.setAcceptDepartmentId(ssoUser.getOrgId()); @@ -123,12 +142,13 @@ public class SafetyEnvironmentalInspectionAddExe { // 隐患发现人 if (hiddenAddCmd.getHiddenFindUserList() != null && hiddenAddCmd.getHiddenFindUserList().size() > 0){ hiddenAddCmd.getHiddenFindUserList().stream().forEach( - hiddenFindUserAddCmd -> { + findUserId -> { HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); - hiddenFindUserE.setHiddenFindUserId(Tools.get32UUID()); - hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId()); - hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); - BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE); + hiddenFindUserE.init(hiddenAddCmd.getHiddenId(), + safetyEnvironmentalInspectionE.getInspectionId(), + findUserId, + userMap.get(findUserId).getFindDepartmentId(), + userMap.get(findUserId).getFindCorpId()); hiddenFindUserList.add(hiddenFindUserE); } ); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java index b2bf4c3..abc8e15 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java @@ -37,10 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -127,6 +124,25 @@ public class SafetyEnvironmentalInspectionUpdateExe { hiddenFindUserRepository.batchDelete(params); // 新增隐患数据 if (hiddenAddCmdList != null && hiddenAddCmdList.size() > 0){ + + + List findUserIds = hiddenAddCmdList.stream() + .map(HiddenAddCmd::getHiddenFindUserList) + .filter(Objects::nonNull) + .flatMap(List::stream) + .distinct() + .collect(Collectors.toList()); + Map userMap; + if (findUserIds != null && findUserIds.size() > 0){ + Map userParams = new HashMap<>(); + userParams.put("userIds", findUserIds); + List hiddenFindUserDOList = hiddenFindUserRepository.listByUserIds(userParams); + userMap = hiddenFindUserDOList.stream().collect(Collectors.toMap(HiddenFindUserDO::getFindUserId, v -> v)); + + } else { + userMap = new HashMap<>(); + } + // 初始化隐患数据 List hiddenFindUserList = new ArrayList(); hiddenAddCmdList.stream().forEach( @@ -136,20 +152,22 @@ public class SafetyEnvironmentalInspectionUpdateExe { } hiddenAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); hiddenAddCmd.setState(1); - hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId()); - hiddenAddCmd.setRectificationDepartmentId(safetyEnvironmentalInspectionE.getXgfMasterDepartmentId()); +// hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId()); +// hiddenAddCmd.setRectificationDepartmentId(safetyEnvironmentalInspectionE.getXgfMasterDepartmentId()); hiddenAddCmd.setRectificationUserId(safetyEnvironmentalInspectionE.getXgfMasterUserId()); hiddenAddCmd.setAcceptCorpId(ssoUser.getTenantId()); hiddenAddCmd.setAcceptDepartmentId(ssoUser.getOrgId()); hiddenAddCmd.setAcceptUserId(ssoUser.getUserId()); + // 隐患发现人 if (hiddenAddCmd.getHiddenFindUserList() != null && hiddenAddCmd.getHiddenFindUserList().size() > 0){ hiddenAddCmd.getHiddenFindUserList().stream().forEach( - hiddenFindUserAddCmd -> { + findUserId -> { HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); - hiddenFindUserE.setHiddenFindUserId(Tools.get32UUID()); - hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId()); - hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); - BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE); + hiddenFindUserE.init(hiddenAddCmd.getHiddenId(), + safetyEnvironmentalInspectionE.getInspectionId(), + findUserId, + userMap.get(findUserId).getFindDepartmentId(), + userMap.get(findUserId).getFindCorpId()); hiddenFindUserList.add(hiddenFindUserE); } ); @@ -251,6 +269,27 @@ public class SafetyEnvironmentalInspectionUpdateExe { hiddenFindUserRepository.batchDelete(params); // 新增隐患数据 if (hiddenAddCmdList != null && hiddenAddCmdList.size() > 0){ + + + + List findUserIds = hiddenAddCmdList.stream() + .map(HiddenAddCmd::getHiddenFindUserList) + .filter(Objects::nonNull) + .flatMap(List::stream) + .distinct() + .collect(Collectors.toList()); + Map userMap; + if (findUserIds != null && findUserIds.size() > 0){ + Map userParams = new HashMap<>(); + userParams.put("userIds", findUserIds); + List hiddenFindUserDOList = hiddenFindUserRepository.listByUserIds(userParams); + userMap = hiddenFindUserDOList.stream().collect(Collectors.toMap(HiddenFindUserDO::getFindUserId, v -> v)); + + } else { + userMap = new HashMap<>(); + } + + // 初始化隐患数据 List hiddenFindUserList = new ArrayList(); hiddenAddCmdList.stream().forEach( @@ -266,14 +305,16 @@ public class SafetyEnvironmentalInspectionUpdateExe { hiddenAddCmd.setAcceptCorpId(ssoUser.getTenantId()); hiddenAddCmd.setAcceptDepartmentId(ssoUser.getOrgId()); hiddenAddCmd.setAcceptUserId(ssoUser.getUserId()); + // 隐患发现人 if (hiddenAddCmd.getHiddenFindUserList() != null && hiddenAddCmd.getHiddenFindUserList().size() > 0){ hiddenAddCmd.getHiddenFindUserList().stream().forEach( - hiddenFindUserAddCmd -> { + findUserId -> { HiddenFindUserE hiddenFindUserE = new HiddenFindUserE(); - hiddenFindUserE.setHiddenFindUserId(Tools.get32UUID()); - hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId()); - hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId()); - BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE); + hiddenFindUserE.init(hiddenAddCmd.getHiddenId(), + safetyEnvironmentalInspectionE.getInspectionId(), + findUserId, + userMap.get(findUserId).getFindDepartmentId(), + userMap.get(findUserId).getFindCorpId()); hiddenFindUserList.add(hiddenFindUserE); } ); 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 529e581..9c92e79 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 @@ -4,13 +4,24 @@ 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.command.convertor.hidden.HiddenFindUserCoConvertor; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenAcceptRecordCO; import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenRectificationRecordCO; import com.zcloud.key.project.dto.hidden.HiddenPageQry; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; +import com.zcloud.key.project.persistence.repository.hidden.HiddenAcceptRecordRepository; +import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import com.zcloud.key.project.persistence.repository.hidden.HiddenRectificationRecordRepository; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,6 +36,11 @@ import java.util.Map; @AllArgsConstructor public class HiddenQueryExe { private final HiddenRepository hiddenRepository; + private final HiddenFindUserRepository hiddenFindUserRepository; + private final HiddenRectificationRecordRepository hiddenRectificationRecordRepository; + private final HiddenAcceptRecordRepository hiddenAcceptRecordRepository; + private final HiddenFindUserCoConvertor hiddenFindUserCoConvertor; + private final HiddenCoConvertor hiddenCoConvertor; /** @@ -41,7 +57,35 @@ public class HiddenQueryExe { } public SingleResponse getInfoByIdExecute(Long id) { HiddenDO hiddenDO = hiddenRepository.getInfoById(id); - return null; + HiddenCO hiddenCO = new HiddenCO(); + BeanUtils.copyProperties(hiddenDO, hiddenCO); + Map params = new HashMap(); + params.put("hiddenId", hiddenDO.getHiddenId()); + + List hiddenFindUserDOs = hiddenFindUserRepository.listAll(params); + if (hiddenFindUserDOs != null && hiddenFindUserDOs.size() > 0){ + StringBuffer userNames = new StringBuffer(); + StringBuffer departmentNames = new StringBuffer(); + hiddenFindUserDOs.stream().forEach(hiddenFindUserDO -> { + userNames.append(hiddenFindUserDO.getFindUserName()).append(","); + departmentNames.append(hiddenFindUserDO.getFindDepartmentName()).append(","); + hiddenCO.setFindUserName(userNames.toString()); + hiddenCO.setFindDepartmentName(departmentNames.toString()); + }); + } + List hiddenRectificationRecordDOs = hiddenRectificationRecordRepository.listAll(params); + List hiddenAcceptRecordDOs = hiddenAcceptRecordRepository.listAll(params); + if (hiddenRectificationRecordDOs != null && hiddenRectificationRecordDOs.size() > 0){ + HiddenRectificationRecordCO hiddenRectificationRecordCO = new HiddenRectificationRecordCO(); + BeanUtils.copyProperties(hiddenRectificationRecordDOs.get(0), hiddenRectificationRecordCO); + hiddenCO.setRectificationRecord(hiddenRectificationRecordCO); + } + if (hiddenAcceptRecordDOs != null && hiddenAcceptRecordDOs.size() > 0){ + HiddenAcceptRecordCO hiddenAcceptRecordCO = new HiddenAcceptRecordCO(); + BeanUtils.copyProperties(hiddenAcceptRecordDOs.get(0), hiddenAcceptRecordCO); + hiddenCO.setAcceptRecord(hiddenAcceptRecordCO); + } + return SingleResponse.of(hiddenCO); } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionDefendQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionDefendQueryExe.java index d168e78..f8d189f 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionDefendQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionDefendQueryExe.java @@ -3,10 +3,13 @@ package com.zcloud.key.project.command.query.inspection; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionDefendCoConvertor; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionDefendCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionDefendPageQry; +import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDefendDO; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionDefendRepository; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -24,6 +27,7 @@ import java.util.Map; @AllArgsConstructor public class SafetyEnvironmentalInspectionDefendQueryExe { private final SafetyEnvironmentalInspectionDefendRepository safetyEnvironmentalInspectionDefendRepository; + private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository; private final SafetyEnvironmentalInspectionDefendCoConvertor safetyEnvironmentalInspectionDefendCoConvertor; /** @@ -36,6 +40,17 @@ public class SafetyEnvironmentalInspectionDefendQueryExe { return safetyEnvironmentalInspectionDefendCoConvertor.converDOToCO(safetyEnvironmentalInspectionDefendRepository.getById(id)); } + /** + * 根据id查询 + * + * @param id + * @return + */ + public SafetyEnvironmentalInspectionDefendCO getInfoByInspectionId(Long id) { + SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getById(id); + return safetyEnvironmentalInspectionDefendCoConvertor.converDOToCO(safetyEnvironmentalInspectionDefendRepository.findByInspectionId(inspectionDO.getInspectionId())); + } + /** * 分页 * 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 f2d5b35..025a6ae 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 @@ -3,18 +3,22 @@ package com.zcloud.key.project.command.query.inspection; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.hidden.HiddenCoConvertor; +import com.zcloud.key.project.command.convertor.hidden.HiddenFindUserCoConvertor; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionCoConvertor; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionContentCoConvertor; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionUserCoConvertor; import com.zcloud.key.project.dto.clientobject.hidden.HiddenCO; +import com.zcloud.key.project.dto.clientobject.hidden.HiddenFindUserCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionContentCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionUserCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionPageQry; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; 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.HiddenFindUserRepository; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository; @@ -23,8 +27,11 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -41,9 +48,11 @@ public class SafetyEnvironmentalInspectionQueryExe { private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository; private final SafetyEnvironmentalInspectionContentRepository safetyEnvironmentalInspectionContentRepository; private final HiddenRepository hiddenRepository; + private final HiddenFindUserRepository hiddenFindUserRepository; private final SafetyEnvironmentalInspectionUserCoConvertor safetyEnvironmentalInspectionUserCoConvertor; private final SafetyEnvironmentalInspectionContentCoConvertor safetyEnvironmentalInspectionContentCoConvertor; private final HiddenCoConvertor hiddenCoConvertor; + private final HiddenFindUserCoConvertor hiddenFindUserCoConvertor; /** * 根据id查询 * @@ -51,21 +60,57 @@ public class SafetyEnvironmentalInspectionQueryExe { * @return */ public SafetyEnvironmentalInspectionCO queryById(Long id) { + // 安全环保检查信息 SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getInfoById(id); - Integer type = 2; + Integer verifyType = 2; + Integer affirmType = 3; if (!ObjectUtils.isEmpty(inspectionDO.getDefendFlag()) && inspectionDO.getDefendFlag() == 1){ - type = 5; + verifyType = 5; + affirmType = 6; } - List inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId(), type); + // 操作流程 + List inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId()); + // 核实人列表 + List verifyUserDOs = new ArrayList<>(); + // 确认人列表 + List affirmUserDOs = new ArrayList<>(); + for (SafetyEnvironmentalInspectionUserDO inspectionUserDO : inspectionUserDOs) { + if (verifyType.equals(inspectionUserDO.getType())){ + verifyUserDOs.add(inspectionUserDO); + } + if (affirmType.equals(inspectionUserDO.getType())){ + affirmUserDOs.add(inspectionUserDO); + } + } + + // 检查内容 List inspectionContentDOs = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(inspectionDO.getInspectionId()); - List hiddenDOs = hiddenRepository.listAllByInspectionId(inspectionDO.getInspectionId()); - List inspectionUserCOS = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(inspectionUserDOs); + // 隐患信息 + List hiddenDOs = hiddenRepository.listAllByForeignId(inspectionDO.getInspectionId()); + + + List verifyUserCOs = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(verifyUserDOs); + List affirmUserCOs = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(affirmUserDOs); List inspectionContentCOS = safetyEnvironmentalInspectionContentCoConvertor.converDOsToCOs(inspectionContentDOs); - List hiddenCOS = hiddenCoConvertor.converDOsToCOs(hiddenDOs); + SafetyEnvironmentalInspectionCO inspectionCO = safetyEnvironmentalInspectionCoConvertor.converDOToCO(inspectionDO); - inspectionCO.setInspectionUserList(inspectionUserCOS); + inspectionCO.setInspectionUserList(verifyUserCOs); + inspectionCO.setAffirmUserList(affirmUserCOs); inspectionCO.setInspectionContentList(inspectionContentCOS); - inspectionCO.setHiddenList(hiddenCOS); + + if (hiddenDOs != null && hiddenDOs.size() > 0){ + Map params = new HashMap(); + params.put("foreignKey", inspectionDO.getInspectionId()); + List hiddenFindUserDOs = hiddenFindUserRepository.listAll(params); + List hiddenFindUserCOs = hiddenFindUserCoConvertor.converDOsToCOs(hiddenFindUserDOs); + Map> hiddenFindUserMap = hiddenFindUserCOs.stream().collect(Collectors.groupingBy(HiddenFindUserCO::getHiddenId)); + + List hiddenCOS = hiddenCoConvertor.converDOsToCOs(hiddenDOs); + hiddenCOS.stream().forEach(hiddenCO -> { + hiddenCO.setFindUserList(hiddenFindUserMap.get(hiddenCO.getHiddenId())); + }); + inspectionCO.setHiddenList(hiddenCOS); + } return inspectionCO; } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java index ce4873e..1c7ff1e 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java @@ -3,15 +3,21 @@ package com.zcloud.key.project.command.query.inspection; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionUserCoConvertor; +import com.zcloud.key.project.domain.enums.FlowTypeEnum; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionFlowCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionUserCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserPageQry; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; +import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -48,5 +54,45 @@ public class SafetyEnvironmentalInspectionUserQueryExe { List examCenterCOS = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + + public List getFlowChartByInspectionId(String inspectionId) { + List userDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionId); + Map> typeGroupMap = userDOs.stream().collect(Collectors.groupingBy(SafetyEnvironmentalInspectionUserDO::getType)); + List flowList = new ArrayList<>(); + + // 遍历typeGroupMap + for (Integer type : typeGroupMap.keySet()) { + SafetyEnvironmentalInspectionFlowCO flowCO = new SafetyEnvironmentalInspectionFlowCO(); + flowCO.setType(type); + if (typeGroupMap.get(type) != null){ + if (typeGroupMap.get(type).size() > 1){//当前步骤有多个操作人 + List children = new ArrayList<>(); + typeGroupMap.get(type).stream().forEach(userDO -> { + SafetyEnvironmentalInspectionFlowCO child = new SafetyEnvironmentalInspectionFlowCO(); + child.setType(userDO.getType()); + child.setStatus(userDO.getStatus()); + List flowStrList = initFlowStrList(userDO.getType(), userDO); + child.setFlowList(flowStrList); + children.add(child); + }); + flowCO.setChildren(children); + } else { + SafetyEnvironmentalInspectionUserDO userDO = typeGroupMap.get(type).get(0); + flowCO.setStatus(userDO.getStatus()); + flowCO.setFlowList(initFlowStrList(userDO.getType(), userDO)); + } + } + flowList.add(flowCO); + } + return flowList; + } + + private List initFlowStrList(Integer type,SafetyEnvironmentalInspectionUserDO userDO){ + List flowStrList = new ArrayList<>(); + flowStrList.add(FlowTypeEnum.getNameByType(type)); + flowStrList.add(userDO.getName()+" "+ (!ObjectUtils.isEmpty(userDO.getSignatureTime()) ? userDO.getSignatureTime().toString() : userDO.getCreateTime())); + return flowStrList; + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java index 2b76fc4..dfcab96 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionDefendServiceImpl.java @@ -34,6 +34,11 @@ public class SafetyEnvironmentalInspectionDefendServiceImpl implements SafetyEnv return safetyEnvironmentalInspectionDefendQueryExe.queryById(id); } + @Override + public SafetyEnvironmentalInspectionDefendCO getInfoByInspectionId(Long id) { + return safetyEnvironmentalInspectionDefendQueryExe.getInfoByInspectionId( id); + } + @Override public PageResponse listPage(SafetyEnvironmentalInspectionDefendPageQry qry) { diff --git a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java index f31f1af..ec0bc33 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/inspection/SafetyEnvironmentalInspectionUserServiceImpl.java @@ -8,6 +8,7 @@ import com.zcloud.key.project.command.inspection.SafetyEnvironmentalInspectionUs import com.zcloud.key.project.command.inspection.SafetyEnvironmentalInspectionUserRemoveExe; import com.zcloud.key.project.command.inspection.SafetyEnvironmentalInspectionUserUpdateExe; import com.zcloud.key.project.command.query.inspection.SafetyEnvironmentalInspectionUserQueryExe; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionFlowCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionUserCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserPageQry; @@ -16,6 +17,8 @@ import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserVe import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * web-app * @@ -68,5 +71,10 @@ public class SafetyEnvironmentalInspectionUserServiceImpl implements SafetyEnvir public void removeBatch(Long[] ids) { safetyEnvironmentalInspectionUserRemoveExe.execute(ids); } + + @Override + public List getFlowChartByInspectionId(String inspectionId) { + return safetyEnvironmentalInspectionUserQueryExe.getFlowChartByInspectionId(inspectionId); + } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java index d300722..aeb7b78 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionDefendServiceI.java @@ -17,6 +17,8 @@ import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionDefend public interface SafetyEnvironmentalInspectionDefendServiceI { SafetyEnvironmentalInspectionDefendCO queryById(Long id); + SafetyEnvironmentalInspectionDefendCO getInfoByInspectionId(Long id); + PageResponse listPage(SafetyEnvironmentalInspectionDefendPageQry qry); SingleResponse add(SafetyEnvironmentalInspectionDefendAddCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java index 75251bc..825484d 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/inspection/SafetyEnvironmentalInspectionUserServiceI.java @@ -3,12 +3,15 @@ package com.zcloud.key.project.api.inspection; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionFlowCO; import com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionUserCO; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserPageQry; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserUpdateCmd; import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserVerifyCmd; +import java.util.List; + /** * web-client * @@ -29,5 +32,7 @@ public interface SafetyEnvironmentalInspectionUserServiceI { void remove(Long id); void removeBatch(Long[] ids); + + List getFlowChartByInspectionId(String inspectionId); } 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 82ece39..892b799 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 @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.clientobject.hidden; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,6 +37,13 @@ public class HiddenAcceptRecordCO extends ClientObject { //验收人id @ApiModelProperty(value = "验收人id") private Long acceptUserId; + + //验收人部门id + @ApiModelProperty(value = "验收人部门名称") + private String acceptDepartmentName; + //验收人id + @ApiModelProperty(value = "验收人名称") + private String acceptUserName; //验收时间 @ApiModelProperty(value = "验收时间") private LocalDateTime acceptTime; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java index 4354484..09b8c8e 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java @@ -1,10 +1,13 @@ package com.zcloud.key.project.dto.clientobject.hidden; 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; import java.time.LocalDateTime; +import java.util.List; /** @@ -56,18 +59,25 @@ public class HiddenCO extends ClientObject { private Integer rectificationType; //整改期限(整改截至日期) @ApiModelProperty(value = "整改期限(整改截至日期)") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime rectificationDeadline; @ApiModelProperty(value = "整改人企业id", name = "rectificationCorpId") private Long rectificationCorpId; + + @ApiModelProperty(value = "整改人企业名称", name = "rectificationCorpName") + private String rectificationCorpName; @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId") private Long rectificationDepartmentId; @ApiModelProperty(value = "整改人id", name = "rectificationUserId") private Long rectificationUserId; + @ApiModelProperty(value = "整改时间", name = "rectificationTime") + private String rectificationTime; // 整改时间 + @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId") private Long acceptCorpId; @@ -77,6 +87,19 @@ public class HiddenCO extends ClientObject { @ApiModelProperty(value = "验收人id", name = "acceptUserId") private Long acceptUserId; + + @ApiModelProperty(value = "隐患发现人", name="findUserList") + private List findUserList; + + + @ApiModelProperty(value = "隐患发现人") + private String findUserName; + @ApiModelProperty(value = "隐患发现人部门名称") + private String findDepartmentName; + @ApiModelProperty(value = "隐患整改记录") + private HiddenRectificationRecordCO rectificationRecord; + @ApiModelProperty(value = "隐患验收记录") + private HiddenAcceptRecordCO acceptRecord; // 隐患视频 @ApiModelProperty(value = "隐患视频") private String videoUrl; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java index ea2520e..5a58966 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenFindUserCO.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.dto.clientobject.hidden; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -41,6 +42,17 @@ public class HiddenFindUserCO extends ClientObject { //发现人id @ApiModelProperty(value = "发现人id") private Long findUserId; + + + @ApiModelProperty(value = "发现人企业名称") + @TableField(exist = false) + private String findCorpName; + @ApiModelProperty(value = "发现人部门名称") + @TableField(exist = false) + private String findDepartmentName; + @ApiModelProperty(value = "发现人名称") + @TableField(exist = false) + private String findUserName; //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; 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 4725c51..54ee5de 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 @@ -94,6 +94,9 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject { @ApiModelProperty(value = "检查人员", name = "inspectionUserList", required = true) private List inspectionUserList; + + @ApiModelProperty(value = "确认人员", name = "affirmUserList", required = true) + private List affirmUserList; @ApiModelProperty(value = "检查情况", name = "inspectionContentList", required = true) private List inspectionContentList; @ApiModelProperty(value = "发现隐患", name = "hiddenList", required = true) diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionFlowCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionFlowCO.java new file mode 100644 index 0000000..35bea03 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionFlowCO.java @@ -0,0 +1,26 @@ +package com.zcloud.key.project.dto.clientobject.inspection; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2026-03-20 16:52:52 + */ +@Data +public class SafetyEnvironmentalInspectionFlowCO extends ClientObject { + private Integer type; + private Integer status; + private List flowList; + private List children; +} + 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 129b623..bbffcc7 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 @@ -41,7 +41,7 @@ public class SafetyEnvironmentalInspectionUserCO extends ClientObject { private String departmentName; //检查人名称 @ApiModelProperty(value = "检查人名称") - private String userName; + private String name; //检查人人员id @ApiModelProperty(value = "检查人人员id") private Long userId; 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 e23f448..750b832 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 @@ -104,7 +104,8 @@ public class HiddenAddCmd extends Command { private Long acceptUserId; @ApiModelProperty(value = "隐患发现人集合", name = "hiddenFindUserList", required = true) - private List hiddenFindUserList; + private List hiddenFindUserList; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java index 062105b..1e12a34 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java @@ -36,6 +36,8 @@ public class SafetyEnvironmentalInspectionPageQry extends PageQuery { private String inspectionUserName; private List statusList; + private String year; + } diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/enums/FlowTypeEnum.java b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/FlowTypeEnum.java new file mode 100644 index 0000000..f50e24c --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/FlowTypeEnum.java @@ -0,0 +1,56 @@ +package com.zcloud.key.project.domain.enums; + +import io.swagger.models.auth.In; +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 菜单枚举 + */ +@Getter +public enum FlowTypeEnum { + //'操作类型 1-发起 2-检查人核实 3-被检查人确认 4-被检查申辩待处理 5-申辩后待检查人核实 6-申辩后被检查人确认 7-隐患整改 8-隐患验收 9-归档', + FQ(1, "发起"), + JCRHS(2, "检查人核实"), + BCJRQR(3, "被检查人确认"), + BJCSBDCL(4, "被检查申辩待处理"), + SBHDJCRHS(5, "申辩后待检查人核实"), + SBHBJCRQR(6, "申辩后被检查人确认"), + YHZG(7, "隐患整改"), + YHYS(8, "隐患验收"), + GD(9, "归档"); + + private final Integer type; + private final String name; + + private static final Map TYPE_MAP = + Arrays.stream(values()) + .collect(Collectors.toMap(FlowTypeEnum::getType, Function.identity())); + + FlowTypeEnum(Integer type, String name) { + this.type = type; + this.name = name; + } + + public Integer getType() { + return type; + } + + public String getName() { + return name; + } + + public static FlowTypeEnum getByType(Integer type) { + return TYPE_MAP.get(type); + } + + public static String getNameByType(Integer type) { + FlowTypeEnum entry = TYPE_MAP.get(type); + return entry != null ? entry.getName() : null; + } + +} diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java index 0fcdcbc..7a73354 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenE.java @@ -90,7 +90,7 @@ public class HiddenE extends BaseE { //环境 private String env; - private List hiddenFindUserList; + private List hiddenFindUserList; public void initSaveList(List hiddenList, SafetyEnvironmentalInspectionE inspectionInfo, diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java index 72b1460..10f6149 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/model/hidden/HiddenFindUserE.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.domain.model.hidden; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -55,5 +56,14 @@ public class HiddenFindUserE extends BaseE { private Long orgId; //环境 private String env; + + public void init(String hiddenId, String foreignKey, Long findUserId, Long findDepartmentId, Long findCorpId){ + this.setHiddenFindUserId(Tools.get32UUID()); + this.setHiddenId(hiddenId); + this.setForeignKey(foreignKey); + this.setFindUserId(findUserId); + this.setFindDepartmentId(findDepartmentId); + this.setFindCorpId(findCorpId); + } } 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 87ebe1d..7cbca21 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 @@ -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; @@ -38,6 +39,14 @@ public class HiddenAcceptRecordDO extends BaseDO { //验收人id @ApiModelProperty(value = "验收人id") private Long acceptUserId; + //验收人部门id + @ApiModelProperty(value = "验收人部门名称") + @TableField(exist = false) + private String acceptDepartmentName; + //验收人id + @ApiModelProperty(value = "验收人名称") + @TableField(exist = false) + private String acceptUserName; //验收时间 @ApiModelProperty(value = "验收时间") private LocalDateTime acceptTime; 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 e2247fb..947a4de 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 @@ -70,12 +70,21 @@ public class HiddenDO extends BaseDO { private Long rectificationCorpId; + @ApiModelProperty(value = "整改人部门id", name = "rectificationDepartmentId") private Long rectificationDepartmentId; @ApiModelProperty(value = "整改人id", name = "rectificationUserId") private Long rectificationUserId; + @ApiModelProperty(value = "整改人企业名称", name = "rectificationCorpName") + @TableField(exist = false) + private String rectificationCorpName; + + @ApiModelProperty(value = "整改时间", name = "rectificationTime") + @TableField(exist = false) + private String rectificationTime; // 整改时间 + @ApiModelProperty(value = "验收人企业id", name = "racceptCorpId") private Long acceptCorpId; @@ -101,6 +110,7 @@ public class HiddenDO extends BaseDO { @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/HiddenFindUserDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java index bb591a1..5827171 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenFindUserDO.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; @@ -41,6 +42,15 @@ public class HiddenFindUserDO extends BaseDO { //发现人id @ApiModelProperty(value = "发现人id") private Long findUserId; + @ApiModelProperty(value = "发现人企业名称") + @TableField(exist = false) + private String findCorpName; + @ApiModelProperty(value = "发现人部门名称") + @TableField(exist = false) + private String findDepartmentName; + @ApiModelProperty(value = "发现人名称") + @TableField(exist = false) + private String findUserName; public HiddenFindUserDO(String hiddenFindUserId) { this.hiddenFindUserId = hiddenFindUserId; 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 08c18f7..0d16fcc 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 @@ -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; @@ -38,6 +39,14 @@ public class HiddenRectificationRecordDO extends BaseDO { //整改人id @ApiModelProperty(value = "整改人id") private Long rectificationUserId; + //整改人部门名称 + @ApiModelProperty(value = "整改人部门名称") + @TableField(exist = false) + private String rectificationDepartmentName; + //整改人名称 + @ApiModelProperty(value = "整改人名称") + @TableField(exist = false) + private String rectificationUserName; //整改时间 @ApiModelProperty(value = "整改时间") private LocalDateTime rectificationTime; 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 be0899c..a93fa72 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 @@ -44,7 +44,7 @@ public class SafetyEnvironmentalInspectionUserDO extends BaseDO { //检查人名称 @ApiModelProperty(value = "检查人名称") @TableField(exist = false) - private String userName; + private String name; //检查人人员id @ApiModelProperty(value = "检查人人员id") private Long userId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenAcceptRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenAcceptRecordMapper.java index 69c26d3..22a6f5d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenAcceptRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenAcceptRecordMapper.java @@ -3,6 +3,10 @@ package com.zcloud.key.project.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * web-infrastructure @@ -12,6 +16,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface HiddenAcceptRecordMapper extends BaseMapper { - + List listAll(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenFindUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenFindUserMapper.java index dab559f..2063abf 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenFindUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenFindUserMapper.java @@ -3,6 +3,10 @@ package com.zcloud.key.project.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * web-infrastructure @@ -12,6 +16,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface HiddenFindUserMapper extends BaseMapper { + List listByUserIds(@Param("params") Map params); + + List listAll(@Param("params") Map params); } 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 8fb6911..aef67df 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 @@ -7,6 +7,7 @@ import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmen import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -21,5 +22,6 @@ public interface HiddenMapper extends BaseMapper { HiddenDO getInfoById(Long id); + List listAllByForeignId(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenRectificationRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenRectificationRecordMapper.java index 50cf53f..2421fda 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenRectificationRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenRectificationRecordMapper.java @@ -3,6 +3,10 @@ package com.zcloud.key.project.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * web-infrastructure @@ -12,6 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface HiddenRectificationRecordMapper extends BaseMapper { + List listAll(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.java index 1d799de..03a819d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.persistence.mapper.inspection; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDefendDO; +import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionDefendRepository; import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SafetyEnvironmentalInspectionDefendMapper extends BaseMapper { - + SafetyEnvironmentalInspectionDefendDO findByInspectionId(String inspectionId); } + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenAcceptRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenAcceptRecordRepository.java index f7e9e79..15e4814 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenAcceptRecordRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenAcceptRecordRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO; +import java.util.List; import java.util.Map; /** @@ -14,5 +15,7 @@ import java.util.Map; */ public interface HiddenAcceptRecordRepository extends BaseRepository { PageResponse listPage(Map params); + + List listAll(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java index 4cb7a00..a0f6324 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java @@ -19,5 +19,8 @@ public interface HiddenFindUserRepository extends BaseRepository list); void batchDelete(Map params); + + List listByUserIds(Map params); + List listAll(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRectificationRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRectificationRecordRepository.java index 38a9c29..937c171 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRectificationRecordRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRectificationRecordRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO; +import java.util.List; import java.util.Map; /** @@ -14,5 +15,9 @@ import java.util.Map; */ public interface HiddenRectificationRecordRepository extends BaseRepository { PageResponse listPage(Map params); + + List listAll(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 b43633a..133349c 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 @@ -20,7 +20,7 @@ public interface HiddenRepository extends BaseRepository { List listAll(Map params); - List listAllByInspectionId(String inspectionId); + List listAllByForeignId(String foreignId); void deleteBatch(Map params); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenAcceptRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenAcceptRecordRepositoryImpl.java index 98223b6..672f12c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenAcceptRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenAcceptRecordRepositoryImpl.java @@ -13,6 +13,7 @@ import com.zcloud.key.project.persistence.repository.hidden.HiddenAcceptRecordRe import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -35,5 +36,10 @@ public class HiddenAcceptRecordRepositoryImpl extends BaseRepositoryImpl result = hiddenAcceptRecordMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public List listAll(Map params) { + return hiddenAcceptRecordMapper.listAll(params); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java index 060a244..e2c7ddd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java @@ -51,5 +51,15 @@ public class HiddenFindUserRepositoryImpl extends BaseRepositoryImpl listByUserIds(Map params) { + return hiddenFindUserMapper.listByUserIds(params); + } + + @Override + public List listAll(Map params) { + return hiddenFindUserMapper.listAll(params); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRectificationRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRectificationRecordRepositoryImpl.java index bf3cdd9..0ff61e8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRectificationRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRectificationRecordRepositoryImpl.java @@ -13,6 +13,7 @@ import com.zcloud.key.project.persistence.repository.hidden.HiddenRectificationR import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -35,5 +36,10 @@ public class HiddenRectificationRecordRepositoryImpl extends BaseRepositoryImpl< IPage result = hiddenRectificationRecordMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public List listAll(Map params) { + return hiddenRectificationRecordMapper.listAll(params); + } } 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 e8a3ff9..419d2a5 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 @@ -53,10 +53,10 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl listAllByInspectionId(String inspectionId) { + public List listAllByForeignId(String foreignId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("foreign_key",inspectionId); + queryWrapper.eq("foreign_key",foreignId); queryWrapper.eq("delete_enum", "FALSE"); queryWrapper.orderByDesc("create_time"); return hiddenMapper.selectList(queryWrapper); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java index da117b9..7b94c15 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionDefendRepositoryImpl.java @@ -47,5 +47,10 @@ public class SafetyEnvironmentalInspectionDefendRepositoryImpl extends BaseRepos updateWrapper.set("check_sign_time", safetyEnvironmentalInspectionDefendDO.getCheckSignTime()); safetyEnvironmentalInspectionDefendMapper.update(null, updateWrapper); } + + @Override + public SafetyEnvironmentalInspectionDefendDO findByInspectionId(String inspectionId) { + return safetyEnvironmentalInspectionDefendMapper.findByInspectionId(inspectionId); + } } 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 938d011..dcc3ec0 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 @@ -60,11 +60,9 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit @Override public List listAllByInspectionId(String inspectionId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("inspection_id", inspectionId); - queryWrapper.eq("delete_enum", "FALSE"); - queryWrapper.orderByDesc("create_time"); - return safetyEnvironmentalInspectionUserMapper.selectList(queryWrapper); + Map params = new HashMap(); + params.put("inspectionId", inspectionId); + return safetyEnvironmentalInspectionUserMapper.selectListByInspectionId(params); } @Override diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java index e10a69b..e073417 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java @@ -16,5 +16,7 @@ public interface SafetyEnvironmentalInspectionDefendRepository extends BaseRepos PageResponse listPage(Map params); void updateByInspectionId(SafetyEnvironmentalInspectionDefendDO safetyEnvironmentalInspectionDefendDO); + + SafetyEnvironmentalInspectionDefendDO findByInspectionId(String inspectionId); } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml index 216fa6f..f28ff19 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml @@ -3,5 +3,24 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml index 591eff2..94cfba2 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml @@ -3,5 +3,41 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index 34eda59..e696e61 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -9,7 +9,8 @@ h.*, ru.name as rectification_user_name, GROUP_CONCAT(DISTINCT hfu.name) hidden_find_user_name, - kp.project_name + kp.project_name, + MAX(hrr.rectification_time) as rectification_time from hidden h left join user ru on h.rectification_user_id = ru.id @@ -17,6 +18,7 @@ left join user hfu on hfu.id = hf.find_user_id 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 hidden_rectification_record hrr on hrr.hidden_id = h.hidden_id and hrr.delete_enum = 'FALSE' and h.hidden_desc LIKE CONCAT('%', #{params.hiddenDesc}, '%') @@ -55,47 +57,36 @@ + + diff --git a/web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml index 7140e15..50553df 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml @@ -3,5 +3,23 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.xml index 5629bb2..f3ff935 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.xml @@ -3,6 +3,17 @@ "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 350bd2a..bbb3093 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml @@ -48,6 +48,9 @@ and i.time_start <= #{params.timeEnd} + + and YEAR(STR_TO_DATE(i.create_time, '%Y-%m-%d %H:%i:%s')) = #{params.year} + and indc.corp_name LIKE CONCAT('%', #{params.inspectedCorpinfoName}, '%') diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml index 713383c..77327e7 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml @@ -8,7 +8,7 @@ iu.*, ci.corp_name, d.name department_name, - u.name user_name + u.name from safety_environmental_inspection_user iu left join corp_info ci on ci.id = iu.corp_id left join department d on d.id = iu.department_id