From 200f9e99bab7dcab9360f34fa25f6fa97c33c167 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 05 Mar 2024 14:59:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 5191f85..6edd991 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
@@ -208,6 +208,18 @@
}
/**
+ * 汛期、白蚁、大坝 责任人完成任务
+ */
+ @PostMapping("person-complete-task")
+ @ApiOperation(value = "完成任务", notes = "传入流程信息")
+ public R personCompleteTask(@RequestBody PatrolTaskVO patrolTaskVO) {
+ return R.status(patrolTaskService.personCompleteTask(patrolTaskVO, patrolTaskVO.getCurrentUserId(), patrolTaskVO.getTaskUser()));
+ }
+
+
+
+
+ /**
* 查询待办
*
* @param patrolTask 任务
@@ -316,7 +328,20 @@
@GetMapping("getTaskStatusCount")
public R getTaskStatusCount(PatrolTaskVO patrolTaskVO){
- List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
+// List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
+ List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
+ return R.data(list);
+ }
+
+ @GetMapping("getTaskStatus")
+ public R getTaskStatus(PatrolTaskVO patrolTaskVO){
+ TaskStatus taskStatus = patrolTaskService.getTaskStatus(patrolTaskVO);
+ return R.data(taskStatus);
+ }
+
+ @GetMapping("getTaskStatusCountOptimize")
+ public R getTaskStatusCountOptimize(PatrolTaskVO patrolTaskVO){
+ List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
return R.data(list);
}
@@ -327,4 +352,6 @@
}
+
+
}
--
Gitblit v1.9.3