fix(稽查流程): 保存方式变更

laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java

@@ -30,8 +30,10 @@ import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.BeanUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -46,6 +48,7 @@ import java.util.*;
 @Aspect
 @Component
 @Slf4j
+@Transactional(rollbackFor = RuntimeException.class)
 public class ProcessAspect {
     @Resource
     private TaskService taskService;
@@ -59,12 +62,18 @@ public class ProcessAspect {
     private ProcessDraftService processDraftService;
     private static final String PROCESS_ALL = "processAll";
     private static final List<String> SPECIAL_NODE = Arrays.asList(EsInspectPlanCommon.PROCESS_NODE_3);
+    private static final String SAVE_BY_DRAFT = "2";
 
     // 流程发起
     @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowStart(..))")
     public void processServiceFlowStart() {
     }
 
+    // 流程保存
+    @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowSave(..))")
+    public void processServiceFlowSave() {
+    }
+
     // 流程审批
     @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowApproval(..))")
     public void processServiceFlowApproval() {
@@ -200,6 +209,62 @@ public class ProcessAspect {
         }
         log.info("==========流程发起、审批、驳回。删除草稿后置方法结束==========");
     }
+    @AfterReturning("processServiceFlowSave()")
+    public void doAfterFlowSave(JoinPoint jp) {
+        log.info("==========流程保存到草稿后置方法开始==========");
+        if (!Objects.isNull(jp.getArgs())) {
+            LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            Map<String, Objects> map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class);
+            Object processApprovalRecordObject = map.get("processApprovalRecord");
+            String infoJsonStr = String.valueOf(map.get("infoJsonStr"));
+            String saveSource = String.valueOf(map.get("saveSource"));
+            Object processAllObject = map.get(PROCESS_ALL);
+            if (!Objects.isNull(processApprovalRecordObject) && !Objects.isNull(processAllObject)){
+                ProcessApprovalRecord processApprovalRecord = JSON.parseObject(JSON.toJSONString(processApprovalRecordObject), ProcessApprovalRecord.class);
+                ProcessAll processAll = JSON.parseObject(JSON.toJSONString(processAllObject), ProcessAll.class);
+                if (StringUtils.isBlank(processAll.getNodeId()) || SAVE_BY_DRAFT.equals(saveSource)){
+                    ProcessDraft processDraft = new ProcessDraft();
+                    setProperty(loginUser, infoJsonStr, processApprovalRecord, processAll, processDraft);
+                    // 删除旧草稿
+                    processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
+                            .eq(ProcessDraft::getProjectId, processAll.getProjectId())
+                            .eq(ProcessDraft::getUserId, loginUser.getId()));
+                    // 保存新草稿
+                    processDraftService.save(processDraft);
+                }
+            }
+        }
+        log.info("==========流程保存到草稿后置方法结束==========");
+    }
+
+    private static void setProperty(LoginUser loginUser, String infoJsonStr, ProcessApprovalRecord processApprovalRecord, ProcessAll processAll, ProcessDraft processDraft) {
+        // 属性拷贝
+        BeanUtils.copyProperties(processAll, processDraft);
+        processDraft.setCreateBy("");
+        processDraft.setId("");
+        processDraft.setUpdateBy("");
+        Date date = new Date();
+        processDraft.setCreateTime(date);
+        processDraft.setUpdateBy("");
+        processDraft.setUpdateTime(date);
+        // 保存草稿表
+        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
+            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
+        }
+        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
+            processDraft.setHandleText(processApprovalRecord.getCommitText());
+        }
+        if (!Objects.isNull(processAll.getDueTime())){
+            processDraft.setProcessDueDate(processAll.getDueTime());
+        }
+        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(processAll.getPrcMes())){
+            processDraft.setProcessDescription(processAll.getPrcMes());
+        }
+        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(infoJsonStr)){
+            processDraft.setInfoJsonStr(infoJsonStr);
+        }
+        processDraft.setUserId(loginUser.getId());
+    }
 
     /**
      * 是否会签节点

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java

@@ -168,47 +168,6 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
 
     @Override
     public void flowSave(EsDeclareFlowVO esDeclareFlowVO) {
-        // 流程信息
-        ProcessAll processAll = esDeclareFlowVO.getProcessAll();
-        // 流程审批信息
-        ProcessApprovalRecord processApprovalRecord = esDeclareFlowVO.getProcessApprovalRecord();
-
-        // 流程总表信息
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.STANDARD_DECLARE.getValue()));
-        ProcessDraft processDraft = new ProcessDraft();
-        // 属性拷贝
-        BeanUtils.copyProperties(processAll, processDraft);
-        processDraft.setId("");
-        processDraft.setUpdateBy("");
-        Date date = new Date();
-        processDraft.setCreateTime(date);
-        processDraft.setUpdateBy("");
-        processDraft.setUpdateTime(date);
-        // 保存草稿表
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
-            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
-        }
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
-            processDraft.setHandleText(processApprovalRecord.getCommitText());
-        }
-        if (!Objects.isNull(processAll.getDueTime())){
-            processDraft.setProcessDueDate(processAll.getDueTime());
-        }
-        if (StringUtils.isNotBlank(processAll.getPrcMes())){
-            processDraft.setProcessDescription(processAll.getPrcMes());
-        }
-        if (StringUtils.isNotBlank(esDeclareFlowVO.getInfoJsonStr())){
-            processDraft.setInfoJsonStr(esDeclareFlowVO.getInfoJsonStr());
-        }
-        processDraft.setUserId(loginUser.getId());
-        // 删除旧草稿
-        processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
-                .eq(ProcessDraft::getProjectId, processAll.getProjectId())
-                .eq(ProcessDraft::getUserId, loginUser.getId()));
-        // 保存新草稿
-        processDraftService.save(processDraft);
-
         // 企标宣贯业务表
         processEsDeclareService.saveOrUpdate(esDeclareFlowVO.getProcessEsDeclare());
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/vo/EsDeclareFlowVO.java

@@ -32,4 +32,9 @@ public class EsDeclareFlowVO {
     /**草稿信息json字符串*/
     @ApiModelProperty(value = "草稿信息json字符串")
     private String infoJsonStr;
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java

