From 168f60234d097abcc0e4f504ce685502a6c4184e Mon Sep 17 00:00:00 2001
From: wanjia <553039491@qq.com>
Date: Mon, 9 Dec 2024 17:32:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E6=A6=82=E8=A7=88?=
 =?UTF-8?q?=EF=BC=89:=E5=BC=80=E5=90=AF=E4=B8=AD=E7=9A=84=E8=BF=AD?=
 =?UTF-8?q?=E4=BB=A3=E6=95=B0=E3=80=81=E8=BF=91=E4=B8=80=E5=91=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=AD=E4=BB=A3=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/project/mapper/PmsProjectSprintMapper.java  |  4 ++++
 .../project/service/impl/PmsProjectServiceImpl.java | 13 ++++++++++++-
 .../resources/mapper/pms/PmsProjectSprintMapper.xml | 13 +++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java
index 7e5370db2..9c4210ffb 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsProjectSprintMapper.java
@@ -73,4 +73,8 @@ public interface PmsProjectSprintMapper
     int deletePmsProjectSprintByProjectId(@Param("projectId") Long projectId);
 
     PmsProjectSprint selectLatestSprintByProjectIdAndNameAndAssigneeId(@Param("pmsProjectId") Long pmsProjectId, @Param("sprintName") String sprintName, @Param("sprintAssigneeId") Long sprintAssigneeId);
+
+    Integer selectOpeningSprintCount(@Param("pmProjectId") Long pmProjectId);
+
+    Integer selectOpeningSprintLastWeekIterationCount(@Param("pmProjectId") Long pmProjectId);
 }
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
index de1f13385..8ff606055 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
@@ -436,7 +436,18 @@ public class PmsProjectServiceImpl implements IPmsProjectService
         // 校验数据权限
         selectAndCheckPmsProjectById(pmProjectId);
         JSONObject result = gitLinkRequestHelper.doGet(PmsGitLinkRequestUrl.GET_PROJECT_STATISTICS(pmProjectId));
-        return result.getJSONObject(DATA_KEY);
+        JSONObject dataObj = result.getJSONObject(DATA_KEY);
+        if (dataObj.containsKey("open_data")) {
+            // 获取 open_data 对象
+            JSONObject openData = dataObj.getJSONObject("open_data");
+            Integer openSprintCount = pmsProjectSprintMapper.selectOpeningSprintCount(pmProjectId);
+            Integer openLastWeekIterationCount = pmsProjectSprintMapper.selectOpeningSprintLastWeekIterationCount(pmProjectId);
+            // 添加新的键值对
+            openData.put("0", openSprintCount); // 新增开启中的迭代
+            openData.put("0_lastWeekIteration", openLastWeekIterationCount); //近一周新增
+            dataObj.put("open_data", openData);
+        }
+        return dataObj;
     }
 
     @Override
diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml
index 7aa6a8d1e..58d09ba99 100644
--- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml
+++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectSprintMapper.xml
@@ -184,4 +184,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by id desc
         limit 1
     </select>
+    <select id="selectOpeningSprintCount" resultType="java.lang.Integer">
+        select count(*)
+        from pms_project_sprint
+        where pms_project_id = #{projectId}
+        and status IN ('0', '1')
+    </select>
+    <select id="selectOpeningSprintLastWeekIterationCount" resultType="java.lang.Integer">
+        select count(*)
+        from pms_project_sprint
+        where pms_project_id = #{projectId}
+        and status IN ('0', '1')
+        and start_time >= DATE_SUB(NOW(), INTERVAL 1 WEEK)
+    </select>
 </mapper>
\ No newline at end of file