From b05031b548bbe39b818a013ea64bd39a624a9149 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 1 Aug 2024 14:29:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionalCaseManageInterceptor.java      |  1 +
 .../functional/dto/FunctionalCaseMindDTO.java |  3 +++
 .../mapper/ExtFunctionalCaseMapper.xml        | 14 ++++++----
 .../service/FunctionalCaseMinderService.java  | 27 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/config/FunctionalCaseManageInterceptor.java b/backend/services/case-management/src/main/java/io/metersphere/functional/config/FunctionalCaseManageInterceptor.java
index dfb8e23f29..db7e575040 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/config/FunctionalCaseManageInterceptor.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/config/FunctionalCaseManageInterceptor.java
@@ -16,6 +16,7 @@ public class FunctionalCaseManageInterceptor {
         List<MybatisInterceptorConfig> configList = new ArrayList<>();
 
         configList.add(new MybatisInterceptorConfig(FunctionalCaseMindDTO.class, "steps", CompressUtils.class, "zip", "unzip"));
+        configList.add(new MybatisInterceptorConfig(FunctionalCaseMindDTO.class, "executeSteps", CompressUtils.class, "zip", "unzip"));
         configList.add(new MybatisInterceptorConfig(FunctionalCaseMindDTO.class, "textDescription", CompressUtils.class, "zip", "unzip"));
         configList.add(new MybatisInterceptorConfig(FunctionalCaseMindDTO.class, "expectedResult", CompressUtils.class, "zip", "unzip"));
         configList.add(new MybatisInterceptorConfig(FunctionalCaseMindDTO.class, "prerequisite", CompressUtils.class, "zip", "unzip"));
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/dto/FunctionalCaseMindDTO.java b/backend/services/case-management/src/main/java/io/metersphere/functional/dto/FunctionalCaseMindDTO.java
index c55c1c7b8f..ff415130ef 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/dto/FunctionalCaseMindDTO.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/dto/FunctionalCaseMindDTO.java
@@ -63,6 +63,9 @@ public class FunctionalCaseMindDTO {
     @Schema(description =  "用例步骤（JSON)，step_model 为 Step 时启用")
     private byte[] steps;
 
+    @Schema(description =  "执行用例步骤（JSON)，step_model 为 Step 时启用")
+    private byte[] executeSteps;
+
     @Schema(description =  "步骤描述，step_model 为 Text 时启用")
     private byte[] textDescription;
 
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
index 9e4ed03927..dfabedc457 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
@@ -875,18 +875,22 @@
     <select id="getMinderTestPlanList" resultType="io.metersphere.functional.dto.FunctionalCaseMindDTO">
         SELECT
         tpfc.id as id,
-        history.`status` as status,
+        history.`status` as reviewStatus,
         fc.module_id as moduleId,
         fc.name as name,
         fc.id as caseId,
-        fc.project_id,  fc.template_id, fc.review_status, fc.pos, fc.case_edit_type,
-        IFNULL(history.`steps`, fcb.steps) as steps, fcb.text_description, fcb.expected_result, fcb.prerequisite, fcb.description
+        fc.project_id,  fc.template_id, fc.pos, fc.case_edit_type,
+        IFNULL(history.`steps`, fcb.steps) as steps, execute_history.`steps` as executeSteps, fcb.text_description, fcb.expected_result, fcb.prerequisite, fcb.description
         FROM
         test_plan_functional_case tpfc
         LEFT JOIN functional_case fc ON tpfc.functional_case_id = fc.id
         LEFT JOIN functional_case_blob fcb ON fcb.id = fc.id
-        LEFT JOIN ( SELECT GROUP_CONCAT(DISTINCT tpceh.test_plan_case_id) AS test_plan_case_id, tpceh.`status`, tpceh.`steps` from test_plan_case_execute_history tpceh where tpceh.test_plan_id = #{request.planId}
-                    GROUP BY test_plan_case_id order by tpceh.create_time desc ) as history  ON history.test_plan_case_id = tpfc.id
+        LEFT JOIN (select  * from (SELECT  tpceh.test_plan_case_id, tpceh.`status`,tpceh.`steps`, ROW_NUMBER() OVER (PARTITION BY tpceh.test_plan_case_id ORDER BY tpceh.create_time DESC) as rn from test_plan_case_execute_history tpceh where tpceh.test_plan_id = #{request.planId} and tpceh.deleted = false
+
+                                   order by tpceh.create_time desc ) as history_filter WHERE rn = 1 ) as history  ON history.test_plan_case_id = tpfc.id
+        LEFT JOIN (select  * from (SELECT  tpceh.test_plan_case_id, tpceh.`status`,tpceh.`steps`, ROW_NUMBER() OVER (PARTITION BY tpceh.test_plan_case_id ORDER BY tpceh.create_time DESC) as rn from test_plan_case_execute_history tpceh where tpceh.test_plan_id = #{request.planId} and tpceh.deleted = false and tpceh.steps IS NOT NULL
+
+                                   order by tpceh.create_time desc ) as history_filter WHERE rn = 1 ) as execute_history  ON execute_history.test_plan_case_id = tpfc.id
         WHERE
         tpfc.test_plan_id = #{request.planId}
         AND fc.deleted = #{deleted}
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
index b72ce97203..b46c416cf0 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
@@ -200,6 +200,9 @@ public class FunctionalCaseMinderService {
             String stepText = new String(functionalCaseMindDTO.getSteps(), StandardCharsets.UTF_8);
             if (StringUtils.isNotBlank(stepText)) {
                 List<FunctionalCaseStepDTO> functionalCaseStepDTOS = JSON.parseArray(stepText, FunctionalCaseStepDTO.class);
+                if (addActualResult) {
+                    compareStep(functionalCaseMindDTO.getExecuteSteps(), functionalCaseStepDTOS);
+                }
                 for (FunctionalCaseStepDTO functionalCaseStepDTO : functionalCaseStepDTOS) {
                     i = i + 1;
                     String desc = functionalCaseStepDTO.getDesc();
@@ -230,7 +233,7 @@ public class FunctionalCaseMinderService {
                         if (StringUtils.isNotBlank(functionalCaseStepDTO.getExecuteResult())) {
                             List<String> resource = stepFunctionalMinderTreeDTO.getData().getResource();
                             List<String> list = new ArrayList<>(resource);
-                            list.add(statusMap.get(functionalCaseStepDTO.getExecuteResult()));
+                            list.add(0,statusMap.get(functionalCaseStepDTO.getExecuteResult()));
                             stepFunctionalMinderTreeDTO.getData().setResource(list);
                         }
                     }
@@ -1276,4 +1279,26 @@ public class FunctionalCaseMinderService {
         return new BaseTreeNode(ModuleConstants.DEFAULT_NODE_ID, name, ModuleConstants.NODE_TYPE_DEFAULT, ModuleConstants.ROOT_NODE_PARENT_ID);
     }
 
+    private static void compareStep(byte[] steps, List<FunctionalCaseStepDTO> newCaseSteps) {
+        if (steps != null) {
+            String historyStepStr = new String(steps, StandardCharsets.UTF_8);
+            if (StringUtils.isNotBlank(historyStepStr)) {
+                List<FunctionalCaseStepDTO> historySteps = JSON.parseArray(historyStepStr, FunctionalCaseStepDTO.class);
+                Map<String, FunctionalCaseStepDTO> historyStepMap = historySteps.stream().collect(Collectors.toMap(FunctionalCaseStepDTO::getId, t -> t));
+                newCaseSteps.forEach(newCaseStep -> {
+                    setHistoryInfo(newCaseStep, historyStepMap);
+                });
+            }
+        }
+    }
+
+    private static void setHistoryInfo(FunctionalCaseStepDTO newCaseStep, Map<String, FunctionalCaseStepDTO> historyStepMap) {
+        FunctionalCaseStepDTO historyStep = historyStepMap.get(newCaseStep.getId());
+        if (historyStep != null && StringUtils.equals(historyStep.getDesc(), newCaseStep.getDesc()) && StringUtils.equals(historyStep.getResult(), newCaseStep.getResult())) {
+            newCaseStep.setExecuteResult(historyStep.getExecuteResult());
+            newCaseStep.setActualResult(historyStep.getActualResult());
+        }
+    }
+
+
 }