From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index 2208a01..b3a69c0 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -43,8 +43,7 @@
public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
- @Autowired
- private ISysUserService sysUserService;
+
/**
* 查询app任务管理列表
@@ -61,14 +60,10 @@
@ApiOperation("单兵端 - 下发给我的任务列表")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
- public AjaxResult userlist(ArdAppTask ardAppTask) {
- Integer pageNum = ardAppTask.getPageNum();
- Integer pageSize = ardAppTask.getPageSize();
- List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
- /*分页方式1*/
- JpaPageHelper.startPage(pageNum,pageSize);
- JpaPageInfo pageInfo = new JpaPageInfo(ardAppTasks);
- return AjaxResult.success(pageInfo);
+ public TableDataInfo userlist(ArdAppTask ardAppTask) {
+ startPage();
+ List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
+ return getDataTable(list);
}
@ApiOperation("单兵端 - 下发给我的任务详情")
@@ -94,9 +89,10 @@
/**
* 获取app任务管理详细信息
*/
+ @ApiOperation("指挥端-获取app任务管理详细信息")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardAppTaskService.selectArdAppTaskById(id));
}
--
Gitblit v1.9.3