From 55a58aa095ba478cac0b39f08247849758b60301 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 06 Feb 2024 14:04:50 +0800
Subject: [PATCH] 已办任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 cca7670..5191f85 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));
}
/**
@@ -269,8 +266,10 @@
BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
- bladeFlow.setDetail(byId);
- bladeFlowVOList.add(bladeFlow);
+ if (byId != null){
+ bladeFlow.setDetail(byId);
+ bladeFlowVOList.add(bladeFlow);
+ }
});
}
//设置数据集
@@ -315,5 +314,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