@@ -255,46 +255,8 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
 
     @Override
     public void flowSave(EsInspectFlowVO esInspectFlowVO) {
-        // 流程信息
+        // 处理业务表数据
-        ProcessAll processAll = esInspectFlowVO.getProcessAll();
+        handleBusinessData(esInspectFlowVO);
-        // 流程审批信息
-        ProcessApprovalRecord processApprovalRecord = esInspectFlowVO.getProcessApprovalRecord();
-
-        // 流程总表信息
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT.getValue()));
-        ProcessDraft processDraft = new ProcessDraft();
-        // 属性拷贝
-        BeanUtils.copyProperties(processAll, processDraft);
-        processDraft.setId("");
-        processDraft.setUpdateBy("");
-        Date date = new Date();
-        processDraft.setCreateTime(date);
-        processDraft.setUpdateBy("");
-        processDraft.setUpdateTime(date);
-        // 保存草稿表
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
-            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
-        }
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
-            processDraft.setHandleText(processApprovalRecord.getCommitText());
-        }
-        if (!Objects.isNull(processAll.getDueTime())){
-            processDraft.setProcessDueDate(processAll.getDueTime());
-        }
-        if (StringUtils.isNotBlank(processAll.getPrcMes())){
-            processDraft.setProcessDescription(processAll.getPrcMes());
-        }
-        if (StringUtils.isNotBlank(esInspectFlowVO.getInfoJsonStr())){
-            processDraft.setInfoJsonStr(esInspectFlowVO.getInfoJsonStr());
-        }
-        processDraft.setUserId(loginUser.getId());
-        // 删除旧草稿
-        processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
-                .eq(ProcessDraft::getProjectId, processAll.getProjectId())
-                .eq(ProcessDraft::getUserId, loginUser.getId()));
-        // 保存新草稿
-        processDraftService.save(processDraft);
     }
 
     @Override

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java

