From acf4a8171ae814e0d7fb061d163f95640dc39abc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 10 Aug 2023 17:50:37 +0800
Subject: [PATCH] hst调用修改，大坝安全监测接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 c3d7833..fcfcfa9 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
@@ -7,10 +7,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.BladeFlowPage;
-import cn.gistack.sm.patrol.vo.BladeFlowTask;
-import cn.gistack.sm.patrol.vo.PatrolTaskReport;
-import cn.gistack.sm.patrol.vo.PatrolTaskVO;
+import cn.gistack.sm.patrol.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -164,7 +161,7 @@
@ApiOperation(value = "巡查任务-自定义通过id查询", notes = "巡查任务-自定义通过id查询")
@GetMapping(value = "/getPatrolTaskById")
public R getPatrolTaskById(@RequestParam(name = "id", required = true) String id) {
- PatrolTask PatrolTask = patrolTaskService.getPatrolTaskById(id);
+ PatrolTask PatrolTask = patrolTaskService.customizeGetById(id);
return R.data(PatrolTask);
}
@@ -254,7 +251,7 @@
* @param patrolTask 任务
*/
@PostMapping("patrol-done-list")
- @ApiOperation(value = "查询待办")
+ @ApiOperation(value = "查询已办")
public R patrolDoneList(PatrolTaskVO patrolTask, Query query) {
BladeFlowVO bladeFlow2 = new BladeFlowVO();
//设置流程类型
@@ -315,5 +312,17 @@
return R.data(pageList);
}
+ @GetMapping("getTaskStatusCount")
+ public R getTaskStatusCount(PatrolTaskVO patrolTaskVO){
+ List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
+ return R.data(list);
+ }
+
+ @GetMapping("getTaskTypeCount")
+ public R getTaskTypeCount(PatrolTaskVO patrolTaskVO){
+ List<TaskStatusCount> list = patrolTaskService.getTaskTypeCount(patrolTaskVO);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3