fix: 制修订流程没有存上流程实例ID

2024-09-27 10:36:33 +08:00
parent 25aec2d125
commit 5893182257
4 changed files with 14 additions and 20 deletions
@@ -81,12 +81,6 @@ public class ProcessEsRevision implements Serializable {
    @ApiModelProperty(value = "是否开启征求意见 0不征求 1征求")
    private String adviceFlag;

-    /**
-     * 发布日期
-     */
-    @ApiModelProperty(value = "发布日期")
-    private String releaseDate;
-
    /**
     * 征求意见截止日期
     */
@@ -95,12 +89,6 @@ public class ProcessEsRevision implements Serializable {
    @ApiModelProperty(value = "征求意见截止日期")
    private Date adviceDeadline;

-    /**
-     * 主起草人
-     */
-    @ApiModelProperty(value = "主起草人")
-    private String mainDraftUser;
-
    /**
     * 在线编辑文件id
     */
@@ -113,15 +101,24 @@ public class ProcessEsRevision implements Serializable {
    @ApiModelProperty(value = "业务JSON数据")
    private String businessJson;

+    /**
+     * 主起草人
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "主起草人")
+    private String mainDraftUser;
+
    /**
     * 法规工程师
     */
+    @TableField(exist = false)
    @ApiModelProperty(value = "法规工程师")
    private String standardEngineer;

    /**
     * 设计工程师
     */
+    @TableField(exist = false)
    @ApiModelProperty(value = "设计工程师")
    private String adviceUsers;

@@ -90,8 +90,6 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process

    @Override
    public void startProcess(ProcessInfoVO<ProcessRevisionVO> processInfoVO) {
-        // 第一个节点业务数据处理
-        this.startNodeBusProcess(processInfoVO);
        // 流程Key
        String processDefinitionKey = ProcessType.ES_REVISION_ADVICE.getProcessKey();
        // 流程信息
@@ -114,6 +112,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
        processInfo.setProcessInstanceId(processInstanceId);
        processInfo.setProcessDefinitionId(processDefinitionId);
        processInfo.setProcessType(ProcessTypeEnum.ES_REVISION_ADVICE.getValue());
+        // 第一个节点业务数据处理
+        this.startNodeBusProcess(processInfoVO);
        // 保存选人信息
        processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap);
        // 获取第一个任务的taskId
@@ -132,10 +132,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
    }

    private void startNodeBusProcess(ProcessInfoVO<ProcessRevisionVO> processInfoVO) {
-        // 保存数据
        ProcessRevisionVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
        ProcessEsRevision processInfo = businessInfoDTO.getProcessInfo();
-        save(processInfo);
        // 修改企标计划状态
        // 检查企标计划是否已被删除
        String espId = processInfo.getEspId();
@@ -145,6 +143,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
        }
        // 设置状态为运行中
        espService.updateProjectStatus(espId, ESPProjectStatus.IN_PROGRESS.getValue());
+        // 保存数据
+        save(processInfo);
    }

    private Map<String, Object> setVariables(ProcessInfoVO<ProcessRevisionVO> processInfoVO) {
@@ -61,9 +61,6 @@ public class ProcessFileServiceImpl extends ServiceImpl<ProcessFileMapper, Proce
    @Value("${file.downloadUrl}")
    private String downloadUrl;

-    @Value("${file.sourceFilePath}")
-    private String sourceFilePath;
-
    @Resource
    private OnlineFileLogDao onlineFileLogDao;

@@ -113,7 +110,7 @@ public class ProcessFileServiceImpl extends ServiceImpl<ProcessFileMapper, Proce

            String targetPath = builder + taskId + "_" + topId + "_node.docx";

-            File sourceFile = new File(sourceFilePath);
+            File sourceFile = new File("wordTemplate/DOCX.docx");
            File targetFile = new File(filePath + targetPath);
            FileUtils.copyFile(sourceFile, targetFile);