From 586019ba7ccb6088ae8bc5f4bfa78cdede1e3e7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 May 2023 15:03:35 +0800
Subject: [PATCH] 巡检添加已办事务
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 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 71846e8..85b05de 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
@@ -2,12 +2,16 @@
import cn.gistack.flow.core.entity.BladeFlow;
import cn.gistack.flow.core.feign.IFlowClient;
+import cn.gistack.flow.core.vo.BladeFlowVO;
import cn.gistack.sm.patrol.entity.PatrolReport;
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.PatrolTaskVO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -210,13 +214,14 @@
@ApiOperation(value = "查询待办")
public R patrolTodoList(PatrolTaskVO patrolTask, Query query) {
BladeFlow bladeFlow2 = new BladeFlow();
- R<List<BladeFlow>> res = flowClient.getTodoBladeFlowList(query.getSize(),query.getCurrent(),patrolTask.getCurrentUserId(), bladeFlow2);
+ R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(),query.getCurrent(),patrolTask.getCurrentUserId(), bladeFlow2);
IPage<PatrolTask> patrolTaskIPage = new Page<>();
List<PatrolTask> patrolTaskList = new ArrayList<>();
if (res.isSuccess()){
- List<BladeFlow> data = res.getData();
- data.forEach(bladeFlow -> {
+ List<Object> data = res.getData().getData();
+ data.forEach(obj -> {
+ BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj),BladeFlow.class);
PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
if (byId != null){
byId.setFlow(bladeFlow);
@@ -227,11 +232,47 @@
//设置数据集
patrolTaskIPage.setRecords(patrolTaskList);
//设置当前页
- patrolTaskIPage.setCurrent(query.getCurrent());
- //设置大小
- patrolTaskIPage.setSize(query.getSize());
+ patrolTaskIPage.setCurrent(res.getData().getCurrent());
+ //设置页数
+ patrolTaskIPage.setSize(res.getData().getSize());
+ //设置总数
+ patrolTaskIPage.setTotal(res.getData().getTotal());
return R.data(patrolTaskIPage);
}
+ /**
+ * 查询已办
+ *
+ * @param patrolTask 任务
+ */
+ @PostMapping("patrol-done-list")
+ @ApiOperation(value = "查询待办")
+ public R patrolDoneList(PatrolTaskVO patrolTask, Query query){
+ BladeFlowVO bladeFlow2 = new BladeFlowVO();
+ R<BladeFlowPage> res = flowClient.getDoneBladeFlowList(query.getSize(),query.getCurrent(),patrolTask.getCurrentUserId(), bladeFlow2);
+ IPage<BladeFlowVO> bladeFlowVOIPage = new Page<>();
+ List<BladeFlowVO> bladeFlowVOList = new ArrayList<>();
+
+ if (res.isSuccess()){
+ 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());
+
+ bladeFlow.setDetail(byId);
+ bladeFlowVOList.add(bladeFlow);
+ });
+ }
+ //设置数据集
+ bladeFlowVOIPage.setRecords(bladeFlowVOList);
+ //设置当前页
+ bladeFlowVOIPage.setCurrent(res.getData().getCurrent());
+ //设置页数
+ bladeFlowVOIPage.setSize(res.getData().getSize());
+ //设置总数
+ bladeFlowVOIPage.setTotal(res.getData().getTotal());
+
+ return R.data(bladeFlowVOIPage);
+ }
}
--
Gitblit v1.9.3