添加安全环保检查申辩详情查询和流程图功能

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

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<SafetyEnvironmentalInspectionDefendCO> getInfoByInspectionId(@PathVariable("id") Long id) {
+        return SingleResponse.of(safetyEnvironmentalInspectionDefendService.getInfoByInspectionId(id));
+    }
+
     @ApiOperation("删除")
     @DeleteMapping("/{id}")
     public Response remove(@PathVariable("id") Long id) {

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<SafetyEnvironmentalInspectionFlowCO> getFlowChartByInspectionId(@PathVariable("inspectionId") String inspectionId) {
+        return MultiResponse.of(safetyEnvironmentalInspectionUserService.getFlowChartByInspectionId(inspectionId));
+    }
     @ApiOperation("新增")
     @PostMapping("/save")
     public SingleResponse<SafetyEnvironmentalInspectionUserCO> add(@Validated @RequestBody SafetyEnvironmentalInspectionUserAddCmd cmd) {

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.*;
-import java.util.List;
+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<Long> findUserIds = hiddenAddCmdList.stream()
+                        .map(HiddenAddCmd::getHiddenFindUserList)
+                        .filter(Objects::nonNull)
+                        .flatMap(List::stream)
+                        .distinct()
+                        .collect(Collectors.toList());
+                Map<Long, HiddenFindUserDO> userMap;
+                if (findUserIds != null && findUserIds.size() > 0){
+                    Map<String, Object> params = new HashMap<>();
+                    params.put("userIds", findUserIds);
+                    List<HiddenFindUserDO> hiddenFindUserDOList = hiddenFindUserRepository.listByUserIds(params);
+                    userMap = hiddenFindUserDOList.stream().collect(Collectors.toMap(HiddenFindUserDO::getFindUserId, v -> v));
+
+                } else {
+                    userMap = new HashMap<>();
+                }
+                // 初始化隐患发现人数据
+
+
                 // 初始化隐患数据
                 List<HiddenFindUserE> hiddenFindUserList = new ArrayList<HiddenFindUserE>();
                 hiddenAddCmdList.stream().forEach(
@@ -114,8 +133,8 @@ public class SafetyEnvironmentalInspectionAddExe {
                             }
                             hiddenAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId());
                             hiddenAddCmd.setState(1);
-                            hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId());
+//                            hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId());
-                            hiddenAddCmd.setRectificationDepartmentId(safetyEnvironmentalInspectionE.getXgfMasterDepartmentId());
+//                            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());
+                                            hiddenFindUserE.init(hiddenAddCmd.getHiddenId(),
-                                            hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId());
+                                                    safetyEnvironmentalInspectionE.getInspectionId(),
-                                            hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId());
+                                                    findUserId,
-                                            BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE);
+                                                    userMap.get(findUserId).getFindDepartmentId(),
+                                                    userMap.get(findUserId).getFindCorpId());
                                             hiddenFindUserList.add(hiddenFindUserE);
                                         }
                                 );

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.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -127,6 +124,25 @@ public class SafetyEnvironmentalInspectionUpdateExe {
             hiddenFindUserRepository.batchDelete(params);
             // 新增隐患数据
             if (hiddenAddCmdList != null && hiddenAddCmdList.size() > 0){
+
+
+                List<Long> findUserIds = hiddenAddCmdList.stream()
+                        .map(HiddenAddCmd::getHiddenFindUserList)
+                        .filter(Objects::nonNull)
+                        .flatMap(List::stream)
+                        .distinct()
+                        .collect(Collectors.toList());
+                Map<Long, HiddenFindUserDO> userMap;
+                if (findUserIds != null && findUserIds.size() > 0){
+                    Map<String, Object> userParams = new HashMap<>();
+                    userParams.put("userIds", findUserIds);
+                    List<HiddenFindUserDO> hiddenFindUserDOList = hiddenFindUserRepository.listByUserIds(userParams);
+                    userMap = hiddenFindUserDOList.stream().collect(Collectors.toMap(HiddenFindUserDO::getFindUserId, v -> v));
+
+                } else {
+                    userMap = new HashMap<>();
+                }
+
                 // 初始化隐患数据
                 List<HiddenFindUserE> hiddenFindUserList = new ArrayList<HiddenFindUserE>();
                 hiddenAddCmdList.stream().forEach(
@@ -136,20 +152,22 @@ public class SafetyEnvironmentalInspectionUpdateExe {
                             }
                             hiddenAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId());
                             hiddenAddCmd.setState(1);
-                            hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId());
+//                            hiddenAddCmd.setRectificationCorpId(safetyEnvironmentalInspectionE.getXgfMasterCorpId());
-                            hiddenAddCmd.setRectificationDepartmentId(safetyEnvironmentalInspectionE.getXgfMasterDepartmentId());
+//                            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());
+                                            hiddenFindUserE.init(hiddenAddCmd.getHiddenId(),
-                                            hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId());
+                                                    safetyEnvironmentalInspectionE.getInspectionId(),
-                                            hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId());
+                                                    findUserId,
-                                            BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE);
+                                                    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<Long> findUserIds = hiddenAddCmdList.stream()
+                        .map(HiddenAddCmd::getHiddenFindUserList)
+                        .filter(Objects::nonNull)
+                        .flatMap(List::stream)
+                        .distinct()
+                        .collect(Collectors.toList());
+                Map<Long, HiddenFindUserDO> userMap;
+                if (findUserIds != null && findUserIds.size() > 0){
+                    Map<String, Object> userParams = new HashMap<>();
+                    userParams.put("userIds", findUserIds);
+                    List<HiddenFindUserDO> hiddenFindUserDOList = hiddenFindUserRepository.listByUserIds(userParams);
+                    userMap = hiddenFindUserDOList.stream().collect(Collectors.toMap(HiddenFindUserDO::getFindUserId, v -> v));
+
+                } else {
+                    userMap = new HashMap<>();
+                }
+
+
                 // 初始化隐患数据
                 List<HiddenFindUserE> hiddenFindUserList = new ArrayList<HiddenFindUserE>();
                 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());
