From 4e9f4380d88348dc027cf8dacd52430b3d047e9a Mon Sep 17 00:00:00 2001
From: zhihao <18915542763@163.com>
Date: Fri, 10 Jul 2026 08:58:44 +0800
Subject: [PATCH] =?UTF-8?q?czh-20260710-=E6=94=AF=E6=8C=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=AE=8C=E6=88=90=E4=BA=8B=E9=A1=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E9=80=BE=E6=9C=9F=E4=B8=AA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BgPartymatterController.java   | 29 +++++++++++++++++
 .../controller/BgTakepulseController.java     | 31 +++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java
index 49e1721..121d267 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java
@@ -22,6 +22,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.bgpartymatter.dto.BgPartymatterBpmSaveDTO;
@@ -97,6 +99,33 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
         return Result.OK(pageList);
     }
 
+    @Operation(summary = "党委会/所务会-状态统计")
+    @GetMapping(value = "/statusStats")
+    public Result<Map<String, Integer>> statusStats(BgPartymatter bgPartymatter, HttpServletRequest req) {
+        QueryWrapper<BgPartymatter> queryWrapper = QueryGenerator.initQueryWrapper(bgPartymatter, req.getParameterMap());
+        List<BgPartymatter> list = bgPartymatterService.list(queryWrapper);
+        int notStarted = 0, inProgress = 0, overdue = 0, completed = 0;
+        java.time.LocalDate today = java.time.LocalDate.now();
+        for (BgPartymatter item : list) {
+            String status = item.getBpmStatus();
+            if ("1".equals(status)) {
+                notStarted++;
+            } else if ("2".equals(status)) {
+                inProgress++;
+                if (item.getDeadline() != null && item.getDeadline().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate().isBefore(today)) {
+                    overdue++;
+                }
+            } else if ("3".equals(status)) {
+                completed++;
+            }
+        }
+        Map<String, Integer> result = new java.util.LinkedHashMap<>();
+        result.put("notStarted", notStarted);
+        result.put("inProgress", inProgress);
+        result.put("overdue", overdue);
+        result.put("completed", completed);
+        return Result.OK(result);
+    }
 
     @GetMapping(value = "/queryById")
     public Result<BgPartymatter> queryById(@RequestParam(name = "id", required = true) String id) {
diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java
index 79c0551..716ccaf 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -90,6 +91,36 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
 		IPage<BgTakepulse> pageList = bgTakepulseService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+	@Operation(summary = "我为四所把把脉-状态统计")
+	@GetMapping(value = "/statusStats")
+	public Result<Map<String, Integer>> statusStats(BgTakepulse bgTakepulse, HttpServletRequest req) {
+		Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+		customeRuleMap.put("year", QueryRuleEnum.LIKE_WITH_OR);
+		customeRuleMap.put("taskType", QueryRuleEnum.LIKE_WITH_OR);
+		QueryWrapper<BgTakepulse> queryWrapper = QueryGenerator.initQueryWrapper(bgTakepulse, req.getParameterMap(), customeRuleMap);
+		List<BgTakepulse> list = bgTakepulseService.list(queryWrapper);
+		int notStarted = 0, inProgress = 0, overdue = 0, completed = 0;
+		java.time.LocalDate today = java.time.LocalDate.now();
+		for (BgTakepulse item : list) {
+			String status = item.getBpmStatus();
+			if ("1".equals(status)) {
+				notStarted++;
+			} else if ("2".equals(status)) {
+				inProgress++;
+				if (item.getDeadline() != null && item.getDeadline().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate().isBefore(today)) {
+					overdue++;
+				}
+			} else if ("3".equals(status)) {
+				completed++;
+			}
+		}
+		Map<String, Integer> result = new LinkedHashMap<>();
+		result.put("notStarted", notStarted);
+		result.put("inProgress", inProgress);
+		result.put("overdue", overdue);
+		result.put("completed", completed);
+		return Result.OK(result);
+	}
 	
 	/**
 	 *   添加