Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

核心信息提取,并且应用到【我的工作】中的三个tab

Browse Source
This commit is contained in:
hongawen
2024-06-19 10:17:33 +08:00
parent 3b4c448b34
commit dec5914265
10 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessInstanceController.java
View File

@@ -92,7 +92,7 @@ public class BpmProcessInstanceController extends BaseController {
convertSet(pageResult.getList(), HistoricProcessInstance::getProcessDefinitionId));
Map<String, BpmCategory> categoryMap = categoryService.getCategoryMap(
convertSet(processDefinitionMap.values(), ProcessDefinition::getCategory));
PageResult<BpmProcessInstanceVO> bpmProcessInstanceVOPageResult = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePage(pageResult, processDefinitionMap, categoryMap, taskMap, null, null);
PageResult<BpmProcessInstanceVO> bpmProcessInstanceVOPageResult = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePage(pageResult, processDefinitionMap, categoryMap, taskMap, null, null,businessCommonFeignClient);
//封装调整为当前系统的格式
Page<BpmProcessInstanceVO> page = new Page<>();
page.setRecords(bpmProcessInstanceVOPageResult.getList());
@@ -129,7 +129,7 @@ public class BpmProcessInstanceController extends BaseController {
Map<String, Dept> deptMap = CollectionUtils.convertMap(deptList, Dept::getId);
PageResult<BpmProcessInstanceVO> bpmProcessInstanceVOPageResult = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePage(pageResult,
processDefinitionMap, categoryMap, taskMap, userMap, deptMap);
processDefinitionMap, categoryMap, taskMap, userMap, deptMap,businessCommonFeignClient);
//封装调整为当前系统的格式
Page<BpmProcessInstanceVO> page = new Page<>();
page.setRecords(bpmProcessInstanceVOPageResult.getList());

4
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java
View File

@@ -117,7 +117,7 @@ public class BpmTaskController extends BaseController {
convertSet(pageResult.getList(), HistoricTaskInstance::getProcessInstanceId));
List<UserVO> userList = userFeignClient.getUserVOByIdList(convertList(processInstanceMap.values(), HistoricProcessInstance::getStartUserId)).getData();
Map<String, UserVO> userMap = CollectionUtils.convertMap(userList, UserVO::getId);
PageResult<BpmTaskVO> bpmTaskRespVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, null);
PageResult<BpmTaskVO> bpmTaskRespVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, null,businessCommonFeignClient);
//封装调整为当前系统的格式
Page<BpmTaskVO> page = new Page<>();
page.setRecords(bpmTaskRespVOPageResult.getList());
@@ -150,7 +150,7 @@ public class BpmTaskController extends BaseController {
Map<String, UserVO> userMap = CollectionUtils.convertMap(userList, UserVO::getId);
List<Dept> deptList = deptFeignClient.getDeptInfoListByIds(convertList(userMap.values(), UserVO::getDeptId)).getData();
Map<String, Dept> deptMap = CollectionUtils.convertMap(deptList, Dept::getId);
PageResult<BpmTaskVO> bpmTaskVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, deptMap);
PageResult<BpmTaskVO> bpmTaskVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, deptMap,businessCommonFeignClient);
//封装调整为当前系统的格式
Page<BpmTaskVO> page = new Page<>();