@@ -161,46 +161,6 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
 
     @Override
     public void flowSave(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) {
-        // 流程信息
-        ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll();
-        // 流程审批信息
-        ProcessApprovalRecord processApprovalRecord = esInspectDelayApplyFlowVO.getProcessApprovalRecord();
-
-        // 流程总表信息
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_DELAY_APPLY.getValue()));
-        ProcessDraft processDraft = new ProcessDraft();
-        // 属性拷贝
-        BeanUtils.copyProperties(processAll, processDraft);
-        processDraft.setId("");
-        processDraft.setUpdateBy("");
-        Date date = new Date();
-        processDraft.setCreateTime(date);
-        processDraft.setUpdateBy("");
-        processDraft.setUpdateTime(date);
-        // 保存草稿表
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
-            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
-        }
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
-            processDraft.setHandleText(processApprovalRecord.getCommitText());
-        }
-        if (!Objects.isNull(processAll.getDueTime())){
-            processDraft.setProcessDueDate(processAll.getDueTime());
-        }
-        if (StringUtils.isNotBlank(processAll.getPrcMes())){
-            processDraft.setProcessDescription(processAll.getPrcMes());
-        }
-        if (StringUtils.isNotBlank(esInspectDelayApplyFlowVO.getInfoJsonStr())){
-            processDraft.setInfoJsonStr(esInspectDelayApplyFlowVO.getInfoJsonStr());
-        }
-        processDraft.setUserId(loginUser.getId());
-        // 删除旧草稿
-        processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
-                .eq(ProcessDraft::getProjectId, processAll.getProjectId())
-                .eq(ProcessDraft::getUserId, loginUser.getId()));
-        // 保存新草稿
-        processDraftService.save(processDraft);
         // 处理业务表数据
         handleBusinessData(esInspectDelayApplyFlowVO);
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java

@@ -41,4 +41,9 @@ public class EsInspectDelayApplyFlowVO {
      */
     @ApiModelProperty(value="流程全局删除ids")
     private String processAllDelIds;
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java

@@ -192,46 +192,6 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
     public void flowSave(EsInspectPlanFlowVO esInspectPlanFlowVO) {
         // 流程信息
         ProcessAll processAll = esInspectPlanFlowVO.getProcessAll();
-        // 流程审批信息
-        ProcessApprovalRecord processApprovalRecord = esInspectPlanFlowVO.getProcessApprovalRecord();
-
-        // 流程总表信息
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue()));
-        ProcessDraft processDraft = new ProcessDraft();
-        // 属性拷贝
-        BeanUtils.copyProperties(processAll, processDraft);
-        processDraft.setCreateBy("");
-        processDraft.setId("");
-        processDraft.setUpdateBy("");
-        Date date = new Date();
-        processDraft.setCreateTime(date);
-        processDraft.setUpdateBy("");
-        processDraft.setUpdateTime(date);
-        // 保存草稿表
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
-            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
-        }
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
-            processDraft.setHandleText(processApprovalRecord.getCommitText());
-        }
-        if (!Objects.isNull(processAll.getDueTime())){
-            processDraft.setProcessDueDate(processAll.getDueTime());
-        }
-        if (StringUtils.isNotBlank(processAll.getPrcMes())){
-            processDraft.setProcessDescription(processAll.getPrcMes());
-        }
-        if (StringUtils.isNotBlank(esInspectPlanFlowVO.getInfoJsonStr())){
-            processDraft.setInfoJsonStr(esInspectPlanFlowVO.getInfoJsonStr());
-        }
-        processDraft.setUserId(loginUser.getId());
-        // 删除旧草稿
-        processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
-                .eq(ProcessDraft::getProjectId, processAll.getProjectId())
-                .eq(ProcessDraft::getUserId, loginUser.getId()));
-        // 保存新草稿
-        processDraftService.save(processDraft);
-
         // 处理业务表数据
         handleBusinessData(esInspectPlanFlowVO);
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java

@@ -108,10 +108,14 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
     }
 
 	private void fillProperty(List<ProcessEsInspectPlan> list) {
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		for (ProcessEsInspectPlan processEsInspectPlan : list) {
 			// 意见
-			List<ProcessEsInspectPlanOpinion> opinionList = iProcessEsInspectPlanOpinionService.findLastByGroup( processEsInspectPlan.getId());
+			List<ProcessEsInspectPlanOpinion> opinionList = iProcessEsInspectPlanOpinionService.findLastByGroup(processEsInspectPlan.getId());
 			for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) {
+				if (loginUser.getUsername().equals(processEsInspectPlanOpinion.getCreateBy())){
+					processEsInspectPlan.setProcessEsInspectPlanOpinion(processEsInspectPlanOpinion);
+				}
 				// 用户翻译
 				processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy()));
 				processEsInspectPlanOpinion.setUpdateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getUpdateBy()));
