From 589318225783530e6039f482499e4c18f7678ccc Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 27 Sep 2024 10:36:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=B2=A1=E6=9C=89=E5=AD=98=E4=B8=8A=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8BID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessEsRevision.java             | 21 ++++++++-----------
 .../service/impl/EsRevisionServiceImpl.java   |  8 +++----
 .../service/impl/ProcessFileServiceImpl.java  |  5 +----
 .../{enterpriseUpdate.docx => DOCX.docx}      |  0
 4 files changed, 14 insertions(+), 20 deletions(-)
 rename laws-modules/src/main/resources/wordTemplate/{enterpriseUpdate.docx => DOCX.docx} (100%)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java
index b02467c3..b968f2c9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java
@@ -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;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
index 8543b6bc..c6e9ed08 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
@@ -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) {
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java
index bb90a094..7963f50a 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java
@@ -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);
 
diff --git a/laws-modules/src/main/resources/wordTemplate/enterpriseUpdate.docx b/laws-modules/src/main/resources/wordTemplate/DOCX.docx
similarity index 100%
rename from laws-modules/src/main/resources/wordTemplate/enterpriseUpdate.docx
rename to laws-modules/src/main/resources/wordTemplate/DOCX.docx