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 10:46:43 +08:00
parent 1392c58727
commit 789852e523
2 changed files with 18 additions and 11 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
+15 -11
View File
@@ -241,19 +241,23 @@ 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("assigneeId", assignee.getData().getUsid()); historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
QueryWrapper queryWrapper2 = new QueryWrapper(); } else {
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); historicTaskInstance.put("assignee", assignee.getData().getUname());
queryWrapper2.orderByDesc("CREATE_TIME"); historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2); QueryWrapper queryWrapper2 = new QueryWrapper();
String str = ""; queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
if(list1.size()>0){ queryWrapper2.orderByDesc("CREATE_TIME");
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId()); List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)"); String str = "";
if(list1.size()>0){
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId());
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
}
} }
} }
} }
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+3
View File
@@ -63,6 +63,9 @@ public interface LawsUserInfoService {
@GetMapping("sys/user/getById") @GetMapping("sys/user/getById")
public ResponseMessage<UserVO> getById(@RequestParam("id") String id); public ResponseMessage<UserVO> getById(@RequestParam("id") String id);
@GetMapping("sys/user/getByIdWithDisabled")
public ResponseMessage<UserVO> getByIdFeignClientWithDisabled(@RequestParam("id") String id);
@GetMapping("lawss/sarProductInfo/queryMap") @GetMapping("lawss/sarProductInfo/queryMap")
public ResponseMessage<Map<String, List<String>>> queryMap(); public ResponseMessage<Map<String, List<String>>> queryMap();