diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java index 07d76fd5..f58002dc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java +++ b/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 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 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() + .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()); + } /** * 是否会签节点 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java index 98670e6c..339d72e8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java +++ b/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() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 保存新草稿 - processDraftService.save(processDraft); - // 企标宣贯业务表 processEsDeclareService.saveOrUpdate(esDeclareFlowVO.getProcessEsDeclare()); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/vo/EsDeclareFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/vo/EsDeclareFlowVO.java index 90e0f000..55360745 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/vo/EsDeclareFlowVO.java +++ b/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; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 55d95656..b00a4d26 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/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(); - // 流程审批信息 - 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() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 保存新草稿 - processDraftService.save(processDraft); + // 处理业务表数据 + handleBusinessData(esInspectFlowVO); } @Override diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index dae85d05..c72c7788 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/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() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 保存新草稿 - processDraftService.save(processDraft); // 处理业务表数据 handleBusinessData(esInspectDelayApplyFlowVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java index c4ad04fd..01cd4fbd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java +++ b/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; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index d2c5a9df..758e59f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/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() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 保存新草稿 - processDraftService.save(processDraft); - // 处理业务表数据 handleBusinessData(esInspectPlanFlowVO); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index 73c81a5b..1b18f234 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -108,10 +108,14 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl list) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); for (ProcessEsInspectPlan processEsInspectPlan : list) { // 意见 - List opinionList = iProcessEsInspectPlanOpinionService.findLastByGroup( processEsInspectPlan.getId()); + List 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 sixthVerify(ProcessEsInspectPlan processEsInspectPlan, boolean flag) { List 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() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 保存新草稿 - processDraftService.save(processDraft); - // 处理业务表数据 handleBusinessData(esInspectReportFlowVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/EsInspectRectifyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/EsInspectRectifyFlowVO.java index 45bc37d6..ab7725b2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/vo/EsInspectRectifyFlowVO.java +++ b/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; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index 89c54ec8..922c6d1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/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() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 保存新草稿 - processDraftService.save(processDraft); - // 处理业务表数据 handleBusinessData(esPermissionApplyFlowVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java index 4864c749..28665a5e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/vo/EsPermissionApplyFlowVO.java +++ b/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; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java index 18fbe2f5..681d2296 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java @@ -51,5 +51,10 @@ public class ProcessInfoVO implements Serializable { /**草稿信息json字符串*/ @ApiModelProperty(value = "草稿信息json字符串") private String infoJsonStr; + /** + * 保存来源 + */ + @ApiModelProperty(value="保存来源(1：待办 2：草稿)") + private String saveSource; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index 53c5e4c1..3f383b3f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/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() - .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())); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java index 9af29c77..40dc2180 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/vo/MeetingManageFlowVO.java +++ b/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; }