@@ -347,6 +351,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 
 	private List<String> sixthVerify(ProcessEsInspectPlan processEsInspectPlan, boolean flag) {
 		List<String> errorList = new ArrayList<>();
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if (StringUtils.isNotBlank(processEsInspectPlan.getStandardizationDockingUser())){
 			SysUser sysUser = sysUserService.findUserByCalcNameWorkNo(processEsInspectPlan.getStandardizationDockingUser());
 			if (Objects.isNull(sysUser)){
@@ -369,9 +374,11 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 				errorList.add("征求意见对象不能为空!");
 			}
 		}else {
-			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			processEsInspectPlan.setObjectOfConsultation(loginUser.getId());
 		}
+		// 填充创建人
+		processEsInspectPlan.setCreateBy(loginUser.getId());
+		processEsInspectPlan.setCreateByDictText(loginUser.calcNameWorkNo());
 		return errorList;
 	}
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java

@@ -57,4 +57,9 @@ public class EsInspectPlanFlowVO {
      */
     @ApiModelProperty(value="流程全局删除ids")
     private String processAllDelIds;
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java

@@ -128,47 +128,6 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
 
     @Override
     public void flowSave(EsInspectRectifyFlowVO esInspectReportFlowVO) {
-        // 流程信息
-        ProcessAll processAll = esInspectReportFlowVO.getProcessAll();
-        // 流程审批信息
-        ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord();
-
-        // 流程总表信息
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_REPORT.getValue()));
-        ProcessDraft processDraft = new ProcessDraft();
-        // 属性拷贝
-        BeanUtils.copyProperties(processAll, processDraft);
-        processDraft.setId("");
-        processDraft.setUpdateBy("");
-        Date date = new Date();
-        processDraft.setCreateTime(date);
-        processDraft.setUpdateBy("");
-        processDraft.setUpdateTime(date);
-        // 保存草稿表
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
-            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
-        }
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
-            processDraft.setHandleText(processApprovalRecord.getCommitText());
-        }
-        if (!Objects.isNull(processAll.getDueTime())){
-            processDraft.setProcessDueDate(processAll.getDueTime());
-        }
-        if (StringUtils.isNotBlank(processAll.getPrcMes())){
-            processDraft.setProcessDescription(processAll.getPrcMes());
-        }
-        if (StringUtils.isNotBlank(esInspectReportFlowVO.getInfoJsonStr())){
-            processDraft.setInfoJsonStr(esInspectReportFlowVO.getInfoJsonStr());
-        }
-        processDraft.setUserId(loginUser.getId());
-        // 删除旧草稿
-        processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
-                .eq(ProcessDraft::getProjectId, processAll.getProjectId())
-                .eq(ProcessDraft::getUserId, loginUser.getId()));
-        // 保存新草稿
-        processDraftService.save(processDraft);
-
         // 处理业务表数据
         handleBusinessData(esInspectReportFlowVO);
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/EsInspectRectifyFlowVO.java

