fix: 企标更改流程 制修订流程草稿保存返回id

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java

@@ -66,8 +66,8 @@ public class ESChangeController {
     @ApiOperation(value = "企标更改流程-保存", notes = "企标更改流程-保存")
     @PostMapping("/save")
     public Result<?> save(@Validated @RequestBody ProcessInfoVO<ESChangeDataVO> processInfoVO) {
-        changeService.saveToDraft(processInfoVO);
+        String draftId = changeService.saveToDraft(processInfoVO);
-        return Result.OK();
+        return Result.OK((Object) draftId);
     }
 
     /**

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java

@@ -14,7 +14,7 @@ public interface ProcessEsChangeService extends IService<ProcessEsChange> {
 
     void startProcess(ESChangeDataVO changeData);
 
-    void saveToDraft(ProcessInfoVO<ESChangeDataVO> changeData);
+    String saveToDraft(ProcessInfoVO<ESChangeDataVO> changeData);
 
     ESChangeDataVO getHandleData(String taskId);
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java

@@ -178,7 +178,7 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
     }
 
     @Override
-    public void saveToDraft(ProcessInfoVO<ESChangeDataVO> processInfoVO) {
+    public String saveToDraft(ProcessInfoVO<ESChangeDataVO> processInfoVO) {
         ESChangeDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         if (businessInfoDTO != null) {
             ProcessEsChange data = businessInfoDTO.getData();
@@ -191,7 +191,7 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_CHANGE.getValue()); // 流程类型
 
-        processHandleService.saveToDraft(processInfoVO);
+        return processHandleService.saveToDraft(processInfoVO);
     }
 
     public void startRunTask(ESChangeDataVO changeData) {

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java

@@ -61,8 +61,8 @@ public class ESRevisionController {
     @ApiOperation(value="企标制修订流程-保存", notes="企标制修订流程-保存")
     @PostMapping("/save")
     public Result<?> save(@Validated @RequestBody ProcessInfoVO<ESRevisionDataVO> processInfoVO) {
-        revisionService.saveToDraft(processInfoVO);
+        String draftId = revisionService.saveToDraft(processInfoVO);
-        return Result.OK();
+        return Result.OK((Object) draftId);
     }
 
     /**

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

@@ -21,7 +21,7 @@ public interface EsRevisionService extends IService<ProcessEsRevision> {
 
     void autoStartProcess(ESRevisionDataVO revisionData);
 
-    void saveToDraft(ProcessInfoVO<ESRevisionDataVO> processInfoVO);
+    String saveToDraft(ProcessInfoVO<ESRevisionDataVO> processInfoVO);
 
     void startProcess(ESRevisionDataVO revisionData);
 

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

@@ -789,7 +789,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     }
 
     @Override
-    public void saveToDraft(ProcessInfoVO<ESRevisionDataVO> processInfoVO) {
+    public String saveToDraft(ProcessInfoVO<ESRevisionDataVO> processInfoVO) {
         ESRevisionDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         if (businessInfoDTO != null) {
             ProcessEsRevision data = businessInfoDTO.getData();
@@ -802,7 +802,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_REVISION.getValue()); // 流程类型
 
-        processHandleService.saveToDraft(processInfoVO);
+        return processHandleService.saveToDraft(processInfoVO);
     }
 
     private void sendMessageToAuthDeptUser(String processInstanceId) {

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java

@@ -87,7 +87,7 @@ public interface IProcessHandleService {
      * @Date: 2023/11/3 10:29
      * @Description: 保存为草稿
      **/
-    void saveToDraft(ProcessInfoVO processInfoVO);
+    String saveToDraft(ProcessInfoVO processInfoVO);
 
 
     void saveToDraftCustomUserId(ProcessInfoVO processInfoVO, String userId);

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java

@@ -414,8 +414,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
      * @Description: 保存为草稿
      **/
     @Override
-    public void saveToDraft(ProcessInfoVO processInfoVO) {
+    public String saveToDraft(ProcessInfoVO processInfoVO) {
-        this.saveToDraft(processInfoVO, CurrentUserUtil.getId());
+        return this.saveToDraft(processInfoVO, CurrentUserUtil.getId());
     }
 
     @Override
@@ -423,7 +423,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         this.saveToDraft(processInfoVO, userId);
     }
 
-    private void saveToDraft(ProcessInfoVO processInfoVO, String userId) {
+    private String saveToDraft(ProcessInfoVO processInfoVO, String userId) {
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
         String taskId = null;
@@ -463,6 +463,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         processDraft.setInfoJsonStr(processInfoVO.getInfoJsonStr());//草稿信息json字符串
         processDraft.setSaveSource(processInfoVO.getSaveSource());//来源（启动流程时有用，用于保存初始业务信息用于强制驳回）
         processDraftService.saveOrUpdate(processDraft);
+        return processDraft.getId();
     }
 
     @Override