diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessHistory.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessHistory.java index 9830bf0f..68957cac 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessHistory.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessHistory.java @@ -95,4 +95,12 @@ public class BusProcessHistory { private String taskStatusShow; @TableField(exist = false) private String taskKeyShow; + @TableField(exist = false) + private String bpnId; + @TableField(exist = false) + private String prcId; + @TableField(exist = false) + private String prcName; + @TableField(exist = false) + private String prcNum; } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java index 3d688703..5bb6801e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java @@ -8,6 +8,7 @@ import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.*; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessHistoryMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.util.enums.FlowTypeEnum; import com.ydw.bat.wkflow.util.enums.StandardCommentNewProcessNodeKeyEnum; import com.ydw.bat.wkflow.util.enums.TaskStatusEnum; @@ -28,6 +29,9 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl queryFlowHistoryList(BusProcessHistory busProcessHistory) { QueryWrapper bphQueryWrap = new QueryWrapper<>(); @@ -38,7 +42,7 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl bphList = this.list(bphQueryWrap); - this.disposeData(bphList); + this.disposeData(bphList,busProcessHistory.getActiProcInstId()); List firstBphList = bphList.stream().filter(bph -> StringUtils.isEmpty(bph.getManyPId())).distinct().collect(Collectors.toList()); for (BusProcessHistory processHistory : firstBphList) { if (StringUtils.equals(processHistory.getIsMany(),"1")) { @@ -119,9 +123,16 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl disposeData(List datas) { + private List disposeData(List datas,String actiProcInstId) { List results = new ArrayList<>(); if (CollectionUtils.isNotEmpty(datas)) { + BusProcessName bpn = null; + if (StringUtils.isNotEmpty(actiProcInstId)) { + QueryWrapper bpnQueryWrap = new QueryWrapper<>(); + bpnQueryWrap.lambda().eq(BusProcessName::getPrcId,actiProcInstId); + bpn = this.busProcessNameService.getOne(bpnQueryWrap); + } + for (BusProcessHistory data : datas) { if (StringUtils.isNotEmpty(data.getUserId())) { ResponseMessage assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(data.getUserId()); @@ -144,6 +155,13 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl bphList = this.list(bphQueryWrap); - this.disposeData(bphList); + this.disposeData(bphList,busProcessHistory.getActiProcInstId()); FlowTypeEnum flowTypeEnum = FlowTypeEnum.getFlowTypeEnumByValue(busProcessHistory.getFlowType()); switch (flowTypeEnum) { @@ -293,7 +311,13 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl StringUtils.isNotEmpty(bph.getUserName())).map(BusProcessHistory::getUserName).distinct().collect(Collectors.joining(",")); + userNames = bphListByTaskKey.stream().filter(bph -> { + boolean flag = false; + if (StringUtils.isNotEmpty(bph.getUserName())) { + flag = true; + } + return flag; + }).map(BusProcessHistory::getUserName).distinct().collect(Collectors.joining(",")); taskStatus = TaskStatusEnum.DONE.getValue(); for (BusProcessHistory busProcessHistory : bphListByTaskKey) { if (StringUtils.isEmpty(busProcessHistory.getTaskId())