@@ -36,4 +36,9 @@ public class EsInspectRectifyFlowVO {
     /**草稿信息json字符串*/
     @ApiModelProperty(value = "草稿信息json字符串")
     private String infoJsonStr;
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java

@@ -137,47 +137,6 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
 
     @Override
     public void flowSave(EsPermissionApplyFlowVO esPermissionApplyFlowVO) {
-        // 流程信息
-        ProcessAll processAll = esPermissionApplyFlowVO.getProcessAll();
-        // 流程审批信息
-        ProcessApprovalRecord processApprovalRecord = esPermissionApplyFlowVO.getProcessApprovalRecord();
-
-        // 流程总表信息
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.PERMISSION_APPLY_PROCESS.getValue()));
-        ProcessDraft processDraft = new ProcessDraft();
-        // 属性拷贝
-        BeanUtils.copyProperties(processAll, processDraft);
-        processDraft.setId("");
-        processDraft.setUpdateBy("");
-        Date date = new Date();
-        processDraft.setCreateTime(date);
-        processDraft.setUpdateBy("");
-        processDraft.setUpdateTime(date);
-        // 保存草稿表
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
-            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
-        }
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
-            processDraft.setHandleText(processApprovalRecord.getCommitText());
-        }
-        if (!Objects.isNull(processAll.getDueTime())){
-            processDraft.setProcessDueDate(processAll.getDueTime());
-        }
-        if (StringUtils.isNotBlank(processAll.getPrcMes())){
-            processDraft.setProcessDescription(processAll.getPrcMes());
-        }
-        if (StringUtils.isNotBlank(esPermissionApplyFlowVO.getInfoJsonStr())){
-            processDraft.setInfoJsonStr(esPermissionApplyFlowVO.getInfoJsonStr());
-        }
-        processDraft.setUserId(loginUser.getId());
-        // 删除旧草稿
-        processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
-                .eq(ProcessDraft::getProjectId, processAll.getProjectId())
-                .eq(ProcessDraft::getUserId, loginUser.getId()));
-        // 保存新草稿
-        processDraftService.save(processDraft);
-
         // 处理业务表数据
         handleBusinessData(esPermissionApplyFlowVO);
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java

@@ -32,4 +32,9 @@ public class EsPermissionApplyFlowVO {
     /**草稿信息json字符串*/
     @ApiModelProperty(value = "草稿信息json字符串")
     private String infoJsonStr;
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java

@@ -51,5 +51,10 @@ public class ProcessInfoVO<T> implements Serializable {
     /**草稿信息json字符串*/
     @ApiModelProperty(value = "草稿信息json字符串")
     private String infoJsonStr;
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
 
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java

@@ -136,48 +136,8 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
 
     @Override
     public void flowSave(MeetingManageFlowVO meetingManageFlowVO) {
-        // 流程信息
-        ProcessAll processAll = meetingManageFlowVO.getProcessAll();
-        // 流程审批信息
-        ProcessApprovalRecord processApprovalRecord = meetingManageFlowVO.getProcessApprovalRecord();
-
-        // 流程总表信息
-        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.MEETING_MANAGE.getValue()));
-        ProcessDraft processDraft = new ProcessDraft();
-        // 属性拷贝
-        BeanUtils.copyProperties(processAll, processDraft);
-        processDraft.setId("");
-        processDraft.setUpdateBy("");
-        Date date = new Date();
-        processDraft.setCreateTime(date);
-        processDraft.setUpdateBy("");
-        processDraft.setUpdateTime(date);
-        // 保存草稿表
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitFile())){
-            processDraft.setHandleFile(processApprovalRecord.getCommitFile());
-        }
-        if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){
-            processDraft.setHandleText(processApprovalRecord.getCommitText());
-        }
-        if (!Objects.isNull(processAll.getDueTime())){
-            processDraft.setProcessDueDate(processAll.getDueTime());
-        }
-        if (StringUtils.isNotBlank(processAll.getPrcMes())){
-            processDraft.setProcessDescription(processAll.getPrcMes());
-        }
-        if (StringUtils.isNotBlank(meetingManageFlowVO.getInfoJsonStr())){
-            processDraft.setInfoJsonStr(meetingManageFlowVO.getInfoJsonStr());
-        }
-        processDraft.setUserId(loginUser.getId());
-        // 删除旧草稿
-        processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
-                .eq(ProcessDraft::getProjectId, processAll.getProjectId())
-                .eq(ProcessDraft::getUserId, loginUser.getId()));
-        // 保存新草稿
-        processDraftService.save(processDraft);
-
         // 保存业务表
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessMeetingManage processMeetingManage = meetingManageFlowVO.getProcessMeetingManage();
         if(StringUtils.isBlank(processMeetingManage.getId())){
             processMeetingManage.setId(String.valueOf(SnowflakeUtils.snowflake()));

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java

@@ -38,4 +38,9 @@ public class MeetingManageFlowVO {
     /**草稿信息json字符串*/
     @ApiModelProperty(value = "草稿信息json字符串")
     private String infoJsonStr;
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
 }