修改新法规导入流程、市场清单发布流程保存修改

laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java

@@ -35,6 +35,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.DelegationState;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -144,12 +145,20 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public void saveToDraft(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) {
-        // 验证是否已发起流程
-        checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId());
+        BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
+        if(Objects.isNull(basicTaskInfoDTO) || StringUtils.isBlank(basicTaskInfoDTO.getTaskId())){
+            // 验证是否已发起流程
+            checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId());
+        }
+        ProcessMarketStandardRelease processMarketStandardRelease =  processInfoVO.getBusinessInfoDTO();
+        if(!Objects.isNull(processMarketStandardRelease)){
+            saveOrUpdate(processMarketStandardRelease);
+        }
         // 流程信息
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         // 流程类型
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.MARKET_STANDARD_PUBLISH.getValue());
+
         processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId());
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java

@@ -141,6 +141,10 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
+        ProcessNewStandardImport processNewStandardImport = processInfoVO.getBusinessInfoDTO();
+        if(!Objects.isNull(processNewStandardImport)){
+            saveOrUpdate(processNewStandardImport);
+        }
         // 流程信息
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         // 流程类型