From b51fc02e94099f3419781cb59b3a6d8762bddaf3 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 20 Jun 2024 16:28:48 +0800
Subject: [PATCH] 湖北水库：施工：根据设备查询审批ID、审批待办列表分页
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProgressReportController.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 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 c3876f6..0155020 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;
@@ -12,6 +13,9 @@
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -55,7 +59,7 @@
}
/**
- * 新增上报
+ * 上报详情
*/
@GetMapping(value = "/detail")
public R detail(String id) {
@@ -72,4 +76,60 @@
sgProgressReportService.approval(approvalDTO);
return R.success("审批成功");
}
+
+ /**
+ * 待办列表（APP）
+ */
+ @GetMapping(value = "/list")
+ public R queryList(ProjectSearchDTO searchDTO) {
+ List<SgProgressReportVO> list = sgProgressReportService.queryList( searchDTO);
+ return R.data(list);
+ }
+
+ /**
+ * 待办列表分页
+ */
+ @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）
+ */
+ @GetMapping(value = "/approval_count")
+ public R countList(ProjectSearchDTO searchDTO) {
+ Map<String,Long> map= sgProgressReportService.countList( searchDTO);
+ 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