+                                            hiddenFindUserE.init(hiddenAddCmd.getHiddenId(),
-                                            hiddenFindUserAddCmd.setHiddenId(hiddenAddCmd.getHiddenId());
+                                                    safetyEnvironmentalInspectionE.getInspectionId(),
-                                            hiddenFindUserAddCmd.setForeignKey(safetyEnvironmentalInspectionE.getInspectionId());
+                                                    findUserId,
-                                            BeanUtils.copyProperties(hiddenFindUserAddCmd, hiddenFindUserE);
+                                                    userMap.get(findUserId).getFindDepartmentId(),
+                                                    userMap.get(findUserId).getFindCorpId());
                                             hiddenFindUserList.add(hiddenFindUserE);
                                         }
                                 );

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<HiddenCO> getInfoByIdExecute(Long id) {
         HiddenDO hiddenDO = hiddenRepository.getInfoById(id);
-        return null;
+        HiddenCO hiddenCO = new HiddenCO();
+        BeanUtils.copyProperties(hiddenDO, hiddenCO);
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("hiddenId", hiddenDO.getHiddenId());
+
+        List<HiddenFindUserDO> 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<HiddenRectificationRecordDO> hiddenRectificationRecordDOs = hiddenRectificationRecordRepository.listAll(params);
+        List<HiddenAcceptRecordDO> 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);
     }
 }
 

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()));
+    }
+
     /**
      * 分页
      *

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<SafetyEnvironmentalInspectionUserDO> inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId(), type);
+        // 操作流程
+        List<SafetyEnvironmentalInspectionUserDO> inspectionUserDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionDO.getInspectionId());
+        // 核实人列表
+        List<SafetyEnvironmentalInspectionUserDO> verifyUserDOs = new ArrayList<>();
+        // 确认人列表
+        List<SafetyEnvironmentalInspectionUserDO> affirmUserDOs = new ArrayList<>();
+        for (SafetyEnvironmentalInspectionUserDO inspectionUserDO : inspectionUserDOs) {
+            if (verifyType.equals(inspectionUserDO.getType())){
+                verifyUserDOs.add(inspectionUserDO);
+            }
+            if (affirmType.equals(inspectionUserDO.getType())){
+                affirmUserDOs.add(inspectionUserDO);
+            }
+        }
+
+        // 检查内容
         List<SafetyEnvironmentalInspectionContentDO> inspectionContentDOs = safetyEnvironmentalInspectionContentRepository.listAllByInspectionId(inspectionDO.getInspectionId());
-        List<HiddenDO> hiddenDOs = hiddenRepository.listAllByInspectionId(inspectionDO.getInspectionId());
+        // 隐患信息
-        List<SafetyEnvironmentalInspectionUserCO> inspectionUserCOS = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(inspectionUserDOs);
+        List<HiddenDO> hiddenDOs = hiddenRepository.listAllByForeignId(inspectionDO.getInspectionId());
+
+
+        List<SafetyEnvironmentalInspectionUserCO> verifyUserCOs = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(verifyUserDOs);
+        List<SafetyEnvironmentalInspectionUserCO> affirmUserCOs = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(affirmUserDOs);
         List<SafetyEnvironmentalInspectionContentCO> inspectionContentCOS = safetyEnvironmentalInspectionContentCoConvertor.converDOsToCOs(inspectionContentDOs);
-        List<HiddenCO> hiddenCOS = hiddenCoConvertor.converDOsToCOs(hiddenDOs);
+
         SafetyEnvironmentalInspectionCO inspectionCO = safetyEnvironmentalInspectionCoConvertor.converDOToCO(inspectionDO);
-        inspectionCO.setInspectionUserList(inspectionUserCOS);
+        inspectionCO.setInspectionUserList(verifyUserCOs);
+        inspectionCO.setAffirmUserList(affirmUserCOs);
         inspectionCO.setInspectionContentList(inspectionContentCOS);
+
+        if (hiddenDOs != null && hiddenDOs.size() > 0){
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("foreignKey", inspectionDO.getInspectionId());
+            List<HiddenFindUserDO> hiddenFindUserDOs = hiddenFindUserRepository.listAll(params);
+            List<HiddenFindUserCO> hiddenFindUserCOs = hiddenFindUserCoConvertor.converDOsToCOs(hiddenFindUserDOs);
+            Map<String, List<HiddenFindUserCO>> hiddenFindUserMap = hiddenFindUserCOs.stream().collect(Collectors.groupingBy(HiddenFindUserCO::getHiddenId));
+
+            List<HiddenCO> hiddenCOS = hiddenCoConvertor.converDOsToCOs(hiddenDOs);
+            hiddenCOS.stream().forEach(hiddenCO -> {
+                hiddenCO.setFindUserList(hiddenFindUserMap.get(hiddenCO.getHiddenId()));
+            });
             inspectionCO.setHiddenList(hiddenCOS);
+        }
         return inspectionCO;
     }
 

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<SafetyEnvironmentalInspectionUserCO> examCenterCOS = safetyEnvironmentalInspectionUserCoConvertor.converDOsToCOs(pageResponse.getData());
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
+
+
+    public List<SafetyEnvironmentalInspectionFlowCO> getFlowChartByInspectionId(String inspectionId) {
+        List<SafetyEnvironmentalInspectionUserDO> userDOs = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionId);
+        Map<Integer, List<SafetyEnvironmentalInspectionUserDO>> typeGroupMap = userDOs.stream().collect(Collectors.groupingBy(SafetyEnvironmentalInspectionUserDO::getType));
+        List<SafetyEnvironmentalInspectionFlowCO> 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<SafetyEnvironmentalInspectionFlowCO> children = new ArrayList<>();
+                    typeGroupMap.get(type).stream().forEach(userDO -> {
+                        SafetyEnvironmentalInspectionFlowCO child = new SafetyEnvironmentalInspectionFlowCO();
+                        child.setType(userDO.getType());
+                        child.setStatus(userDO.getStatus());
+                        List<String> 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<String> initFlowStrList(Integer type,SafetyEnvironmentalInspectionUserDO userDO){
+        List<String> flowStrList = new ArrayList<>();
+        flowStrList.add(FlowTypeEnum.getNameByType(type));
+        flowStrList.add(userDO.getName()+" "+ (!ObjectUtils.isEmpty(userDO.getSignatureTime()) ? userDO.getSignatureTime().toString() : userDO.getCreateTime()));
+        return flowStrList;
+    }
 }
 

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<SafetyEnvironmentalInspectionDefendCO> listPage(SafetyEnvironmentalInspectionDefendPageQry qry) {
 

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<SafetyEnvironmentalInspectionFlowCO> getFlowChartByInspectionId(String inspectionId) {
+        return safetyEnvironmentalInspectionUserQueryExe.getFlowChartByInspectionId(inspectionId);
+    }
 }
 

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<SafetyEnvironmentalInspectionDefendCO> listPage(SafetyEnvironmentalInspectionDefendPageQry qry);
 
     SingleResponse<SafetyEnvironmentalInspectionDefendCO> add(SafetyEnvironmentalInspectionDefendAddCmd cmd);

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<SafetyEnvironmentalInspectionFlowCO> getFlowChartByInspectionId(String inspectionId);
 }
 

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;

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<HiddenFindUserCO> 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;

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;

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<SafetyEnvironmentalInspectionUserCO> inspectionUserList;
+
+    @ApiModelProperty(value = "确认人员", name = "affirmUserList", required = true)
+    private List<SafetyEnvironmentalInspectionUserCO> affirmUserList;
     @ApiModelProperty(value = "检查情况", name = "inspectionContentList", required = true)
     private List<SafetyEnvironmentalInspectionContentCO> inspectionContentList;
     @ApiModelProperty(value = "发现隐患", name = "hiddenList", required = true)

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<String> flowList;
+    private List<SafetyEnvironmentalInspectionFlowCO> children;
+}
+

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;

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<HiddenFindUserAddCmd> hiddenFindUserList;
+    private List<Long> hiddenFindUserList;
+
 
 }
 

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<Integer> statusList;
 
+    private String year;
+
 
 
 }

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<Integer, FlowTypeEnum> 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;
+    }
+
+}

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<HiddenFindUserE> hiddenFindUserList;
+    private List<Long> hiddenFindUserList;
 
     public void initSaveList(List<HiddenE> hiddenList,
                              SafetyEnvironmentalInspectionE inspectionInfo,

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);
+    }
 }
 

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;

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;
     }

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;

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;

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;

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<HiddenAcceptRecordDO> {
-
+    List<HiddenAcceptRecordDO> listAll(@Param("params") Map<String, Object> params);
 }
 

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<HiddenFindUserDO> {
+    List<HiddenFindUserDO> listByUserIds(@Param("params") Map<String, Object> params);
+
+    List<HiddenFindUserDO> listAll(@Param("params") Map<String, Object> params);
 
 }
 

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> {
 
     HiddenDO getInfoById(Long id);
 
+    List<HiddenDO> listAllByForeignId(@Param("params") Map<String, Object> params);
 }
 

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<HiddenRectificationRecordDO> {
+    List<HiddenRectificationRecordDO> listAll(@Param("params") Map<String, Object> params);
 
 }
 

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> {
-
+    SafetyEnvironmentalInspectionDefendDO findByInspectionId(String inspectionId);
 }
 
+

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<HiddenAcceptRecordDO> {
     PageResponse<HiddenAcceptRecordDO> listPage(Map<String, Object> params);
+
+    List<HiddenAcceptRecordDO> listAll(Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenFindUserRepository.java

@@ -19,5 +19,8 @@ public interface HiddenFindUserRepository extends BaseRepository<HiddenFindUserD
     void batchInsert(List<HiddenFindUserDO> list);
 
     void batchDelete(Map<String, Object> params);
+
+    List<HiddenFindUserDO> listByUserIds(Map<String, Object> params);
+    List<HiddenFindUserDO> listAll(Map<String, Object> params);
 }
 

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<HiddenRectificationRecordDO> {
     PageResponse<HiddenRectificationRecordDO> listPage(Map<String, Object> params);
+
+    List<HiddenRectificationRecordDO> listAll(Map<String, Object> params);
+
+
 }
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenRepository.java

@@ -20,7 +20,7 @@ public interface HiddenRepository extends BaseRepository<HiddenDO> {
 
     List<HiddenDO> listAll(Map<String, Object> params);
 
-    List<HiddenDO> listAllByInspectionId(String inspectionId);
+    List<HiddenDO> listAllByForeignId(String foreignId);
 
     void deleteBatch(Map<String, Object> params);
 

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<HiddenA
         IPage<HiddenAcceptRecordDO> result = hiddenAcceptRecordMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
+
+    @Override
+    public List<HiddenAcceptRecordDO> listAll(Map<String, Object> params) {
+        return hiddenAcceptRecordMapper.listAll(params);
+    }
 }
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenFindUserRepositoryImpl.java

@@ -51,5 +51,15 @@ public class HiddenFindUserRepositoryImpl extends BaseRepositoryImpl<HiddenFindU
         updateWrapper.set("delete_enum", "TRUE");
         hiddenFindUserMapper.update(null, updateWrapper);
     }
+
+    @Override
+    public List<HiddenFindUserDO> listByUserIds(Map<String, Object> params) {
+        return hiddenFindUserMapper.listByUserIds(params);
+    }
+
+    @Override
+    public List<HiddenFindUserDO> listAll(Map<String, Object> params) {
+        return hiddenFindUserMapper.listAll(params);
+    }
 }
 

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<HiddenRectificationRecordDO> result = hiddenRectificationRecordMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
+
+    @Override
+    public List<HiddenRectificationRecordDO> listAll(Map<String, Object> params) {
+        return hiddenRectificationRecordMapper.listAll(params);
+    }
 }
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java

@@ -53,10 +53,10 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl<HiddenMapper, Hidde
     }
 
     @Override
-    public List<HiddenDO> listAllByInspectionId(String inspectionId) {
+    public List<HiddenDO> listAllByForeignId(String foreignId) {
 
         QueryWrapper<HiddenDO> 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);

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);
+    }
 }
 

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<SafetyEnvironmentalInspectionUserDO> listAllByInspectionId(String inspectionId) {
-        QueryWrapper<SafetyEnvironmentalInspectionUserDO> queryWrapper = new QueryWrapper<>();
+        Map<String, Object> params = new HashMap<String, Object>();
-        queryWrapper.eq("inspection_id", inspectionId);
+        params.put("inspectionId", inspectionId);
-        queryWrapper.eq("delete_enum", "FALSE");
+        return safetyEnvironmentalInspectionUserMapper.selectListByInspectionId(params);
-        queryWrapper.orderByDesc("create_time");
-        return safetyEnvironmentalInspectionUserMapper.selectList(queryWrapper);
     }
 
     @Override

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionDefendRepository.java

@@ -16,5 +16,7 @@ public interface SafetyEnvironmentalInspectionDefendRepository extends BaseRepos
     PageResponse<SafetyEnvironmentalInspectionDefendDO> listPage(Map<String, Object> params);
 
     void updateByInspectionId(SafetyEnvironmentalInspectionDefendDO safetyEnvironmentalInspectionDefendDO);
+
+    SafetyEnvironmentalInspectionDefendDO findByInspectionId(String inspectionId);
 }
 

web-infrastructure/src/main/resources/mapper/HiddenAcceptRecordMapper.xml

@@ -3,5 +3,24 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zcloud.key.project.persistence.mapper.HiddenAcceptRecordMapper">
+
+    <select id="listAll" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenAcceptRecordDO">
+        select
+            h.*,
+            d.name as accept_department_name,
+            u.name as accept_user_name
+        from
+            hidden_accept_record h
+            left join department d on d.id = h.accept_department_id
+            left join user u on u.id = h.accept_user_id
+        where
+            h.delete_enum = 'FALSE'
+            <if test="params.hiddenId != null and params.hiddenId != ''">
+                and h.hidden_id = #{params.hiddenId}
+            </if>
+        order by
+            h.create_time desc
+        limit 1
+    </select>
 </mapper>
 

web-infrastructure/src/main/resources/mapper/HiddenFindUserMapper.xml

@@ -3,5 +3,41 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zcloud.key.project.persistence.mapper.HiddenFindUserMapper">
+
+    <select id="listByUserIds" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO">
+        select
+        id as findUserId,
+        department_id as findDepartmentId,
+        corpinfo_id as findCorpId
+        from
+        user
+        where
+        id in
+        <foreach item="item" collection="params.userIds" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
+
+    <select id="listAll" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO">
+        select
+            hfu.*,
+            ci.corp_name as findCorpName,
+            d.name as findDepartmentName,
+            u.name as findUserName
+        from
+            hidden_find_user hfu
+            left join corp_info ci on hfu.find_corp_id = ci.id
+            left join department d on hfu.find_department_id = d.id
+            left join user u on hfu.find_user_id = u.id
+        where
+            hfu.delete_enum = 'FALSE'
+            <if test="params.foreignKey != null and params.foreignKey != ''">
+                and hfu.foreign_key = #{params.foreignKey}
+            </if>
+            <if test="params.hiddenId != null and params.hiddenId != ''">
+                and hfu.hidden_id = #{params.hiddenId}
+            </if>
+    </select>
 </mapper>
 

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'
         <where>
             <if test="params.hiddenDesc != null and params.hiddenDesc != ''">
                 and h.hidden_desc LIKE CONCAT('%', #{params.hiddenDesc}, '%')
@@ -55,47 +57,36 @@
     <select id="getInfoById" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO">
         select
         h.*,
-        kp.project_name
+        kp.project_name,
-
+        rci.corp_name as rectification_corp_name,
+        ru.name as rectification_user_name
         from
         hidden h
-        left join user ru on h.rectification_user_id = ru.id
-        left join hidden_find_user hf on hf.hidden_id = h.hidden_id and hf.delete_enum = 'FALSE'
-        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 corp_info rci on rci.id = h.rectification_corp_id
+        left join user ru on ru.id = h.rectification_user_id
         <where>
-            <if test="params.hiddenDesc != null and params.hiddenDesc != ''">
+            h.id = #{id}
-                and h.hidden_desc LIKE CONCAT('%', #{params.hiddenDesc}, '%')
-            </if>
-            <if test="params.source != null and params.source != ''">
-                and h.source = #{params.source}
-            </if>
-
-            <if test="params.startTime != null and params.startTime != ''">
-                and h.create_time >= #{params.startTime}
-            </if>
-            <if test="params.endTime != null and params.endTime != ''">
-                and h.create_time &lt;= #{params.endTime}
-            </if>
-            <if test="params.projectName != null and params.projectName != ''">
-                and kp.project_name LIKE CONCAT('%', #{params.projectName}, '%')
-            </if>
-
-            <if test="params.stateList != null and params.stateList.size() > 0">
-                and h.state in
-                <foreach item="state" collection="params.stateList" separator="," open="(" close=")" index="">
-                    #{state}
-                </foreach>
-            </if>
-
         </where>
-        <if test="params.hiddenFindUserName != null and params.hiddenFindUserName != ''">
-            HAVING hidden_find_user_name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%')
-        </if>
         GROUP BY h.id
         ORDER BY
         h.create_time desc
     </select>
+    <select id="listAllByForeignId" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO">
+        select
+            h.*,
+        from
+            hidden h
+
+        where
+            h.foreign_key = #{foreignId}
+            and h.delete_enum = 'FALSE'
+        order by
+            h.create_time desc
+
+
+    </select>
+
 </mapper>
 

web-infrastructure/src/main/resources/mapper/HiddenRectificationRecordMapper.xml

@@ -3,5 +3,23 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zcloud.key.project.persistence.mapper.HiddenRectificationRecordMapper">
+    <select id="listAll" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenRectificationRecordDO">
+        select
+            h.*,
+            d.name as rectification_department_name,
+            u.name as rectification_user_name
+        from
+            hidden_rectification_record h
+            left join department d on d.id = h.rectification_department_id
+            left join user u on u.id = h.rectification_user_id
+        where
+            h.delete_enum = 'FALSE'
+            <if test="params.hiddenId != null and params.hiddenId != ''">
+                and h.hidden_id = #{params.hiddenId}
+            </if>
+        order by
+            h.create_time desc
+        limit 1
+    </select>
 </mapper>
 

web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionDefendMapper.xml

@@ -3,6 +3,17 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionDefendMapper">
-
+    <select id="findByInspectionId" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDefendDO">
+        select
+            *
+        from
+            safety_environmental_inspection_defend
+        where
+            inspection_id = #{inspectionId}
+            and delete_enum = 'FALSE'
+        order by
+            create_time desc
+        limit 1
+    </select>
 </mapper>
 

web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml

@@ -48,6 +48,9 @@
         <if test="params.timeEnd != null and params.timeEnd != ''">
             and i.time_start &lt;= #{params.timeEnd}
         </if>
+        <if test="params.year != null and params.year != ''">
+            and YEAR(STR_TO_DATE(i.create_time, '%Y-%m-%d %H:%i:%s')) = #{params.year}
+        </if>
 
         <if test="params.inspectedCorpinfoName != null and params.inspectedCorpinfoName != ''">
             and indc.corp_name LIKE CONCAT('%', #{params.inspectedCorpinfoName}, '%')

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