|
@@ -255,7 +255,7 @@ public class ServiceController {
|
|
|
@ApiOperation("查询我的待办任务列表")
|
|
|
@GetMapping("/act/mylist")
|
|
|
@ResponseBody
|
|
|
- public Result mylist(@RequestParam("pageNo") int pageNo,@RequestParam("pageSize") int pageSize)
|
|
|
+ public Result mylist(@RequestParam("pageNo") int pageNo,@RequestParam("pageSize") int pageSize,@RequestParam("key") String key)
|
|
|
{
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
String userId = user.getId();
|
|
@@ -263,7 +263,7 @@ public class ServiceController {
|
|
|
|
|
|
// 过滤掉流程挂起的待办任务
|
|
|
int total = condition.active().orderByTaskCreateTime().desc().list().size();
|
|
|
- List<Task> taskList = condition.active().orderByTaskCreateTime().desc().listPage((pageNo-1) * pageSize, pageSize);
|
|
|
+ List<Task> taskList = condition.active().orderByTaskCreateTime().processInstanceId(key).desc().listPage((pageNo-1) * pageSize, pageSize);
|
|
|
List<TaskInfo> tasks = new ArrayList<>();
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
taskList.stream().forEach(a->{
|