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

待办 任务与 首页待办冲突问题处理

Browse Source
This commit is contained in:
gaojiabao
2023-05-15 14:54:40 +08:00
parent 717d1b7b06
commit de34688afc
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+4 -1
View File
@@ -85,9 +85,12 @@ public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST) @RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST)
Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST) @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); List<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserIdInfo(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery);
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+5
View File
@@ -473,4 +473,9 @@ public class workFlowFeignClientImpl {
public String endPrcName(String prcName,String esId) { public String endPrcName(String prcName,String esId) {
return workFlowFeignClient.endPrcName(prcName,esId); return workFlowFeignClient.endPrcName(prcName,esId);
} }
public List<BusProcessName> todoTaskListByUserIdInfo(TaskCommonQuery taskCommonQuery) {
List<BusProcessName> mapWrapper = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery);
return mapWrapper;
}
} }
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+1 -1
View File
@@ -532,7 +532,7 @@ public class WorkFlowController extends BaseController {
@ApiOperation(value = "我的待办任务列表") @ApiOperation(value = "我的待办任务列表")
@PostMapping("/todoTaskList") @PostMapping("/todoTaskList")
public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) { public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery);
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>(); PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
if (busProcessNames != null) { if (busProcessNames != null) {