From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java | 93 ----------------------------------------------
1 files changed, 0 insertions(+), 93 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
index dd39240..7447c9b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -110,98 +110,5 @@
ReportFloodRecord reportFloodRecord = reportFloodRecordService.getById(id);
return R.data(reportFloodRecord);
}
-
- /**====================工作流==========================**/
- /**
- * 新增或修改
- *
- * @param reportFloodRecord
- * @return
- */
- @ApiOperation(value = "报汛记录-新增或修改", notes = "报汛记录-新增或修改")
- @PostMapping(value = "/start-process")
- public R startProcess(@RequestBody ReportFloodRecordVO reportFloodRecord) {
- return R.status(reportFloodRecordService.startProcess(reportFloodRecord));
- }
-
- /**
- * 完成任务
- *
- * @param reportFloodRecord
- * @return
- */
- @ApiOperation(value = "报汛记录-新增或修改", notes = "报汛记录-新增或修改")
- @PostMapping(value = "/complete-task")
- public R startProcess(@RequestBody ReportFloodRecordVO reportFloodRecord, String taskUser, String currentUser) {
- return R.status(reportFloodRecordService.completeTask(reportFloodRecord, taskUser, currentUser));
- }
-
- /**
- * 查询待办
- */
- @PostMapping("reportFlood-todo-list")
- @ApiOperation(value = "查询待办")
- public R reportFloodToDoList(ReportFloodRecordVO reportFloodRecordVO, Query query) {
- BladeFlowVO bladeFlow2 = new BladeFlowVO();
- //设置流程类型
- bladeFlow2.setCategory("flow_4");
- //获取待办
- R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(), query.getCurrent(), reportFloodRecordVO.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<ReportFloodRecord> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
- ReportFloodRecordVO byId = reportFloodRecordService.customizeGetDetail(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);
- }
-
- /**
- * 查询已办
- */
- @PostMapping("reportFlood-done-list")
- @ApiOperation(value = "查询待办")
- public R reportFloodDoneList(ReportFloodRecordVO reportFloodRecordVO, Query query) {
- BladeFlowVO bladeFlow2 = new BladeFlowVO();
- //设置流程类型
- bladeFlow2.setCategory("flow_4");
- //获取待办
- R<BladeFlowPage> res = flowClient.getDoneBladeFlowList(query.getSize(), query.getCurrent(), reportFloodRecordVO.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<ReportFloodRecord> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
- ReportFloodRecordVO byId = reportFloodRecordService.customizeGetDetail(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