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-28 20:25:34 +08:00
parent 922774d705
commit f08c479a85
1 changed files with 17 additions and 14 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/impl/ProcessFbStandardConsultationServiceImpl.java
+17 -14
View File
@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.fb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.util.UUIDUtils;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.entity.ProcessNode;
import com.jero.modules.activiti.entity.ProcessNodeLink;
import com.jero.modules.activiti.enums.CommitFlagEnum;
@@ -23,6 +24,7 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultati
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.activiti.service.ProcessNodeService;
import com.jero.modules.laws.common.util.CurrentUserUtil;
@@ -72,6 +74,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
private ProcessNodeLinkService processNodeLinkService;
@Resource
private ISysUserService sysUserService;
@Resource
private ProcessApprovalRecordService processApprovalRecordService;
public static final String EXCEPTION = "目前还未开发，请联系管理员";
@@ -192,7 +196,6 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
// 法规工程师驳回 任务列表
List<Task> chooseTaskList = taskService.createTaskQuery()
.processInstanceId(processInstanceId)
.processDefinitionKey(ConsultationTaskKey.REJECT)
.list();
// 自动完成任务选择
@@ -214,6 +217,12 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
}
// 完成驳回任务
taskService.complete(chooseTaskId);
// 删除驳回的审批记录
LambdaQueryWrapper<ProcessApprovalRecord> removeWrapper = new LambdaQueryWrapper<>();
removeWrapper.eq(ProcessApprovalRecord::getTaskId, chooseTaskId);
removeWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, processInstanceId);
processApprovalRecordService.remove(removeWrapper);
}
return;
case ConsultationTaskKey.DEPART_LEADER_END_4:
@@ -561,22 +570,13 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
log.info("流程 {} 已经结束", processInstanceId);
} else {
List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list();
List<Execution> executionList = runtimeService.createExecutionQuery().processInstanceId(processInstanceId).list();
log.info("还剩 {} 个任务待完成", taskList.size());
taskList.forEach(lastTask -> {
log.info("=======================================================================");
log.info("任务id: {}", lastTask.getId());
log.info("任务name: {}", lastTask.getName());
log.info("任务executionId: {}", lastTask.getExecutionId());
log.info("=======================================================================");
});
log.info("还剩 {} 个执行实例待完成", executionList.size());
executionList.forEach(lastExecution -> {
log.info("=======================================================================");
log.info("执行实例id: {}", lastExecution.getId());
log.info("执行实例parentId: {}", lastExecution.getParentId());
log.info("执行实例name: {}", lastExecution.getName());
log.info("执行实例activityId: {}", lastExecution.getActivityId());
SysUser user = sysUserService.getById(lastTask.getAssignee());
log.info("处理人: {}", user.getUsername() + "(" + user.getRealname() + ")");
log.info("=======================================================================");
});
}
@@ -657,8 +657,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
userLinkList.add(userLink);
});
processFbConsultationUserLinkService.removeById(userLinkId); // 先删除
processFbConsultationUserLinkService.saveBatch(userLinkList, userLinkList.size()); // 后新增
int size = userLinkList.size();
if (size > 0) {
processFbConsultationUserLinkService.removeById(userLinkId); // 先删除
processFbConsultationUserLinkService.saveBatch(userLinkList, size); // 后新增
}
}