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 | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 3caa9f5..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;
@@ -77,7 +78,7 @@
}
/**
- * APP审核列表
+ * 待办列表（APP）
*/
@GetMapping(value = "/list")
public R queryList(ProjectSearchDTO searchDTO) {
@@ -86,7 +87,16 @@
}
/**
- * 待办列表统计
+ * 待办列表分页
+ */
+ @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) {
@@ -105,11 +115,21 @@
/**
- * 审批状态统计
+ * 审批情况检验（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