From ed0a71a11aeffcbb441d5a67e2a5663bd0f0e8ed Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 03 Apr 2023 08:57:42 +0800
Subject: [PATCH] 巡查项接口新增调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index 6812782..957f49c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
+import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,8 +35,8 @@
*/
@ApiOperation(value="巡查任务-分页列表查询", notes="巡查任务-分页列表查询")
@GetMapping(value = "/list")
- public R queryPageList(PatrolTask patrolTask, Query query) {
- IPage<PatrolTask> pageList = patrolTaskService.selectPatrolTask(Condition.getPage(query),patrolTask);
+ public R queryPageList(PatrolTaskVO patrolTask, Query query) {
+ IPage<PatrolTaskVO> pageList = patrolTaskService.selectPatrolTask(Condition.getPage(query),patrolTask);
// IPage<PatrolTask> pageList = patrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(PatrolTask));
return R.data(pageList);
}
@@ -107,4 +108,16 @@
}
+ /**
+ * 查询巡查人员统计数据信息
+ * @param patrolTask
+ * @return
+ */
+ @ApiOperation(value="查询巡查人员统计数据信息", notes="查询巡查人员统计数据信息")
+ @GetMapping(value = "/getPatrolTaskStatistic")
+ public R getPatrolTaskStatistic(PatrolTaskVO patrolTask) {
+ return R.data(patrolTaskService.getPatrolTaskStatistic(patrolTask));
+ }
+
+
}
--
Gitblit v1.9.3