From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProgressReportController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 0155020..198d42f 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
@@ -6,6 +6,7 @@
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.VO.SgReportVO;
import cn.gistack.sm.sg.service.SgProgressReportService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.support.Condition;
@@ -37,6 +38,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);
}
@@ -96,6 +106,15 @@
}
/**
+ * 待办列表统计（超级管理员）
+ */
+ @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")
@@ -132,4 +151,13 @@
String reportId = sgProgressReportService.getDeviceReport(deviceId,stepId);
return R.data(reportId);
}
+
+ /**
+ * 查询当前设备审批记录
+ */
+ @GetMapping(value = "/get_device_reportcopy")
+ public R getDeviceReportcopy(@RequestParam Long deviceId , @RequestParam(required = false) Long stepId) {
+ SgReportVO sgReportVO = sgProgressReportService.getDeviceReportcopy(deviceId, stepId);
+ return R.data(sgReportVO);
+ }
}
--
Gitblit v1.9.3