root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzq
2024-05-14 10:39:21 +08:00
parent c81d454a4f 3488d4b843
commit b713e082f5
5 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java
View File

@@ -42,25 +42,6 @@ public class ActRuExecutionServiceImpl extends ServiceImpl<ActRuExecutionMapper,
Page<ActRuExecution> executionPage = this.page(page.build(), lqw);
List<ActRuExecution> records = executionPage.getRecords();
this.findChildren(records);
// for (ActRuExecution record : records) {
// LambdaQueryWrapper<ActRuExecution> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.eq(ActRuExecution::getParent_id, record.getProc_inst_id());
// List<ActRuExecution> list = this.list(lambdaQueryWrapper);
// ActReProcdef procdef = procdefService.getById(record.getDeployment_id());
// if (ObjectUtil.isNotEmpty(procdef)) {
// record.setDeployment_name(procdef.getName());
// }
// if (CollectionUtil.isNotEmpty(list)) {
// for (ActRuExecution execution : list) {
// ActReProcdef procdefChildren = procdefService.getById(execution.getDeployment_id());
// if (ObjectUtil.isNotEmpty(procdefChildren)) {
// execution.setDeployment_name(procdefChildren.getName());
// }
// }
// record.setHasChildren(true);
// record.setChildren(list);
// }
// }
return TableDataInfo.build(executionPage);
}