feat(): 添加安全环保检查和隐患模块申辩功能

docs/重点作业处罚.sql

@@ -80,3 +80,6 @@ CREATE TABLE hidden_penalty_feedback (
     env varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '环境',
     PRIMARY KEY (`id`) USING BTREE, KEY idx_hidden_penalty_id (hidden_penalty_id) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='处罚反馈';
+
+ALTER TABLE safety_environmental_inspection_defend
+    ADD COLUMN file_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '申辩附件名称' AFTER file_url;

web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java

@@ -49,6 +49,7 @@ public class SafetyEnvironmentalInspectionDefendAddExe {
     public boolean execute(SafetyEnvironmentalInspectionDefendAddCmd cmd) {
         SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE = new SafetyEnvironmentalInspectionDefendE();
         BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionDefendE);
+        safetyEnvironmentalInspectionDefendE.setFileName(resolveFileName(cmd));
         boolean res = false;
         try {
             res = safetyEnvironmentalInspectionDefendGateway.add(safetyEnvironmentalInspectionDefendE);
@@ -66,6 +67,7 @@ public class SafetyEnvironmentalInspectionDefendAddExe {
         SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE = new SafetyEnvironmentalInspectionDefendE();
         BeanUtils.copyProperties(cmd, safetyEnvironmentalInspectionDefendE);
         safetyEnvironmentalInspectionDefendE.init();
+        safetyEnvironmentalInspectionDefendE.setFileName(resolveFileName(cmd));
         SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(cmd.getInspectionId());
         if (inspectionDO == null) {
             throw new BizException("检查任务不存在");
@@ -153,5 +155,21 @@ public class SafetyEnvironmentalInspectionDefendAddExe {
         }
         messageNoticeExe.sendMessageCompleteEvent(affirmList.get(0).getId());
     }
+
+    private String resolveFileName(SafetyEnvironmentalInspectionDefendAddCmd cmd) {
+        if (cmd == null) {
+            return null;
+        }
+        if (!ObjectUtils.isEmpty(cmd.getFileName())) {
+            return cmd.getFileName();
+        }
+        if (!ObjectUtils.isEmpty(cmd.getFiles()) && !cmd.getFiles().isEmpty()) {
+            SafetyEnvironmentalInspectionDefendAddCmd.UploadFileItem fileItem = cmd.getFiles().get(0);
+            if (fileItem != null && !ObjectUtils.isEmpty(fileItem.getName())) {
+                return fileItem.getName();
+            }
+        }
+        return null;
+    }
 }
 

web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendUpdateExe.java

@@ -3,12 +3,13 @@ package com.zcloud.key.project.command.inspection;
 import com.alibaba.cola.exception.BizException;
 import com.zcloud.key.project.domain.gateway.inspection.SafetyEnvironmentalInspectionDefendGateway;
 import com.zcloud.key.project.domain.model.inspection.SafetyEnvironmentalInspectionDefendE;
+import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionDefendAddCmd;
 import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionDefendUpdateCmd;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-
+import org.springframework.util.ObjectUtils;
 
 /**
  * web-app
@@ -25,10 +26,26 @@ public class SafetyEnvironmentalInspectionDefendUpdateExe {
     public void execute(SafetyEnvironmentalInspectionDefendUpdateCmd safetyEnvironmentalInspectionDefendUpdateCmd) {
         SafetyEnvironmentalInspectionDefendE safetyEnvironmentalInspectionDefendE = new SafetyEnvironmentalInspectionDefendE();
         BeanUtils.copyProperties(safetyEnvironmentalInspectionDefendUpdateCmd, safetyEnvironmentalInspectionDefendE);
+        safetyEnvironmentalInspectionDefendE.setFileName(resolveFileName(safetyEnvironmentalInspectionDefendUpdateCmd));
         boolean res = safetyEnvironmentalInspectionDefendGateway.update(safetyEnvironmentalInspectionDefendE);
         if (!res) {
             throw new BizException("修改失败");
         }
     }
-}
 
+    private String resolveFileName(SafetyEnvironmentalInspectionDefendUpdateCmd cmd) {
+        if (cmd == null) {
+            return null;
+        }
+        if (!ObjectUtils.isEmpty(cmd.getFileName())) {
+            return cmd.getFileName();
+        }
+        if (!ObjectUtils.isEmpty(cmd.getFiles()) && !cmd.getFiles().isEmpty()) {
+            SafetyEnvironmentalInspectionDefendAddCmd.UploadFileItem fileItem = cmd.getFiles().get(0);
+            if (fileItem != null && !ObjectUtils.isEmpty(fileItem.getName())) {
+                return fileItem.getName();
+            }
+        }
+        return null;
+    }
+}

web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java

@@ -6,6 +6,7 @@ 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.hidden.HiddenPenaltyCoConvertor;
+import com.zcloud.key.project.command.query.inspection.SafetyEnvironmentalInspectionDefendQueryExe;
 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.HiddenPenaltyCO;
@@ -49,6 +50,7 @@ public class HiddenQueryExe {
     private final HiddenFindUserCoConvertor hiddenFindUserCoConvertor;
     private final HiddenPenaltyRepository hiddenPenaltyRepository;
     private final HiddenPenaltyCoConvertor hiddenPenaltyCoConvertor;
+    private final SafetyEnvironmentalInspectionDefendQueryExe safetyEnvironmentalInspectionDefendQueryExe;
 
     private final HiddenCoConvertor hiddenCoConvertor;
 
@@ -114,6 +116,9 @@ public class HiddenQueryExe {
                 hiddenCO.setHiddenPenaltyFeedbackCO(feedbackCO);
             }
         }
+        if (hiddenDO.getSource() != null && (hiddenDO.getSource() == 2 || hiddenDO.getSource() == 3)) {
+            hiddenCO.setDefendInfo(safetyEnvironmentalInspectionDefendQueryExe.getInfoByInspectionBizId(hiddenDO.getForeignKey()));
+        }
         return SingleResponse.of(hiddenCO);
     }
 }

web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionDefendQueryExe.java

@@ -3,19 +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.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.dataobject.inspection.SafetyEnvironmentalInspectionUserDO;
 import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionDefendRepository;
 import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository;
+import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * web-app
@@ -28,40 +31,100 @@ import java.util.Map;
 public class SafetyEnvironmentalInspectionDefendQueryExe {
     private final SafetyEnvironmentalInspectionDefendRepository safetyEnvironmentalInspectionDefendRepository;
     private final SafetyEnvironmentalInspectionRepository safetyEnvironmentalInspectionRepository;
+    private final SafetyEnvironmentalInspectionUserRepository safetyEnvironmentalInspectionUserRepository;
     private final SafetyEnvironmentalInspectionDefendCoConvertor safetyEnvironmentalInspectionDefendCoConvertor;
 
-    /**
-     * 根据id查询
-     *
-     * @param id
-     * @return
-     */
     public SafetyEnvironmentalInspectionDefendCO queryById(Long id) {
-        return safetyEnvironmentalInspectionDefendCoConvertor.converDOToCO(safetyEnvironmentalInspectionDefendRepository.getById(id));
+        return buildDefendInfo(safetyEnvironmentalInspectionDefendRepository.getById(id));
     }
 
-    /**
-     * 根据id查询
-     *
-     * @param id
-     * @return
-     */
     public SafetyEnvironmentalInspectionDefendCO getInfoByInspectionId(Long id) {
         SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getById(id);
-        return safetyEnvironmentalInspectionDefendCoConvertor.converDOToCO(safetyEnvironmentalInspectionDefendRepository.findByInspectionId(inspectionDO.getInspectionId()));
+        if (inspectionDO == null) {
+            return null;
+        }
+        return getInfoByInspectionBizId(inspectionDO.getInspectionId());
+    }
+
+    public SafetyEnvironmentalInspectionDefendCO getInfoByInspectionBizId(String inspectionId) {
+        if (inspectionId == null || inspectionId.isEmpty()) {
+            return null;
+        }
+        return buildDefendInfo(safetyEnvironmentalInspectionDefendRepository.findByInspectionId(inspectionId));
     }
 
-    /**
-     * 分页
-     *
-     * @param safetyEnvironmentalInspectionDefendPageQry
-     * @return
-     */
     public PageResponse<SafetyEnvironmentalInspectionDefendCO> execute(SafetyEnvironmentalInspectionDefendPageQry safetyEnvironmentalInspectionDefendPageQry) {
         Map<String, Object> params = PageQueryHelper.toHashMap(safetyEnvironmentalInspectionDefendPageQry);
         PageResponse<SafetyEnvironmentalInspectionDefendDO> pageResponse = safetyEnvironmentalInspectionDefendRepository.listPage(params);
-        List<SafetyEnvironmentalInspectionDefendCO> examCenterCOS = safetyEnvironmentalInspectionDefendCoConvertor.converDOsToCOs(pageResponse.getData());
+        List<SafetyEnvironmentalInspectionDefendCO> defendCOList = pageResponse.getData().stream()
-        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
+                .map(this::buildDefendInfo)
+                .collect(Collectors.toList());
+        return PageResponse.of(defendCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
+    }
+
+    private SafetyEnvironmentalInspectionDefendCO buildDefendInfo(SafetyEnvironmentalInspectionDefendDO defendDO) {
+        if (defendDO == null) {
+            return null;
+        }
+        SafetyEnvironmentalInspectionDefendCO defendCO = safetyEnvironmentalInspectionDefendCoConvertor.converDOToCO(defendDO);
+        defendCO.setFileName(resolveStoredFileName(defendDO));
+
+        SafetyEnvironmentalInspectionUserDO checkUser = resolveCheckUser(defendDO.getInspectionId());
+        if (checkUser != null) {
+            defendCO.setCheckUserId(checkUser.getUserId());
+            defendCO.setCheckUserName(checkUser.getName());
+            defendCO.setCheckUserDepartmentName(checkUser.getDepartmentName());
+            defendCO.setCheckUserCorpName(checkUser.getCorpName());
+            defendCO.setCheckUserRemarks(checkUser.getUserRemarks());
+            if (defendCO.getCheckSignTime() == null) {
+                defendCO.setCheckSignTime(checkUser.getSignatureTime());
+            }
+            if ((defendCO.getCheckSign() == null || defendCO.getCheckSign().isEmpty())
+                    && checkUser.getSignature() != null && !checkUser.getSignature().isEmpty()) {
+                defendCO.setCheckSign(checkUser.getSignature());
+            }
+        }
+        return defendCO;
+    }
+
+    private SafetyEnvironmentalInspectionUserDO resolveCheckUser(String inspectionId) {
+        List<SafetyEnvironmentalInspectionUserDO> userDOList =
+                safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(inspectionId);
+        if (userDOList == null || userDOList.isEmpty()) {
+            return null;
+        }
+        return userDOList.stream()
+                .filter(Objects::nonNull)
+                .filter(userDO -> Integer.valueOf(4).equals(userDO.getType()) || Integer.valueOf(5).equals(userDO.getType()))
+                .sorted(Comparator
+                        .comparing((SafetyEnvironmentalInspectionUserDO userDO) -> Integer.valueOf(4).equals(userDO.getType()) ? 0 : 1)
+                        .thenComparing(userDO -> userDO.getSignatureTime() == null ? 1 : 0)
+                        .thenComparing(SafetyEnvironmentalInspectionUserDO::getSignatureTime,
+                                Comparator.nullsLast(Comparator.reverseOrder()))
+                        .thenComparing(SafetyEnvironmentalInspectionUserDO::getCreateTime,
+                                Comparator.nullsLast(Comparator.reverseOrder())))
+                .findFirst()
+                .orElse(null);
+    }
+
+    private String resolveStoredFileName(SafetyEnvironmentalInspectionDefendDO defendDO) {
+        if (defendDO.getFileName() != null && !defendDO.getFileName().isEmpty()) {
+            return defendDO.getFileName();
+        }
+        if (defendDO.getRemarks() != null && !defendDO.getRemarks().isEmpty()) {
+            return defendDO.getRemarks();
+        }
+        return resolveFileName(defendDO.getFileUrl());
+    }
+
+    private String resolveFileName(String fileUrl) {
+        if (fileUrl == null || fileUrl.isEmpty()) {
+            return null;
+        }
+        int index = fileUrl.lastIndexOf('/');
+        if (index < 0 || index == fileUrl.length() - 1) {
+            return fileUrl;
+        }
+        return fileUrl.substring(index + 1);
     }
 }
-

web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionQueryExe.java

@@ -60,6 +60,7 @@ public class SafetyEnvironmentalInspectionQueryExe {
     private final SafetyEnvironmentalInspectionContentCoConvertor safetyEnvironmentalInspectionContentCoConvertor;
     private final HiddenCoConvertor hiddenCoConvertor;
     private final HiddenFindUserCoConvertor hiddenFindUserCoConvertor;
+    private final SafetyEnvironmentalInspectionDefendQueryExe safetyEnvironmentalInspectionDefendQueryExe;
     /**
      * 根据id查询
      *
@@ -104,6 +105,7 @@ public class SafetyEnvironmentalInspectionQueryExe {
         inspectionCO.setInspectionUserList(verifyUserCOs);
         inspectionCO.setAffirmUserList(affirmUserCOs);
         inspectionCO.setInspectionContentList(inspectionContentCOS);
+        inspectionCO.setDefendInfo(safetyEnvironmentalInspectionDefendQueryExe.getInfoByInspectionBizId(inspectionDO.getInspectionId()));
 
         if (hiddenDOs != null && hiddenDOs.size() > 0){
             Map<String, Object> params = new HashMap<String, Object>();

web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java

@@ -3,6 +3,7 @@ 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 com.zcloud.key.project.dto.clientobject.inspection.SafetyEnvironmentalInspectionDefendCO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -131,6 +132,8 @@ public class HiddenCO extends ClientObject {
 
     @ApiModelProperty(value = "处罚反馈信息")
     private HiddenPenaltyFeedbackCO hiddenPenaltyFeedbackCO;
+    @ApiModelProperty(value = "申辩信息")
+    private SafetyEnvironmentalInspectionDefendCO defendInfo;
     //乐观锁
     @ApiModelProperty(value = "乐观锁")
     private Integer version;

web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionCO.java

@@ -101,6 +101,8 @@ public class SafetyEnvironmentalInspectionCO extends ClientObject {
     private List<SafetyEnvironmentalInspectionContentCO> inspectionContentList;
     @ApiModelProperty(value = "发现隐患", name = "hiddenList", required = true)
     private List<HiddenCO> hiddenList;
+    @ApiModelProperty(value = "申辩信息")
+    private SafetyEnvironmentalInspectionDefendCO defendInfo;
 
 
 

web-client/src/main/java/com/zcloud/key/project/dto/clientobject/inspection/SafetyEnvironmentalInspectionDefendCO.java

@@ -32,6 +32,8 @@ public class SafetyEnvironmentalInspectionDefendCO extends ClientObject {
     //申辩附件
     @ApiModelProperty(value = "申辩附件")
     private String fileUrl;
+    @ApiModelProperty(value = "申辩附件名称")
+    private String fileName;
     //申辩人签字
     @ApiModelProperty(value = "申辩人签字")
     private String defendantSign;
@@ -44,17 +46,27 @@ public class SafetyEnvironmentalInspectionDefendCO extends ClientObject {
     //检查人签字
     @ApiModelProperty(value = "检查人签字")
     private String checkSign;
+    @ApiModelProperty(value = "检查人ID")
+    private Long checkUserId;
+    @ApiModelProperty(value = "检查人名称")
+    private String checkUserName;
+    @ApiModelProperty(value = "检查人部门名称")
+    private String checkUserDepartmentName;
+    @ApiModelProperty(value = "检查人企业名称")
+    private String checkUserCorpName;
+    @ApiModelProperty(value = "检查人意见")
+    private String checkUserRemarks;
     //检查人签字时间
     @ApiModelProperty(value = "检查人签字时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime checkSignTime;
     //创建时间（申辩时间）
     @ApiModelProperty(value = "创建时间（申辩时间）")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
     //更新时间
     @ApiModelProperty(value = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
     //创建人ID
     @ApiModelProperty(value = "创建人ID")

web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionDefendAddCmd.java

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * web-client
@@ -35,6 +36,10 @@ public class SafetyEnvironmentalInspectionDefendAddCmd extends Command {
 
     @ApiModelProperty(value = "申辩附件", name = "fileUrl", required = true)
     private String fileUrl;
+    @ApiModelProperty(value = "申辩附件名称", name = "fileName")
+    private String fileName;
+    @ApiModelProperty(value = "上传文件列表", name = "files")
+    private List<UploadFileItem> files;
 
     @ApiModelProperty(value = "申辩人签字", name = "defendantSign", required = true)
     private String defendantSign;
@@ -55,5 +60,13 @@ public class SafetyEnvironmentalInspectionDefendAddCmd extends Command {
     @ApiModelProperty(value = "检查人签字时间", name = "checkSignTime", required = true)
     private LocalDateTime checkSignTime;
 
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class UploadFileItem {
+        @ApiModelProperty(value = "文件名称", name = "name")
+        private String name;
+    }
+
 }
 

web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionDefendUpdateCmd.java

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * web-client
@@ -38,6 +39,10 @@ public class SafetyEnvironmentalInspectionDefendUpdateCmd extends Command {
     @ApiModelProperty(value = "申辩附件", name = "fileUrl", required = true)
     @NotEmpty(message = "申辩附件不能为空")
     private String fileUrl;
+    @ApiModelProperty(value = "申辩附件名称", name = "fileName")
+    private String fileName;
+    @ApiModelProperty(value = "上传文件列表", name = "files")
+    private List<SafetyEnvironmentalInspectionDefendAddCmd.UploadFileItem> files;
     @ApiModelProperty(value = "申辩人签字", name = "defendantSign", required = true)
     @NotEmpty(message = "申辩人签字不能为空")
     private String defendantSign;

web-domain/src/main/java/com/zcloud/key/project/domain/model/inspection/SafetyEnvironmentalInspectionDefendE.java

@@ -22,6 +22,7 @@ public class SafetyEnvironmentalInspectionDefendE extends BaseE {
     private String content;
     //申辩附件
     private String fileUrl;
+    private String fileName;
     //申辩人签字
     private String defendantSign;
     //是否通过0：未审批、1：通过、2：未通过

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/inspection/SafetyEnvironmentalInspectionDefendDO.java

@@ -32,6 +32,8 @@ public class SafetyEnvironmentalInspectionDefendDO extends BaseDO {
     //申辩附件
     @ApiModelProperty(value = "申辩附件")
     private String fileUrl;
+    @ApiModelProperty(value = "申辩附件名称")
+    private String fileName;
     //申辩人签字
     @ApiModelProperty(value = "申辩人签字")
     private String defendantSign;