FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20240430' into 'master'

Browse Source 
Fix foton 20240430

See merge request laws-foton-slrs/foton-wkflow-rest!90
This commit is contained in:
王晓勇
2024-05-09 09:47:34 +00:00
parent adfb662fcf 5352591652
commit ebfe05cdfc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+6 -5
View File
@@ -908,14 +908,15 @@ public class TodoTaskController extends BaseAction {
wrapper.eq("EXEC_STATUS",0); wrapper.eq("EXEC_STATUS",0);
long count = oaTaskExecService.count(wrapper); long count = oaTaskExecService.count(wrapper);
processNew.setCommitStatus(count); processNew.setCommitStatus(count);
// 设置processNew表流程状态为已接收 // 设置processNew表流程状态为已接收，已废弃
LambdaUpdateWrapper<BusProcessNew> updateWrapper = new LambdaUpdateWrapper<>(); // LambdaUpdateWrapper<BusProcessNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(BusProcessNew::getTaskId,taskIdList); // updateWrapper.in(BusProcessNew::getTaskId,taskIdList);
updateWrapper.set(BusProcessNew::getReceiveStatus,"已接收"); // updateWrapper.set(BusProcessNew::getReceiveStatus,"已接收");
iBusProcessNewService.update(updateWrapper); // iBusProcessNewService.update(updateWrapper);
LambdaUpdateWrapper<BusProcessHistory> bphUpdateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<BusProcessHistory> bphUpdateWrapper = new LambdaUpdateWrapper<>();
bphUpdateWrapper.in(BusProcessHistory::getTaskId,taskIdList); bphUpdateWrapper.in(BusProcessHistory::getTaskId,taskIdList);
bphUpdateWrapper.ne(BusProcessHistory::getTaskStatus, TaskStatusEnum.DONE.getValue());
bphUpdateWrapper.set(BusProcessHistory::getTaskStatus, TaskStatusEnum.RECEIVED.getValue()); bphUpdateWrapper.set(BusProcessHistory::getTaskStatus, TaskStatusEnum.RECEIVED.getValue());
this.busProcessHistoryService.update(bphUpdateWrapper); this.busProcessHistoryService.update(bphUpdateWrapper);
return processNew; return processNew;