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

---
 .../pms/project/service/impl/PmsProjectServiceImpl.java   | 8 ++++++--
 .../main/resources/mapper/pms/PmsProjectSprintMapper.xml  | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

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 ed1764326..d4a96f4d1 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
@@ -474,12 +474,16 @@ public class PmsProjectServiceImpl implements IPmsProjectService
             // 获取 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);
         }
+        if (dataObj.containsKey("last_week_close_data")) {
+            JSONObject lastWeekCloseData = dataObj.getJSONObject("last_week_close_data");
+            Integer openLastWeekIterationCount = pmsProjectSprintMapper.selectOpeningSprintLastWeekIterationCount(pmProjectId);
+            lastWeekCloseData.put("0", openLastWeekIterationCount); //近一周新增
+            dataObj.put("last_week_close_data", lastWeekCloseData);
+        }
         return dataObj;
     }
 
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 3cd922737..cc528b3bd 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
@@ -187,13 +187,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOpeningSprintCount" resultType="java.lang.Integer">
         select count(*)
         from pms_project_sprint
-        where pms_project_id = #{projectId}
+        where pms_project_id = #{pmProjectId}
         and status IN ('0', '1')
     </select>
     <select id="selectOpeningSprintLastWeekIterationCount" resultType="java.lang.Integer">
         select count(*)
         from pms_project_sprint
-        where pms_project_id = #{projectId}
+        where pms_project_id = #{pmProjectId}
         and status IN ('0', '1')
         and start_time >= DATE_SUB(NOW(), INTERVAL 1 WEEK)
     </select>