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

Merge remote-tracking branch 'origin/thirdStage' into thirdStage

Browse Source
This commit is contained in:
yjz
2024-01-17 18:00:58 +08:00
parent f4b0e6e508 a35df886e2
commit a511fd25e3
3 changed files with 3 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/service/impl/ProcessEsAnnualInitServiceImpl.java
+1 -1
View File
@@ -211,10 +211,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
@Override @Override
public AnnualInitDataVO getHandleData(String taskId) { public AnnualInitDataVO getHandleData(String taskId) {
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
if (!actFlowCommonService.taskExists(taskId)) { if (!actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("任务不存在"); throw new JeroBootException("任务不存在");
} }
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId(); String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
// 根据当前执行Id获取所有子执行Id // 根据当前执行Id获取所有子执行Id
List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId); List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+1 -1
View File
@@ -270,11 +270,11 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
@Override @Override
public AnnualReportDataVO getHandleData(String taskId) { public AnnualReportDataVO getHandleData(String taskId) {
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
// 判断是否是转办的 找到原始任务办理人 // 判断是否是转办的 找到原始任务办理人
if (!actFlowCommonService.taskExists(taskId)) { if (!actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("任务不存在"); throw new JeroBootException("任务不存在");
} }
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId(); String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO(); AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO();
// 使用流程引擎根据taskId找到流程实例Id // 使用流程引擎根据taskId找到流程实例Id
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+1 -1
View File
@@ -224,10 +224,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
@Override @Override
public ESRevisionDataVO getHandleData(String taskId) { public ESRevisionDataVO getHandleData(String taskId) {
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
if (!actFlowCommonService.taskExists(taskId)) { if (!actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("任务不存在"); throw new JeroBootException("任务不存在");
} }
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId(); String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
// 根据当前执行Id获取所有子执行Id // 根据当前执行Id获取所有子执行Id
List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId); List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);