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

标准征求意见流程-流程图、流程历史对接

Browse Source
This commit is contained in:
wangzhijiang
2024-01-29 14:19:53 +08:00
parent dab9d57c13
commit 5e97b14f62
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java
+12 -10
View File
@@ -123,18 +123,20 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl<BusProcessHistory
List<BusProcessHistory> results = new ArrayList<>(); List<BusProcessHistory> results = new ArrayList<>();
if (CollectionUtils.isNotEmpty(datas)) { if (CollectionUtils.isNotEmpty(datas)) {
for (BusProcessHistory data : datas) { for (BusProcessHistory data : datas) {
ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(data.getUserId()); if (StringUtils.isNotEmpty(data.getUserId())) {
String userName = ""; ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(data.getUserId());
if(assignee.getData()!=null){ String userName = "";
if (assignee.getData().getDisableFlag() == 1) { if (assignee.getData() != null) {
userName = assignee.getData().getUname() + "("+ assignee.getData().getUsid() +")" + "(已禁用)"; if (assignee.getData().getDisableFlag() == 1) {
userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")" + "(已禁用)";
} else {
userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")";
}
} else { } else {
userName = assignee.getData().getUname() + "(" + assignee.getData().getUsid() + ")"; userName = data.getUserId();
} }
} else { data.setUserName(userName);
userName = data.getUserId();
} }
data.setUserName(userName);
data.setTaskStatusShow(TaskStatusEnum.getLabelByValue(data.getTaskStatus())); data.setTaskStatusShow(TaskStatusEnum.getLabelByValue(data.getTaskStatus()));
String taskKeyShow = ""; String taskKeyShow = "";
@@ -291,7 +293,7 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl<BusProcessHistory
String taskStatus = ""; String taskStatus = "";
String userNames = ""; String userNames = "";
if (CollectionUtils.isNotEmpty(bphListByTaskKey)) { if (CollectionUtils.isNotEmpty(bphListByTaskKey)) {
userNames = bphListByTaskKey.stream().map(BusProcessHistory::getUserName).distinct().collect(Collectors.joining(",")); userNames = bphListByTaskKey.stream().filter(bph -> StringUtils.isNotEmpty(bph.getUserName())).map(BusProcessHistory::getUserName).distinct().collect(Collectors.joining(","));
taskStatus = TaskStatusEnum.DONE.getValue(); taskStatus = TaskStatusEnum.DONE.getValue();
for (BusProcessHistory busProcessHistory : bphListByTaskKey) { for (BusProcessHistory busProcessHistory : bphListByTaskKey) {
if (StringUtils.isEmpty(busProcessHistory.getTaskId()) if (StringUtils.isEmpty(busProcessHistory.getTaskId())