From 13b6d196199d6b73e5908db69d007606afaebe8b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 06 Feb 2024 16:09:06 +0800
Subject: [PATCH] 任务状态数量接口优化

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java |   76 ++++++++++++++++++++++++++++++-------
 1 files changed, 61 insertions(+), 15 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 4418e5e..8509dcd 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));
 	}
 
 	/**
@@ -229,7 +226,7 @@
 			List<Object> data = res.getData().getData();
 			data.forEach(obj -> {
 				BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
-				PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
+				PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
 				if (byId != null) {
 					byId.setFlow(bladeFlow);
 					patrolTaskList.add(byId);
@@ -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();
 		//设置流程类型
@@ -267,10 +264,12 @@
 			List<Object> data = res.getData().getData();
 			data.forEach(obj -> {
 				BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
-				PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
+				PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
 
-				bladeFlow.setDetail(byId);
-				bladeFlowVOList.add(bladeFlow);
+				if (byId != null){
+					bladeFlow.setDetail(byId);
+					bladeFlowVOList.add(bladeFlow);
+				}
 			});
 		}
 		//设置数据集
@@ -286,14 +285,61 @@
 	}
 
 	/**
-	 * 巡查任务报表
+	 * 巡查任务报表 分页
 	 */
-	@PostMapping("getTaskReport")
+	@GetMapping("getTaskReportPage")
 	@ApiOperation(value = "巡查任务报表")
-	public R getTaskReport(@RequestBody PatrolTaskReport patrolTaskReport) {
-		List<PatrolTaskReport> list = patrolTaskService.getTaskReport(patrolTaskReport);
+	public R getTaskReportPage( PatrolTaskReport patrolTaskReport , Query query) {
+		IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportPage(Condition.getPage(query),patrolTaskReport);
+		return R.data(pageList);
+	}
+
+	/**
+	 * 巡查任务报表列表
+	 */
+	@GetMapping("getTaskReportList")
+	@ApiOperation(value = "巡查任务报表")
+	public R getTaskReportList( PatrolTaskReport patrolTaskReport ) {
+		List<PatrolTaskReport> list = patrolTaskService.getTaskReportList(patrolTaskReport);
 		return R.data(list);
 	}
 
+	/**
+	 * 巡查任务报表详情
+	 */
+	@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);
+		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);
+	}
+
+	@GetMapping("getTaskTypeCount")
+	public R getTaskTypeCount(PatrolTaskVO patrolTaskVO){
+		List<TaskStatusCount> list = patrolTaskService.getTaskTypeCount(patrolTaskVO);
+		return R.data(list);
+	}
+
+
+
 
 }

--
Gitblit v1.9.3