Merge branch 'fix_foton_20240430' into 'master'

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
@@ -908,14 +908,15 @@ public class TodoTaskController extends BaseAction {
wrapper.eq("EXEC_STATUS",0);
long count = oaTaskExecService.count(wrapper);
processNew.setCommitStatus(count);
// 设置processNew表流程状态为已接收
LambdaUpdateWrapper<BusProcessNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(BusProcessNew::getTaskId,taskIdList);
updateWrapper.set(BusProcessNew::getReceiveStatus,"已接收");
iBusProcessNewService.update(updateWrapper);
// 设置processNew表流程状态为已接收,已废弃
// LambdaUpdateWrapper<BusProcessNew> updateWrapper = new LambdaUpdateWrapper<>();
// updateWrapper.in(BusProcessNew::getTaskId,taskIdList);
// updateWrapper.set(BusProcessNew::getReceiveStatus,"已接收");
// iBusProcessNewService.update(updateWrapper);
LambdaUpdateWrapper<BusProcessHistory> bphUpdateWrapper = new LambdaUpdateWrapper<>();
bphUpdateWrapper.in(BusProcessHistory::getTaskId,taskIdList);
bphUpdateWrapper.ne(BusProcessHistory::getTaskStatus, TaskStatusEnum.DONE.getValue());
bphUpdateWrapper.set(BusProcessHistory::getTaskStatus, TaskStatusEnum.RECEIVED.getValue());
this.busProcessHistoryService.update(bphUpdateWrapper);
return processNew;