feat: 企标制修订 手动发起流程

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/OtherDraftUser.java

@@ -0,0 +1,30 @@
+package com.jero.modules.activiti.process.esRevision.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author: Mzaxd
+ * @Date: 2023/12/20 10:16
+ */
+
+@Data
+public class OtherDraftUser {
+
+    @ApiModelProperty(value = "起草人责任单位")
+    private String dept;
+
+    @ApiModelProperty(value = "起草人")
+    private String user;
+
+    @ApiModelProperty(value = "起草范围")
+    private String scope;
+
+    @ApiModelProperty(value = "截止日期")
+    private Date deadline;
+
+    @ApiModelProperty(value = "文件ID")
+    private String fileId;
+}

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -66,7 +69,6 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "流程实例Id")
     private String processInstanceId;
 
-
     /**
      * 业务json数据
      */
@@ -184,6 +186,14 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "总工程师")
     private String chiefEngineer;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "其他起草人")
+    private List<OtherDraftUser> otherDraftUsers;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "稽查内容")
+    private List<EnterpriseStandardInspectContent> inspectContents;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java

@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
+import com.jero.modules.activiti.process.esRevision.entity.OtherDraftUser;
 import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
 import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO;
 import com.jero.modules.activiti.process.esRevision.service.EsRevisionService;
@@ -15,6 +16,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
+import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -24,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
 * @author ThinkBook
@@ -92,6 +95,14 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         Map<String, Object> flowUser = revisionData.getFlowUser();
         ProcessEsRevision data = revisionData.getData();
         actVariables.put("mainDraftUser", flowUser.get("mainDraftUser"));
+        List<OtherDraftUser> otherDraftUsers = data.getOtherDraftUsers();
+        if (otherDraftUsers == null || otherDraftUsers.isEmpty()) {
+            actVariables.put("distribute", false);
+        } else {
+            actVariables.put("distribute", true);
+            actVariables.put("otherDraftUserList", otherDraftUsers.stream().map(OtherDraftUser::getUser)
+                    .collect(Collectors.toList()));
+        }
         // 获取分发人
         return actVariables;
     }