From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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 551c13b..f0f75ff 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);
}
@@ -189,7 +186,7 @@
*/
@PostMapping("start-process")
public R startProcess(@RequestBody PatrolTask patrolTask) {
- return R.status(patrolTaskService.startProcess(patrolTask));
+ return R.data(patrolTaskService.startProcess(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();
//设置流程类型
@@ -288,7 +285,7 @@
/**
* 巡查任务报表 分页
*/
- @PostMapping("getTaskReportPage")
+ @GetMapping("getTaskReportPage")
@ApiOperation(value = "巡查任务报表")
public R getTaskReportPage( PatrolTaskReport patrolTaskReport , Query query) {
IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportPage(Condition.getPage(query),patrolTaskReport);
@@ -296,9 +293,9 @@
}
/**
- * 巡查任务报表 分页
+ * 巡查任务报表列表
*/
- @PostMapping("getTaskReportList")
+ @GetMapping("getTaskReportList")
@ApiOperation(value = "巡查任务报表")
public R getTaskReportList( PatrolTaskReport patrolTaskReport ) {
List<PatrolTaskReport> list = patrolTaskService.getTaskReportList(patrolTaskReport);
@@ -306,14 +303,26 @@
}
/**
- * 巡查任务报表 分页
+ * 巡查任务报表详情
*/
- @PostMapping("getTaskReportDetail")
- @ApiOperation(value = "巡查任务报表")
+ @GetMapping("getTaskReportDetail")
+ @ApiOperation(value = "巡查任务详情")
public R getTaskReportDetail( PatrolTaskReport patrolTaskReport , Query query) {
IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportDetail(Condition.getPage(query),patrolTaskReport);
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