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

add: 监控流程若用户已禁用，修改显示方式

Browse Source
This commit is contained in:
wxyclub
2023-11-14 15:39:39 +08:00
parent 789852e523
commit 8354de9af5
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+17 -13
View File
@@ -122,10 +122,14 @@ public class TaskController {
historicTaskInstance.put("assignee", str); historicTaskInstance.put("assignee", str);
} }
}else{ }else{
ResponseMessage<UserVO> assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString()); ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(historicTaskInstance.get("assignee").toString());
if(assignee.getData()!=null){ if(assignee.getData()!=null){
historicTaskInstance.put("assignee", assignee.getData().getUname()); if (assignee.getData().getDisableFlag() == 1) {
historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
} else{
historicTaskInstance.put("assignee", assignee.getData().getUname());
}
historicTaskInstance.put("assigneeId", assignee.getData().getUsid()); historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -133,7 +137,7 @@ public class TaskController {
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2); List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
String str = ""; String str = "";
if(list1.size()>0){ if(list1.size()>0){
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId()); ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId());
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)"); historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
} }
} }
@@ -248,16 +252,16 @@ public class TaskController {
historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)"); historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
} else { } else {
historicTaskInstance.put("assignee", assignee.getData().getUname()); historicTaskInstance.put("assignee", assignee.getData().getUname());
historicTaskInstance.put("assigneeId", assignee.getData().getUsid()); }
QueryWrapper queryWrapper2 = new QueryWrapper(); historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.orderByDesc("CREATE_TIME"); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2); queryWrapper2.orderByDesc("CREATE_TIME");
String str = ""; List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
if(list1.size()>0){ String str = "";
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId()); if(list1.size()>0){
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)"); ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId());
} historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
} }
} }
} }