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

fix: 81876 企标制修订流程--部门联络人汇总，列表数据不对

Browse Source
This commit is contained in:
mzaxd
2024-02-22 18:00:20 +08:00
parent 04208ff900
commit 58858931e7
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/AdviceCreateListener.java
+29
View File
@@ -0,0 +1,29 @@
package com.jero.modules.activiti.process.esRevision.listener;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.TaskService;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
* @author: Mzaxd
* @Date: 2023/10/10 14:14
*/
@Slf4j
@Component("adviceCreateListener")
public class AdviceCreateListener implements TaskListener {
@Resource
private TaskService taskService;
@Override
public void notify(DelegateTask delegateTask) {
String parentExecutionId = (String) taskService.getVariable(delegateTask.getId(), "contactExecutionId");
delegateTask.setVariable(delegateTask.getExecutionId() + "-ContactExecutionId", parentExecutionId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+3 -2
View File
@@ -361,6 +361,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
case CONTACT_USER_COLLECT:
// 根据联络人找到部门联络人主管级领导
LambdaQueryWrapper<LawsContactManage> contactWrapper = new LambdaQueryWrapper<>();
advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
contactWrapper.eq(LawsContactManage::getContactId, userId);
List<LawsContactManage> list = contactManageService.list(contactWrapper);
if (list != null && !list.isEmpty()) {
@@ -519,7 +520,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
List<String> adviceUserList = Arrays.asList(workGroup.split(","));
runtimeService.setVariable(executionId, "adviceUserList", adviceUserList);
runtimeService.setVariable(executionId, executionId + "-adviceDeadline", data.getAdviceDeadline());
runtimeService.setVariable(executionId, contactUser + "-ExecutionId", executionId);
runtimeService.setVariable(executionId, "contactExecutionId", executionId);
userMap.put("adviceUserList", workGroup);
processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
// 设置截止时间
@@ -530,7 +531,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
advices = data.getAdvices();
advices.forEach(advice -> advice.setCreateUserId(userId));
advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
String contactUserExecutionId = (String) runtimeService.getVariable(executionId, contactUser + "-ExecutionId");
String contactUserExecutionId = (String) runtimeService.getVariable(executionId, executionId + "-ContactExecutionId");
advices.forEach(advice -> advice.setExecutionId(contactUserExecutionId));
adviceService.saveBatch(advices);
break;