From b1e84b26d0b0f254d5e000092ce9f0ef56a1304c Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 27 Jun 2024 12:06:11 +0800
Subject: [PATCH] 湖北水库：施工：管理员查询所有上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProgressReportController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProgressReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProgressReportController.java
index 6a933a2..7980c1a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProgressReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProgressReportController.java
@@ -5,6 +5,7 @@
import cn.gistack.sm.sg.DTO.ApprovalDTO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.VO.SgProgressReportVO;
+import cn.gistack.sm.sg.VO.SgProjectInfoVO;
import cn.gistack.sm.sg.service.SgProgressReportService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.support.Condition;
@@ -36,6 +37,15 @@
@GetMapping(value = "/page")
public R queryPageList(ProjectSearchDTO searchDTO, Query query) {
IPage<SgProgressReportVO> page = sgProgressReportService.queryPageList(Condition.getPage(query), searchDTO);
+ return R.data(page);
+ }
+
+ /**
+ * 分页列表查询（所有数据，管理员用）
+ */
+ @GetMapping(value = "/page_all")
+ public R queryPageListAll(ProjectSearchDTO searchDTO, Query query) {
+ IPage<SgProgressReportVO> page = sgProgressReportService.queryPageListAll(Condition.getPage(query), searchDTO);
return R.data(page);
}
@@ -77,7 +87,7 @@
}
/**
- * APP审核列表
+ * 待办列表（APP）
*/
@GetMapping(value = "/list")
public R queryList(ProjectSearchDTO searchDTO) {
@@ -86,7 +96,25 @@
}
/**
- * APP审核列表
+ * 待办列表分页
+ */
+ @GetMapping(value = "/project_progress_page")
+ public R progressPage(ProjectSearchDTO searchDTO,Query query) {
+ IPage<SgProgressReportVO> page = sgProgressReportService.progressPage(Condition.getPage(query),searchDTO);
+ return R.data(page);
+ }
+
+ /**
+ * 待办列表统计（APP、web共用）
+ */
+ @GetMapping(value = "/approval_count_all")
+ public R countListAll(ProjectSearchDTO searchDTO) {
+ Map<String,Long> map= sgProgressReportService.countListAll( searchDTO);
+ return R.data(map);
+ }
+
+ /**
+ * 待办列表统计（APP）
*/
@GetMapping(value = "/approval_count")
public R countList(ProjectSearchDTO searchDTO) {
@@ -94,4 +122,32 @@
return R.data(map);
}
+ /**
+ * 审批状态统计
+ */
+ @GetMapping(value = "/status_count")
+ public R statusCount(ProjectSearchDTO searchDTO) {
+ Map<String,Long> map= sgProgressReportService.statusCount(searchDTO);
+ return R.data(map);
+ }
+
+
+ /**
+ * 审批情况检验（APP）
+ */
+ @GetMapping(value = "/check_step")
+ public R checkStep(@RequestParam Long deviceId , @RequestParam Long stepId) {
+ boolean flag = sgProgressReportService.checkStep(deviceId,stepId);
+ return R.data(flag);
+ }
+
+
+ /**
+ * 查询当前设备审批记录
+ */
+ @GetMapping(value = "/get_device_report")
+ public R getDeviceReport(@RequestParam Long deviceId , @RequestParam(required = false) Long stepId) {
+ String reportId = sgProgressReportService.getDeviceReport(deviceId,stepId);
+ return R.data(reportId);
+ }
}
--
Gitblit v1.9.3