From 913d97d3175a408659eb508151f028798b9c4041 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 09 Aug 2024 11:17:52 +0800
Subject: [PATCH] 湖北水库:待办列表划分全部审核状态

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 2fa8e18..3fceb84 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -381,13 +381,18 @@
 	public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
 		Long userId = AuthUtil.getUserId();
 		searchDTO.setUserId(userId);
+		List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO);
 		searchDTO.setApprovalStatus(0);
 		List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
 		searchDTO.setApprovalStatus(1);
 		List<SgProgressReportVO> over= sgProgressReportMapper.queryList(searchDTO);
+		searchDTO.setApprovalStatus(2);
+		List<SgProgressReportVO> reject= sgProgressReportMapper.queryList(searchDTO);
 		Map<String, Long> map = new HashMap<>();
-		map.put("pending", Long.valueOf(pending.size()));
-		map.put("over",Long.valueOf(over.size()));
+		map.put("pending", (long) pending.size());
+		map.put("over", (long) over.size());
+		map.put("all", (long) all.size());
+		map.put("reject", (long) reject.size());
 		return map;
 	}
 

--
Gitblit v1.9.3