From b0f656f209539a5ee52e103018e86e7b7692e313 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 18 八月 2023 10:55:20 +0800
Subject: [PATCH] 单兵端--巡检单天计划
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 ceb9c26..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
@@ -13,6 +13,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.pagehelper.JpaPageHelper;
+import com.ruoyi.utils.pagehelper.JpaPageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.catalina.security.SecurityUtil;
@@ -41,8 +43,7 @@
public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
- @Autowired
- private ISysUserService sysUserService;
+
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
@@ -60,8 +61,9 @@
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
public TableDataInfo userlist(ArdAppTask ardAppTask) {
- List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
- return getDataTable(ardAppTasks);
+ startPage();
+ List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
+ return getDataTable(list);
}
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@@ -87,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