fix(稽查流程): 流程完善

laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java

@@ -12,8 +12,10 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.CommitFlagEnum;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
+import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon;
+import com.jero.modules.activiti.process.esinspectrectify.common.EsInspectRectifyCommon;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.bpmn.model.Process;
@@ -222,7 +224,9 @@ public class ProcessAspect {
             if (!Objects.isNull(processApprovalRecordObject) && !Objects.isNull(processAllObject)){
                 ProcessApprovalRecord processApprovalRecord = JSON.parseObject(JSON.toJSONString(processApprovalRecordObject), ProcessApprovalRecord.class);
                 ProcessAll processAll = JSON.parseObject(JSON.toJSONString(processAllObject), ProcessAll.class);
-                if (StringUtils.isBlank(processAll.getNodeId()) || SAVE_BY_DRAFT.equals(saveSource)){
+                if (StringUtils.isBlank(processAll.getNodeId()) || SAVE_BY_DRAFT.equals(saveSource)
+                        // 企标稽查整改（自动发起流程）特殊节点判断
+                        || (ProcessType.ES_INSPECT_REPORT.getValue().equals(String.valueOf(processAll.getPrcType())) && EsInspectRectifyCommon.PROCESS_NODE_1.equals(processAll.getNodeId()))){
                     ProcessDraft processDraft = new ProcessDraft();
                     setProperty(loginUser, infoJsonStr, processApprovalRecord, processAll, processDraft);
                     // 删除旧草稿

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java

@@ -43,8 +43,8 @@ public class ProcessEsInspect extends BaseEntity {
     /**实际稽查完成日期*/
     @Excel(name = "实际稽查完成日期", width = 15)
     @ApiModelProperty(value = "实际稽查完成日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date completeDate;
     /**实际稽查人*/

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java

@@ -181,9 +181,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
             if (StringUtils.isBlank(processAll.getNodeId())){
                 // 添加新稽查内容
                 List<EnterpriseStandardInspectContent> enterpriseStandardInspectContentList = processEsInspect.getEnterpriseStandardInspectContentList();
-                enterpriseStandardInspectContentList = enterpriseStandardInspectContentList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList());
                 for (EnterpriseStandardInspectContent enterpriseStandardInspectContent : enterpriseStandardInspectContentList) {
-                    enterpriseStandardInspectContent.setId(String.valueOf(SnowflakeUtils.snowflake()));
                     enterpriseStandardInspectContent.setProcessEsInspectId(processEsInspect.getId());
                 }
                 enterpriseStandardInspectContentService.saveOrUpdateBatch(enterpriseStandardInspectContentList);
@@ -197,18 +195,14 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
         if (EsInspectCommon.PROCESS_NODE_3.equals(processAll.getNodeId())){
             // 添加新稽查报告
             List<EnterpriseStandardInspectReport> enterpriseStandardInspectReportList = processEsInspect.getEnterpriseStandardInspectReportList();
-            enterpriseStandardInspectReportList = enterpriseStandardInspectReportList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList());
             for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : enterpriseStandardInspectReportList) {
-                enterpriseStandardInspectReport.setId(String.valueOf(SnowflakeUtils.snowflake()));
                 enterpriseStandardInspectReport.setProcessEsInspectId(processEsInspect.getId());
             }
             enterpriseStandardInspectReportService.saveOrUpdateBatch(enterpriseStandardInspectReportList);
 
             // 添加新整改计划
             List<EnterpriseStandardInspectRectifyPlan> enterpriseStandardInspectRectifyPlanList = processEsInspect.getEnterpriseStandardInspectRectifyPlanList();
-            enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList());
             for (EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan : enterpriseStandardInspectRectifyPlanList) {
-                enterpriseStandardInspectRectifyPlan.setId(String.valueOf(SnowflakeUtils.snowflake()));
                 enterpriseStandardInspectRectifyPlan.setProcessEsInspectId(processEsInspect.getId());
             }
             enterpriseStandardInspectRectifyPlanService.saveOrUpdateBatch(enterpriseStandardInspectRectifyPlanList);
@@ -296,7 +290,8 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
         // 业务表数据
         ProcessEsInspectVO processEsInspectVO = new ProcessEsInspectVO();
         processEsInspectVO.setProjectId(projectId);
-        esInspectFlowVO.setProcessEsInspectVOList(processEsInspectService.queryByList(processEsInspectVO));
+        List<ProcessEsInspectVO> processEsInspectVOList = processEsInspectService.queryByList(processEsInspectVO);
+        esInspectFlowVO.setProcessEsInspectVOList(processEsInspectVOList);
         esInspectFlowVO.setProcessAll(processAll);
         esInspectFlowVO.setProcessApprovalRecord(processApprovalRecord);
         return esInspectFlowVO;

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java

@@ -251,7 +251,7 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
 		queryWrapper.eq(StringUtils.isNotBlank(processEsInspectVO.getId()), "t.id", processEsInspectVO.getId());
 		queryWrapper.eq(StringUtils.isNotBlank(processEsInspectVO.getProjectId()), "t.project_id", processEsInspectVO.getProjectId());
 		queryWrapper.eq("t.del_flag", 0);
-		queryWrapper.orderByDesc("t.create_time");
+		queryWrapper.orderByAsc("t.create_time");
 		return queryWrapper;
 	}
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/ProcessEsInspectDelayApplyServiceImpl.java

@@ -84,7 +84,7 @@ public class ProcessEsInspectDelayApplyServiceImpl extends ServiceImpl<ProcessEs
 		}
 		queryWrapper.eq(StringUtils.isNotBlank(processEsInspectDelayApplyVO.getProjectId()), "t.project_id", processEsInspectDelayApplyVO.getProjectId());
 		queryWrapper.eq("t.del_flag", 0);
-		queryWrapper.orderByDesc("t.create_time");
+		queryWrapper.orderByAsc("t.create_time");
 		return queryWrapper;
 	}
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/ProcessEsInspectDelayApplyVO.java

@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.esinspectdelayapply.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
@@ -42,6 +43,7 @@ public class ProcessEsInspectDelayApplyVO extends EnterpriseStandardInspectVo {
     @Excel(name = "稽查联络人", width = 15)
     @ApiModelProperty(value = "稽查联络人")
     @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String liaisons;
 
     /** 稽查联络人 翻译*/

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java

@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.esinspectplan.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -91,6 +92,7 @@ public class ProcessEsInspectPlan extends BaseEntity {
     private String objectOfConsultationDictText;
 	/**备注*/
     @ApiModelProperty(value = "备注")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remarks;
 
     /**意见*/

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java

@@ -140,7 +140,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 					qw.like("object_of_consultation", loginUser.getId())
 						.or().eq("create_by", loginUser.getUsername()));
 		}
-		queryWrapper.orderByDesc("create_time");
+		queryWrapper.orderByAsc("create_time");
 		return queryWrapper;
 	}
 

laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java

@@ -141,15 +141,17 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 
 		try {
 			// 发送消息
-			SendMessageDTO sendMessageDTO = new SendMessageDTO();
+			if (StringUtils.isNotBlank(lawsDataCenterFile.getPushRangeIds())){
-			sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.DATA_CENTER);
+				SendMessageDTO sendMessageDTO = new SendMessageDTO();
-			sendMessageDTO.setToUserId(lawsDataCenterFile.getPushRangeIds());
+				sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.DATA_CENTER);
-			Map<String, String> sendMap = new HashMap<>();
+				sendMessageDTO.setToUserId(lawsDataCenterFile.getPushRangeIds());
-			sendMap.put("fileName", String.join(",", fileNameList));
+				Map<String, String> sendMap = new HashMap<>();
-			sendMap.put("fileDescription", lawsDataCenterFile.getFileDescription());
+				sendMap.put("fileName", String.join(",", fileNameList));
-			sendMap.put("uploader", lawsDataCenterFile.getUploader());
+				sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription());
-			sendMessageDTO.setMap(sendMap);
+				sendMap.put("uploader", lawsDataCenterFile.getUploader());
-			sendMessageAPI.sendMessage(sendMessageDTO);
+				sendMessageDTO.setMap(sendMap);
+				sendMessageAPI.sendMessage(sendMessageDTO);
+			}
 		}catch (Exception e){
 			log.error("发送消息异常：{}", e.getMessage());
 		}
