update 项目合规评估流程,未符合项跟踪流程 启动流程时保存一份初始草稿,用于强制撤回
This commit is contained in:
+10
@@ -0,0 +1,10 @@
|
|||||||
|
package com.jero.modules.activiti.process.common.common;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author liJiaRao
|
||||||
|
* @date 2024-01-11 10:36
|
||||||
|
*/
|
||||||
|
public class DraftCommon {
|
||||||
|
//初始
|
||||||
|
public static final String INITIAL_SOURCE = "3";
|
||||||
|
}
|
||||||
+6
@@ -120,6 +120,12 @@ public class ProcessDraft implements Serializable {
|
|||||||
@ApiModelProperty(value = "草稿信息json字符串")
|
@ApiModelProperty(value = "草稿信息json字符串")
|
||||||
private String infoJsonStr;
|
private String infoJsonStr;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 保存来源
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value="保存来源(3:强制撤回使用)")
|
||||||
|
private String saveSource;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
}
|
}
|
||||||
+3
@@ -9,6 +9,7 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord;
|
|||||||
import com.jero.modules.activiti.entity.ProcessNode;
|
import com.jero.modules.activiti.entity.ProcessNode;
|
||||||
import com.jero.modules.activiti.entity.ProcessNodeLink;
|
import com.jero.modules.activiti.entity.ProcessNodeLink;
|
||||||
import com.jero.modules.activiti.enums.CommitFlagEnum;
|
import com.jero.modules.activiti.enums.CommitFlagEnum;
|
||||||
|
import com.jero.modules.activiti.process.common.common.DraftCommon;
|
||||||
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
||||||
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
|
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
|
||||||
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
||||||
@@ -365,6 +366,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
|
|||||||
processDraft.setHandleFile(handleFile); // 流程审批信息-附件
|
processDraft.setHandleFile(handleFile); // 流程审批信息-附件
|
||||||
processDraft.setUserId(CurrentUserUtil.getId()); // 用户id
|
processDraft.setUserId(CurrentUserUtil.getId()); // 用户id
|
||||||
processDraft.setInfoJsonStr(processInfoVO.getInfoJsonStr());//草稿信息json字符串
|
processDraft.setInfoJsonStr(processInfoVO.getInfoJsonStr());//草稿信息json字符串
|
||||||
|
processDraft.setSaveSource(processInfoVO.getSaveSource());//来源(启动流程时有用,用于保存初始业务信息用于强制驳回)
|
||||||
processDraftService.save(processDraft);
|
processDraftService.save(processDraft);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -427,6 +429,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
|
|||||||
if (StringUtils.isNotBlank(taskId)) {
|
if (StringUtils.isNotBlank(taskId)) {
|
||||||
deleteWrapper.eq(ProcessDraft::getTaskId, taskId);
|
deleteWrapper.eq(ProcessDraft::getTaskId, taskId);
|
||||||
}
|
}
|
||||||
|
deleteWrapper.ne(ProcessDraft::getSaveSource, DraftCommon.INITIAL_SOURCE);
|
||||||
List<ProcessDraft> processDraftList = processDraftService.list(deleteWrapper);
|
List<ProcessDraft> processDraftList = processDraftService.list(deleteWrapper);
|
||||||
for (ProcessDraft processDraft : processDraftList) {
|
for (ProcessDraft processDraft : processDraftList) {
|
||||||
processDraftService.removeById(processDraft.getId());
|
processDraftService.removeById(processDraft.getId());
|
||||||
|
|||||||
+1
-1
@@ -54,7 +54,7 @@ public class ProcessInfoVO<T> implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 保存来源
|
* 保存来源
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value="保存来源(1:待办 2:草稿)")
|
@ApiModelProperty(value="保存来源(1:待办 2:草稿 3:初始信息)")
|
||||||
private String saveSource;
|
private String saveSource;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+5
@@ -19,6 +19,7 @@ import com.jero.common.system.vo.LoginUser;
|
|||||||
import com.jero.modules.activiti.entity.ProcessAll;
|
import com.jero.modules.activiti.entity.ProcessAll;
|
||||||
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
|
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
|
||||||
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
||||||
|
import com.jero.modules.activiti.process.common.common.DraftCommon;
|
||||||
import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
|
import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
|
||||||
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
||||||
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
||||||
@@ -331,6 +332,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void startProcess(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
|
public void startProcess(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
|
||||||
|
//start 先保存一份初始草稿
|
||||||
|
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
||||||
|
saveToDraft(processInfoVO);
|
||||||
|
//end 保存初始草稿结束
|
||||||
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
||||||
|
|
||||||
ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess();
|
ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess();
|
||||||
|
|||||||
+5
-1
@@ -11,6 +11,7 @@ import com.jero.common.system.vo.SysDepartModel;
|
|||||||
import com.jero.modules.activiti.entity.ProcessAll;
|
import com.jero.modules.activiti.entity.ProcessAll;
|
||||||
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
|
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
|
||||||
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
||||||
|
import com.jero.modules.activiti.process.common.common.DraftCommon;
|
||||||
import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
|
import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
|
||||||
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
||||||
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
||||||
@@ -125,7 +126,10 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void startProcess(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
|
public void startProcess(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
|
||||||
|
//start 先保存一份初始草稿
|
||||||
|
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
||||||
|
saveToDraft(processInfoVO);
|
||||||
|
//end 保存初始草稿结束
|
||||||
ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
||||||
ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet();
|
ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet();
|
||||||
if (processProjectNotMet == null){
|
if (processProjectNotMet == null){
|
||||||
|
|||||||
Reference in New Issue
Block a user