From c0a5ff23fe054888358456fb362ac999589ff354 Mon Sep 17 00:00:00 2001
From: liuhuazhong <liuhuazhong@qq.com>
Date: Tue, 25 Mar 2025 10:16:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=BD=AF=E4=BB=B6=E5=B7=A5=E5=8E=82):=20?=
 =?UTF-8?q?=E6=9C=80=E5=A4=9A=E7=BC=BA=E9=99=B7=E4=B8=AA=E4=BA=BA=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=9C=80=E5=A4=9A=E7=BC=BA=E9=99=B7=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=EF=BC=9B=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=B0=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SoftwareFactStatisticsServiceImpl.java       | 9 +++++----
 .../mapper/pms/PmsProjectTestsheetCasesMapper.xml        | 6 ++++++
 .../resources/mapper/pms/SoftwareFactStatisPmsMapper.xml | 8 ++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java
index 3f216f91b..0cba35cf5 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/service/SoftwareFactStatisticsServiceImpl.java
@@ -114,7 +114,8 @@ public class SoftwareFactStatisticsServiceImpl extends BaseController {
         Long bugMaxProjectId = statisForgeMapper.countForgeProjectByProject(f2);
         ZonePmsProject bugMaxProject = statisPmsMapper.selectPmsProjectById(bugMaxProjectId);
         res.put("bugMaxProject", bugMaxProject == null ?"":  bugMaxProject.getProjectName());
-        //缺陷最多个人
+        //缺陷解决最多个人
+        f2.setStatusIds(ISSUE_FINISHED);
         Long bugMaxAssignerId = statisForgeMapper.countForgeProjectByAssigner(f2);
         String bugMaxAssigner = statisPmsMapper.selectPmsUserByGitlinkId(bugMaxAssignerId);
         res.put("bugMaxAssigner", bugMaxAssigner);
@@ -162,9 +163,9 @@ public class SoftwareFactStatisticsServiceImpl extends BaseController {
         res.put("yesterdayFinishNeed", yesterdayFinishNeed);
         //昨日测试用例执行
         ForgeProject forgeProjectTest = new ForgeProject();
-        forgeProjectFinish.setStatusIds(Arrays.asList(TASK_CASE_STATUS_PASS, TASK_CASE_STATUS_FAIL, TASK_CASE_STATUS_BLOCK, TASK_CASE_STATUS_SKIP));
-        forgeProjectFinish.setUpdateTimeS(dayStartAndEnd[0]);
-        forgeProjectFinish.setUpdateTimeE(dayStartAndEnd[1]);
+        forgeProjectTest.setStatusIds(Arrays.asList(TASK_CASE_STATUS_PASS, TASK_CASE_STATUS_FAIL, TASK_CASE_STATUS_BLOCK, TASK_CASE_STATUS_SKIP));
+        forgeProjectTest.setUpdateTimeS(dayStartAndEnd[0]);
+        forgeProjectTest.setUpdateTimeE(dayStartAndEnd[1]);
         Long yesterdayTestCase = statisPmsMapper.countTestCaseInSheet(forgeProjectTest);
         res.put("yesterdayTestCase", yesterdayTestCase);
 
diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml
index b6552b4f6..44d6923e5 100644
--- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml
+++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestsheetCasesMapper.xml
@@ -93,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="testStatus != null">test_status,</if>
             <if test="testerId != null">tester_id,</if>
             <if test="stepStatus != null">step_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectTestsheetId != null">#{projectTestsheetId},</if>
@@ -100,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="testStatus != null">#{testStatus},</if>
             <if test="testerId != null">#{testerId},</if>
             <if test="stepStatus != null">#{stepStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
          </trim>
     </insert>
 
@@ -110,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectTestcaseId != null">project_testcase_id = #{projectTestcaseId},</if>
             <if test="testStatus != null">test_status = #{testStatus},</if>
             <if test="stepStatus != null">step_status = #{stepStatus},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
             tester_id = #{testerId}
         </trim>
         where id = #{id}
diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml
index 964903987..8b95d63aa 100644
--- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml
+++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/SoftwareFactStatisPmsMapper.xml
@@ -46,10 +46,10 @@
                 select id from pms_project_testsheet where pms_project_id = #{pmProjectId}
                 )
             </if>
-            <if test="createTimeS != null ">and created_on &gt;= #{createTimeS}</if>
-            <if test="createTimeE != null ">and created_on &lt;= #{createTimeE}</if>
-            <if test="updateTimeS != null ">and updated_on &gt;= #{updateTimeS}</if>
-            <if test="updateTimeE != null ">and updated_on &lt;= #{updateTimeE}</if>
+            <if test="createTimeS != null ">and create_time &gt;= #{createTimeS}</if>
+            <if test="createTimeE != null ">and create_time &lt;= #{createTimeE}</if>
+            <if test="updateTimeS != null ">and update_time &gt;= #{updateTimeS}</if>
+            <if test="updateTimeE != null ">and update_time &lt;= #{updateTimeE}</if>
         </where>
     </select>