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:
liao
2023-11-23 09:49:04 +08:00
parent 115b8d57af
commit 511bdd4b45
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java
+1 -1
View File
@@ -88,7 +88,7 @@ public interface IProcessHandleService {
* @Date: 2023/11/20 16:48 * @Date: 2023/11/20 16:48
* @Description: 删除自己的草稿 * @Description: 删除自己的草稿
**/ **/
void deleteMyDraft(String businessId); void deleteMyDraft(String taskId);
/** /**
* @Author: liao * @Author: liao
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+7 -7
View File
@@ -66,7 +66,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
@Transactional @Transactional
public String startProcess(ProcessInfoVO processInfoVO) { public String startProcess(ProcessInfoVO processInfoVO) {
// 删除自己的草稿 // 删除自己的草稿
deleteMyDraft(processInfoVO.getBusinessId()); deleteMyDraft(processInfoVO.getBasicTaskInfoDTO().getTaskId());
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); // 流程信息 BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); // 流程信息
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map
@@ -126,7 +126,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
isMyTask(taskId); isMyTask(taskId);
// 删除自己的草稿 // 删除自己的草稿
deleteMyDraft(processInfoVO.getBusinessId()); deleteMyDraft(taskId);
ProcessDTO processDTO = getProcessDTO(taskId); ProcessDTO processDTO = getProcessDTO(taskId);
String processInstanceId = processDTO.getProcessInstanceId(); String processInstanceId = processDTO.getProcessInstanceId();
@@ -189,7 +189,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId); ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
// 删除自己的草稿 // 删除自己的草稿
deleteMyDraft(processApprovalRecord.getProjectId()); deleteMyDraft(taskId);
processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人 processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人
processApprovalRecord.setUserId(toUserId); // 任务处理人 processApprovalRecord.setUserId(toUserId); // 任务处理人
@@ -281,7 +281,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
// 删除自己的草稿 // 删除自己的草稿
deleteMyDraft(processInfoVO.getBusinessId()); deleteMyDraft(basicTaskInfoDTO.getTaskId());
ProcessDraft processDraft = new ProcessDraft(); ProcessDraft processDraft = new ProcessDraft();
processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id
@@ -303,10 +303,10 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
**/ **/
@Transactional @Transactional
@Override @Override
public void deleteMyDraft(String businessId) { public void deleteMyDraft(String taskId) {
if (StringUtils.isNotBlank(businessId)) { if (StringUtils.isNotBlank(taskId)) {
LambdaQueryWrapper<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>();
deleteWrapper.eq(ProcessDraft::getProjectId, businessId); deleteWrapper.eq(ProcessDraft::getTaskId, taskId);
deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
processDraftService.remove(deleteWrapper); processDraftService.remove(deleteWrapper);
} }