@@ -208,13 +210,13 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 		try {
 			// 发送消息
 			LawsDataCenterFile dataCenterFile = getById(lawsDataCenterFile.getId());
-			if (!dataCenterFile.getPushRangeIds().equals(lawsDataCenterFile.getPushRangeIds())){
+			if (StringUtils.isNotBlank(dataCenterFile.getPushRangeIds()) && !dataCenterFile.getPushRangeIds().equals(lawsDataCenterFile.getPushRangeIds())){
 				SendMessageDTO sendMessageDTO = new SendMessageDTO();
 				sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.DATA_CENTER);
 				sendMessageDTO.setToUserId(lawsDataCenterFile.getPushRangeIds());
 				Map<String, String> sendMap = new HashMap<>();
 				sendMap.put("fileName", lawsDataCenterFile.getFileName());
-				sendMap.put("fileDescription", lawsDataCenterFile.getFileDescription());
+				sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription());
 				sendMap.put("uploader", dataCenterFile.getUploader());
 				sendMessageDTO.setMap(sendMap);
 				sendMessageAPI.sendMessage(sendMessageDTO);

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java

@@ -1,9 +1,6 @@
 package com.jero.modules.laws.enterprise.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
@@ -82,6 +79,7 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
      */
     @Excel(name = "存在问题", width = 15)
     @ApiModelProperty(value = "存在问题")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String issue;
 
     /**
@@ -156,4 +154,10 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "稽查报告")
     private EnterpriseStandardInspectReport enterpriseStandardInspectReport;
+    /**
+     * 稽查内容id
+     */
+    @ApiModelProperty(value = "稽查内容id")
+    @TableField(exist = false)
+    private String inspectContentId;
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java

@@ -154,7 +154,7 @@ public class EnterpriseStandardInspectVo {
      */
     @ApiModelProperty(value = "整改计划")
     @ExcelCollection(name = "")
-    private List<EnterpriseStandardInspectRectifyPlan> enterpriseStandardInspectRectifyPlanList = Collections.emptyList();
+    private List<EnterpriseStandardInspectRectifyPlan> enterpriseStandardInspectRectifyPlanLists = Collections.emptyList();
 
     /**
      * 企标稽查计划id

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectContentServiceImpl.java

@@ -61,7 +61,7 @@ public class EnterpriseStandardInspectContentServiceImpl extends ServiceImpl<Ent
     public List<EnterpriseStandardInspectContent> queryClauseByEsInspectId(String processEsInspectId) {
         return list(new LambdaQueryWrapper<EnterpriseStandardInspectContent>()
                         .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, processEsInspectId)
-						.orderByDesc(EnterpriseStandardInspectContent::getCreateTime));
+						.orderByAsc(EnterpriseStandardInspectContent::getCreateTime));
     }
 	/**
 	 * 保存

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
 * @author ThinkBook
@@ -171,8 +172,12 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
         list.forEach(item -> {
             // 填充稽查报告
             EnterpriseStandardInspectReport enterpriseStandardInspectReport = EnterpriseStandardInspectReportService.getById(item.getInspectReportId());
+            if (Objects.isNull(enterpriseStandardInspectReport)){
+                return;
+            }
             // 稽查内容查询
             EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
+            item.setInspectContentId(enterpriseStandardInspectContent.getId());
             enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
             enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
             item.setEnterpriseStandardInspectReport(enterpriseStandardInspectReport);

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java

@@ -178,7 +178,7 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
     public EnterpriseStandardInspectReport queryByInspectContentId(String inspectContentId) {
         EnterpriseStandardInspectReport enterpriseStandardInspectReport = getOne(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
                 .eq(EnterpriseStandardInspectReport::getInspectContentId, inspectContentId)
-                .orderByDesc(EnterpriseStandardInspectReport::getCreateTime));
+                .orderByAsc(EnterpriseStandardInspectReport::getCreateTime));
         // 稽查内容查询
         EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
         if (!Objects.isNull(enterpriseStandardInspectContent)){
@@ -196,7 +196,7 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
     public List<EnterpriseStandardInspectReport> queryByProcessEsInspectId(String processEsInspectId) {
         List<EnterpriseStandardInspectReport> list = list(new LambdaQueryWrapper<EnterpriseStandardInspectReport>()
                 .eq(EnterpriseStandardInspectReport::getProcessEsInspectId, processEsInspectId)
-                .orderByDesc(EnterpriseStandardInspectReport::getCreateTime));
+                .orderByAsc(EnterpriseStandardInspectReport::getCreateTime));
 
         for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : list) {
             // 稽查内容查询

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java

@@ -256,7 +256,7 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
         for (EnterpriseStandardInspectVo standardInspectVo : pageList) {
             List<EnterpriseStandardInspectRectifyPlan> list = esInspectRectifyPlanMapper.list(standardInspectVo.getId());
             if (CollectionUtils.isNotEmpty(list)){
-                standardInspectVo.setEnterpriseStandardInspectRectifyPlanList(list);
+                standardInspectVo.setEnterpriseStandardInspectRectifyPlanLists(list);
             }
         }
         List<EnterpriseStandardInspectVo> exportList = null;