ci: 企标计划实体类字段变更

laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java

@@ -0,0 +1,50 @@
+package com.jero.modules.activiti.process.common.enums;
+
+/**
+ * @author: Mzaxd
+ * @Date: 2023/10/12 9:37
+ * 流程类型
+ */
+
+public enum ProcessType {
+
+    /**
+     * 企标立项变更
+     */
+    ES_INIT_CHANGE("企标立项/变更计划", "1", "es-init-change"),
+
+    ;
+
+    private final String name;
+    private final String value;
+    private final String processKey;
+
+    ProcessType(String name, String value, String processKey) {
+        this.name = name;
+        this.value = value;
+        this.processKey = processKey;
+    }
+
+    public String getProcessTypeNameByProcessKey(String processKey) {
+        for (ProcessType processType : ProcessType.values()) {
+            if (processType.getProcessKey().equals(processKey)) {
+                return processType.getName();
+            }
+        }
+        return null;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getProcessKey() {
+        return processKey;
+    }
+}
+
+

laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java

@@ -73,7 +73,7 @@ public class ActFlowCommonService {
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
 
         if (task == null) {
-            log.error("completeProcess - task is null!!");
+            log.error("找不到对应任务");
             throw new JeroBootException("找不到对应任务");
         }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java

@@ -279,6 +279,11 @@ public class ProcessEsInitChange implements Serializable {
      */
     private String remarks;
 
+    /**
+     * 上传附件
+     */
+    private String uploadAttachment;
+
     /**
      * 附件
      */
@@ -354,6 +359,11 @@ public class ProcessEsInitChange implements Serializable {
      */
     private String authDept;
 
+    /**
+     * 配合单位
+     */
+    private String cooperationUnit;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1781238971297838971L;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -83,9 +83,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 保存到业务流程表
         saveBatch(esInitChangeList);
         ProcessEsInitChange initChange = esInitChangeList.get(0);
-        // TODO 根据业务需求设置流程状态
+
         // 对数据进行其他操作
-        String beanName = "initChange";
+        String beanName = "initChangeService";
 
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, beanName, initChange.getId());
 
@@ -148,6 +148,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Override
     public void saveToDraft(List<ProcessEsInitChange> esInitChange) {
         // TODO 保存到草稿
+
+        saveOrUpdateBatch(esInitChange);
     }
 }
 

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

@@ -225,8 +225,8 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
-    @ApiModelProperty(value = "附件")
-    private String attachment;
+    @ApiModelProperty(value = "上传附件")
+    private String uploadAttachment;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "附件文件名")
@@ -238,4 +238,7 @@ public class EnterpriseStandardPlan implements Serializable {
     @TableField(exist = false)
     private String qualityFlag_dictText;
 
+    @ApiModelProperty(value = "配合单位")
+    private String cooperationUnit;
+
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml

@@ -54,8 +54,9 @@
             <result property="standardLeadingNecessity" column="standard_leading_necessity" jdbcType="VARCHAR"/>
             <result property="projectExpectedEffects" column="project_expected_effects" jdbcType="VARCHAR"/>
             <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
-            <result property="attachment" column="attachment" jdbcType="VARCHAR"/>
+            <result property="uploadAttachment" column="upload_attachment" jdbcType="VARCHAR"/>
             <result property="qualityFlag" column="quality_flag" jdbcType="VARCHAR"/>
+            <result property="cooperationUnit" column="cooperation_unit" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -75,7 +76,7 @@
         review_date,approval_date,release_date,
         change_status,project_background,similar_na_standards_analysis,
         similar_en_standards_analysis,standard_leading_necessity,project_expected_effects,
-        remarks,attachment,qualityFlag
+        remarks,attachment,qualityFlag,cooperationUnit
     </sql>
 
     <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo">
@@ -217,7 +218,6 @@
             p.compilation_description,
             o1.file_name AS compilationFileName,
             p.component_name,
-            p.applicable_profession,
             u1.username as mainDraftingUser,
             d.depart_name as mainDraftingUnit,
             u2.username as mainDraftingUnitResponsiblePerson,
@@ -236,7 +236,7 @@
             p.standard_leading_necessity,
             p.project_expected_effects,
             p.remarks,
-            p.attachment,
+            p.upload_attachment,
             o2.file_name AS attachmentFileName,
             p.quality_flag
         FROM
@@ -246,7 +246,7 @@
             LEFT JOIN sys_user AS u3 ON u3.id = p.standard_promoter
             LEFT JOIN sys_depart AS d ON d.id = p.main_drafting_unit
             LEFt JOIN oss_file AS o1 ON o1.id = p.compilation_description
-            LEFt JOIN oss_file AS o2 ON o2.id = p.attachment
+            LEFt JOIN oss_file AS o2 ON o2.id = p.upload_attachment
             LEFT JOIN
                 (SELECT
                 ad.plan_id as id,