ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 保存草稿

Browse Source
This commit is contained in:
lijiarao
2024-01-10 16:33:44 +08:00
parent 8af1e69c3e
commit 5424c6a87c
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java
+6
View File
@@ -120,6 +120,12 @@ public class ProcessDraft implements Serializable {
@ApiModelProperty(value = "草稿信息json字符串") @ApiModelProperty(value = "草稿信息json字符串")
private String infoJsonStr; private String infoJsonStr;
/**
* 保存来源
*/
@ApiModelProperty(value="保存来源(1：待办 2：草稿)")
private String saveSource;
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java
+1
View File
@@ -88,6 +88,7 @@ public class ProcessFbInfoController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryWrapper<ProcessDraft> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessDraft> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); queryWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
queryWrapper.eq(ProcessDraft::getSaveSource, 2);
queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType()); queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType());
Page<ProcessDraft> page = new Page<>(pageNo, pageSize); Page<ProcessDraft> page = new Page<>(pageNo, pageSize);
IPage<ProcessDraft> sentList = processDraftService.page(page, queryWrapper); IPage<ProcessDraft> sentList = processDraftService.page(page, queryWrapper);
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+16 -17
View File
@@ -67,6 +67,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
private ProcessDraftService processDraftService; // 流程草稿表 private ProcessDraftService processDraftService; // 流程草稿表
private static final String SAVE_BY_DRAFT = "2"; private static final String SAVE_BY_DRAFT = "2";
private static final String SAVE_BY_TASK = "1";
/** /**
* @Author: liao * @Author: liao
@@ -353,24 +354,22 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
// 删除自己的草稿 // 删除自己的草稿
deleteMyDraft(taskId, processInfoVO.getBusinessId(), basicProcessInfoDTO.getProcessType()); deleteMyDraft(taskId, processInfoVO.getBusinessId(), basicProcessInfoDTO.getProcessType());
// 非发起节点不保存到草稿 // 保存来源(1：待办 2：草稿)
BasicTaskInfoDTO basicTaskInfoDTO1 = processInfoVO.getBasicTaskInfoDTO(); BasicTaskInfoDTO basicTaskInfoDTO1 = processInfoVO.getBasicTaskInfoDTO();
if (StringUtils.isBlank(basicTaskInfoDTO1.getTaskId()) || SAVE_BY_DRAFT.equals(processInfoVO.getSaveSource())){ ProcessDraft processDraft = new ProcessDraft();
ProcessDraft processDraft = new ProcessDraft(); processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id
processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id
processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id processDraft.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称
processDraft.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称 processDraft.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型
processDraft.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型 processDraft.setProcessDueDate(basicProcessInfoDTO.getProcessDueDate()); // 流程信息-截止日期
processDraft.setProcessDueDate(basicProcessInfoDTO.getProcessDueDate()); // 流程信息-截止日期 processDraft.setProcessDescription(basicProcessInfoDTO.getProcessDescription()); // 流程信息-流程说明
processDraft.setProcessDescription(basicProcessInfoDTO.getProcessDescription()); // 流程信息-流程说明 processDraft.setTaskId(taskId); // 任务id
processDraft.setTaskId(taskId); // 任务id processDraft.setHandleText(handleText); // 流程审批信息-备注
processDraft.setHandleText(handleText); // 流程审批信息-备注 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(StringUtils.isNotBlank(taskId) ? SAVE_BY_TASK : SAVE_BY_DRAFT);//保存来源(1：待办 2：草稿)
processDraftService.save(processDraft);
processDraftService.save(processDraft);
}
} }
@Override @Override