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

fix: 81873 年度制修订计划(标准化发起)--不同的主起草单位主管级领导审批下发，相同的主起草人填写信息，第2个处理的待办数据合并了

Browse Source
This commit is contained in:
mzaxd
2024-02-22 17:02:18 +08:00
parent 32f44760ce
commit 04208ff900
2 changed files with 6 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/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java
+5 -2
View File
@@ -5,6 +5,7 @@ import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit
import com.jero.modules.activiti.process.esAnnualInit.service.impl.ProcessEsAnnualInitServiceImpl; import com.jero.modules.activiti.process.esAnnualInit.service.impl.ProcessEsAnnualInitServiceImpl;
import com.jero.modules.activiti.util.ThreadLocalUtil; import com.jero.modules.activiti.util.ThreadLocalUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.TaskService;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -23,6 +24,9 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener {
@Resource @Resource
private ProcessEsAnnualInitServiceImpl annualInitService; private ProcessEsAnnualInitServiceImpl annualInitService;
@Resource
private TaskService taskService;
/** /**
* 流程结束之后需要把数据存入企标计划数据库 * 流程结束之后需要把数据存入企标计划数据库
* *
@@ -30,7 +34,7 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener {
*/ */
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
String contactExecutionId = (String) ThreadLocalUtil.get("contactExecutionId"); String contactExecutionId = (String) taskService.getVariable(delegateTask.getId(), "contactExecutionId");
String executionId = delegateTask.getExecutionId(); String executionId = delegateTask.getExecutionId();
String approvalUser = (String) delegateTask.getVariable("approvalUser"); String approvalUser = (String) delegateTask.getVariable("approvalUser");
LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
@@ -39,6 +43,5 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener {
List<ProcessEsAnnualInit> list = annualInitService.list(wrapper); List<ProcessEsAnnualInit> list = annualInitService.list(wrapper);
list.forEach(l -> l.setExecutionId(executionId)); list.forEach(l -> l.setExecutionId(executionId));
annualInitService.updateBatchById(list); annualInitService.updateBatchById(list);
ThreadLocalUtil.remove();
} }
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+1 -1
View File
@@ -323,7 +323,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap); processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setExecutionId(executionId));
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
ThreadLocalUtil.put("contactExecutionId", executionId); taskService.setVariable(taskId, "contactExecutionId", executionId);
} else { } else {
// 找到所有被驳回的数据，发起新流程 // 找到所有被驳回的数据，发起新流程
annualInitData.setDataList(dbDataList); annualInitData.setDataList(dbDataList);