From ead2d1978084349a0d56e122555e76a3c6305fd5 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 三月 2026 14:51:52 +0800
Subject: [PATCH] 任务管理完结功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index b7ca780..1180e8e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -37,29 +37,26 @@
@Autowired
private TaskService taskService;
- @Autowired
- private TaskItemService taskItemService;
- @Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private LocService locService;
- @Autowired
- private ConfigServiceImpl configService;
-
+ /** 鍒嗛〉鏌ヨ浠诲姟鍒楄〃锛屽苟鏍规嵁 mission_flow_step_instance 鍒ゆ柇姣忔潯鏄惁鍙偣瀹屾垚锛坈anComplete锛夛紝渚涘墠绔睍绀哄畬鎴愭寜閽� */
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
- return R.ok().add(taskService.page(pageParam, queryWrapper));
+ Page<Task> pageResult = taskService.page(pageParam, queryWrapper);
+ taskService.fillCanComplete(pageResult.getRecords());
+ return R.ok().add(pageResult);
}
+ /** 鏌ヨ浠诲姟鍒楄〃锛屽悓鏍锋牴鎹� flowStepInstance 濉厖 canComplete */
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(taskService.list());
+ List<Task> list = taskService.list();
+ taskService.fillCanComplete(list);
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -101,15 +98,13 @@
}
@PreAuthorize("hasAuthority('manager:task:remove')")
- @OperationLog("鍙栨秷/鍒犻櫎宸ヤ綔鏋佹。")
- @ApiOperation("鍙栨秷/鍒犻櫎宸ヤ綔鏋佹。")
+ @ApiOperation("鍙栨秷/鍒犻櫎宸ヤ綔妗�")
@PostMapping("/task/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return taskService.removeTask(ids, getLoginUserId());
-// return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -141,7 +136,6 @@
}
return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id, getLoginUserId()));
}
-
/**
* 鎷ｆ枡鍑哄簱锛堢敤浜庢祴璇曟嫞鏂欏嚭搴擄級
--
Gitblit v1.9.1