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

fix(稽查流程): 79726

Browse Source
This commit is contained in:
yjz
2023-12-29 14:23:01 +08:00
parent 0da2cb2484
commit 0321614481
6 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+5
View File
@@ -304,6 +304,11 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
if (task!= null) {
// 完成任务
taskService.complete(task.getId(), map);
// 再次更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()));
// 判断是否是最后一个节点
if (isLastNode(processAll.getProcessInstanceId())){
// 企标稽查计划 生成数据 保存企标库
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
+5
View File
@@ -259,6 +259,11 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
if (task!= null) {
// 完成任务
taskService.complete(task.getId(), map);
// 再次更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()));
// 判断是否是最后一个节点
if (isLastNode(processAll.getProcessInstanceId())){
// 稽查延期申请流程 生成数据 企业标准稽查延期
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
+7 -2
View File
@@ -347,9 +347,14 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
if (task != null) {
// 稽查联络人汇总节点保存会签信息
saveCountersign(esInspectPlanFlowVO, map, task);
saveCountersign(esInspectPlanFlowVO, map);
// 完成任务
taskService.complete(task.getId(), map);
// 再次更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()));
// 可跳过节点处理
if (map.containsKey("pass") && (boolean) map.get("pass")){
// 更新流程实例节点关联用户表
@@ -392,7 +397,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
}
}
private static void saveCountersign(EsInspectPlanFlowVO esInspectPlanFlowVO, Map<String, Object> map, Task task) {
private static void saveCountersign(EsInspectPlanFlowVO esInspectPlanFlowVO, Map<String, Object> map) {
if (map.containsKey("pass") && (boolean) map.get("pass")){
if (StringUtils.isNotBlank(esInspectPlanFlowVO.getCountersign())){
map.put(COUNTERSIGN, esInspectPlanFlowVO.getCountersign());
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
+5
View File
@@ -262,6 +262,11 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
if (task!= null) {
// 完成任务
taskService.complete(task.getId(), map);
// 再次更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()));
// 判断是否是最后一个节点
if (isLastNode(processAll.getProcessInstanceId())){
ProcessEsInspectRectifyVO processEsInspectReportVO = processEsInspectRectifyService.queryByProjectId(processAll.getProjectId());
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
+5
View File
@@ -263,6 +263,11 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
if (task!= null) {
// 完成任务
taskService.complete(task.getId(), map);
// 再次更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()));
// 判断是否是最后一个节点
if (isLastNode(processAll.getProcessInstanceId())
&& map.containsKey("pass") && (boolean) map.get("pass")){
laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
+5 -1
View File
@@ -284,7 +284,11 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
if (task!= null) {
// 完成任务
taskService.complete(task.getId(), map);
// 再次更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()));
// 查询业务表数据
ProcessMeetingManage processMeetingManage = processMeetingManageService.getOne(
new LambdaQueryWrapper<ProcessMeetingManage>()