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

fix: 制修订流程-联络人主管级领导新增意见增加意见提出人

Browse Source
This commit is contained in:
mzaxd
2023-12-27 17:36:38 +08:00
parent 251f76a4e6
commit 043211350d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+11 -1
View File
@@ -247,6 +247,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
} }
break; break;
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
String contactUserLeader = (String) runtimeService.getVariable(executionId, executionId + "-ContactUserLeader");
data.setContactUserLeader(contactUserLeader);
case CONTACT_USER_LEADER_APPROVAL: case CONTACT_USER_LEADER_APPROVAL:
advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId); advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
adviceList = adviceService.list(advicesWrapper); adviceList = adviceService.list(advicesWrapper);
@@ -271,6 +273,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
throw new JeroBootException("taskId为空或任务不存在"); throw new JeroBootException("taskId为空或任务不存在");
} }
String userId = actFlowCommonService.getOriginTaskAssignee(taskId); String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
String curUserId = UserUtils.getUserId();
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 获取执行id // 获取执行id
String executionId = task.getExecutionId(); String executionId = task.getExecutionId();
@@ -405,7 +408,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
data = revisionData.getData(); data = revisionData.getData();
// 先删后增 // 先删后增
runtimeService.setVariable(executionId, "contactUserLeader", data.getContactUserLeader()); String contactUserLeader = data.getContactUserLeader();
runtimeService.setVariable(executionId, "contactUserLeader", contactUserLeader);
runtimeService.setVariable(executionId, executionId + "-ContactUserLeader", contactUserLeader);
userMap.put("contactUserLeader", data.getContactUserLeader()); userMap.put("contactUserLeader", data.getContactUserLeader());
advices = data.getAdvices(); advices = data.getAdvices();
adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId); adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
@@ -429,6 +434,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
adviceService.remove(adviceWrapper); adviceService.remove(adviceWrapper);
advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId)); advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
advices.forEach(advice -> advice.setExecutionId(executionId)); advices.forEach(advice -> advice.setExecutionId(executionId));
advices.forEach(advice -> {
if (StrUtil.isBlank(advice.getCreateUserId())) {
advice.setCreateUserId(curUserId);
}
});
adviceService.saveBatch(advices); adviceService.saveBatch(advices);
} }
break; break;