From 26f6f43785afd992496d7fc79775124e557ff16d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 17:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
index aa71218..0f1d029 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
@@ -11,6 +11,7 @@
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.service.TMissionReassignService;
import com.ruoyi.system.service.TMissionService;
+import com.ruoyi.system.vo.TMissionReassignVO;
import com.ruoyi.system.vo.TMissionVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -44,12 +45,34 @@
/**
* 任务管理列表
*/
- //@PreAuthorize("@ss.hasPermi('system:mission:list')")
- @ApiOperation(value = "任务管理分页列表", response = TMissionQuery.class)
- @PostMapping(value = "/api/t-mission/pageList")
- public R<PageInfo<TMissionVO>> pageList(@RequestBody String param) {
+ //@PreAuthorize("@ss.hasPermi('system:mission:pageListAssigned')")
+ @ApiOperation(value = "任务管理分页列表-待分配任务池", response = TMissionQuery.class)
+ @PostMapping(value = "/api/t-mission/pageListAssigned")
+ public R<PageInfo<TMissionVO>> pageListAssigned(@RequestBody String param) {
TMissionQuery query = JSON.parseObject(param, TMissionQuery.class);
- return R.ok(missionService.pageList(query));
+ return R.ok(missionService.pageListAssigned(query));
+ }
+
+ /**
+ * 任务管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:mission:pageListReassignAudit')")
+ @ApiOperation(value = "任务管理分页列表-改派支援审核", response = TMissionReassignVO.class)
+ @PostMapping(value = "/api/t-mission/pageListReassignAudit")
+ public R<PageInfo<TMissionReassignVO>> pageListReassignAudit(@RequestBody String param) {
+ TMissionQuery query = JSON.parseObject(param, TMissionQuery.class);
+ return R.ok(missionService.pageListReassignAudit(query));
+ }
+
+ /**
+ * 任务管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:mission:pageListMissionPool')")
+ @ApiOperation(value = "任务管理分页列表-抢单任务池", response = TMissionVO.class)
+ @PostMapping(value = "/api/t-mission/pageListMissionPool")
+ public R<PageInfo<TMissionVO>> pageListMissionPool(@RequestBody String param) {
+ TMissionQuery query = JSON.parseObject(param, TMissionQuery.class);
+ return R.ok(missionService.pageListMissionPool(query));
}
/**
--
Gitblit v1.7.1