From 858ebd80e76e9071c69994a05af7ad193ad0f302 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 14 Apr 2026 17:39:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(hidden-evaluation):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=84=E4=BC=B0=E8=AF=A6=E6=83=85=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=92=8C=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../query/HiddenEvaluationDetailQueryExe.java |  7 ++
 .../mapper/HiddenEvaluationRecordMapper.xml   | 81 ++++++++++---------
 .../mapper/HiddenExchangeBathMapper.xml       |  6 +-
 .../mapper/HiddenExchangeInfoMapper.xml       |  7 +-
 4 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationDetailQueryExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationDetailQueryExe.java
index eb48db7..7ef56ad 100644
--- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationDetailQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationDetailQueryExe.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.cola.dto.PageResponse;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.hidden.evaluation.command.convertor.HiddenEvaluationDetailCoConvertor;
+import com.zcloud.hidden.evaluation.domain.enums.EvaluationResultEnum;
 import com.zcloud.hidden.evaluation.dto.HiddenEvaluationDetailCompleteQry;
 import com.zcloud.hidden.evaluation.dto.HiddenEvaluationDetailPageQry;
 import com.zcloud.hidden.evaluation.dto.HiddenEvaluationDetailQry;
@@ -70,6 +71,12 @@ public class HiddenEvaluationDetailQueryExe {
             // 无考评详情，返回未考评的列表
             return hiddenEvaluationDetailCoConvertor.convertConfigsToNotEvaluatedCOs(listByCorpId);
         }
+        //如果考评完成，直接返回所有考评列表
+        if(!EvaluationResultEnum.NOT_EVALUATED.getCode().equals(infoByHiddenId.getEvaluationResult())){
+            return hiddenEvaluationDetailCoConvertor.converDOsToCOs(allListByHidden);
+        }
+
+
         // 提取已考评的用户 ID 集合
         Set<Long> evaluatedUserIds = allListByHidden.stream()
                 .map(HiddenEvaluationDetailDO::getEvaluationUserId)
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
index 555f4fc..6f702cb 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
@@ -244,44 +244,49 @@
     </select>
 
     <select id="corpEvalStatisticsPage" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.CorpEvalStatisticsDO">
-        SELECT
-        ci.id                AS corpinfoId,
-        ci.corp_name         AS corpinfoName,
-        COUNT(DISTINCT CASE WHEN her.evaluation_result != 1 THEN h.id END) AS completeEvaluationHiddenNum,
-        COUNT(DISTINCT CASE WHEN her.id IS NULL OR her.evaluation_result = 1 THEN h.id END) AS waitEvaluationHiddenNum,
-        COUNT(DISTINCT CASE WHEN hu.corpinfo_id = ci.id THEN h.creator_id END) AS involveRewardPersonNum,
-        COUNT(DISTINCT CASE WHEN her.exchange_flag = 1 AND hu.corpinfo_id = ci.id THEN h.id END) AS exchangedHiddenNum,
-        COUNT(DISTINCT CASE
-            WHEN her.evaluation_result = 2
-             THEN h.id END)                                                        AS totalExchangeHiddenNum,
-        (SELECT GROUP_CONCAT(DISTINCT CONCAT(dep.name, '-', usr.name))
-        FROM evaluation_config ec
-        LEFT JOIN department dep ON ec.department_id = dep.id
-        LEFT JOIN user usr ON ec.user_id = usr.id
-        WHERE ec.corpinfo_id = ci.id AND ec.delete_enum = 'FALSE' AND ec.evaluation_type = 1) AS safeEvaluationMember,
-        (SELECT GROUP_CONCAT(DISTINCT CONCAT(dep.name, '-', usr.name))
-        FROM evaluation_config ec
-        LEFT JOIN department dep ON ec.department_id = dep.id
-        LEFT JOIN user usr ON ec.user_id = usr.id
-        WHERE ec.corpinfo_id = ci.id AND ec.delete_enum = 'FALSE' AND ec.evaluation_type = 2) AS envEvaluationMember
-        FROM corp_info ci
-        LEFT JOIN user hu ON hu.corpinfo_id = ci.id
-        LEFT JOIN hidden h ON hu.id = h.creator_id AND h.delete_enum = 'FALSE' AND h.state = 301 AND
-        ((h.source IN (4, 5) AND h.final_check = 1) OR h.source NOT IN (4, 5))
-        LEFT JOIN hidden_evaluation_record her
-        ON h.hidden_id = her.hidden_id AND her.delete_enum = 'FALSE'
-        LEFT JOIN evaluation_config ecConfig
-        ON ci.id = ecConfig.corpinfo_id AND ecConfig.delete_enum = 'FALSE'
-        LEFT JOIN department configDept
-        ON ecConfig.department_id = configDept.id
-        LEFT JOIN user configUser
-        ON ecConfig.user_id = configUser.id
-        WHERE ci.delete_enum = 'FALSE'
-        AND ci.use_flag = 1
-        AND (
-        ci.id IN (SELECT corpinfo_id FROM evaluation_corp WHERE delete_enum = 'FALSE')
-        OR ci.type = 2
-        )
+       SELECT ci.id                                                                                    AS corpinfoId,
+           ci.corp_name                                                                             AS corpinfoName,
+           COUNT(DISTINCT CASE WHEN her.evaluation_result != 1 THEN h.id END)                       AS completeEvaluationHiddenNum,
+           COUNT(DISTINCT CASE
+                              WHEN her.id IS NULL OR her.evaluation_result = 1
+                                  THEN h.id END)                                                    AS waitEvaluationHiddenNum,
+           COUNT(DISTINCT CASE WHEN hu.corpinfo_id = ci.id THEN h.creator_id END)                   AS involveRewardPersonNum,
+           COUNT(DISTINCT CASE WHEN her.exchange_flag = 1 AND hu.corpinfo_id = ci.id THEN h.id END) AS exchangedHiddenNum,
+           COUNT(DISTINCT CASE
+                              WHEN her.evaluation_result = 2
+                                  THEN h.id END)                                                    AS totalExchangeHiddenNum,
+           (SELECT GROUP_CONCAT(DISTINCT CONCAT(dep.name, '-', usr.name))
+            FROM evaluation_config ec
+                     LEFT JOIN department dep ON ec.department_id = dep.id
+                     LEFT JOIN user usr ON ec.user_id = usr.id
+            WHERE ec.corpinfo_id = ci.id
+              AND ec.delete_enum = 'FALSE'
+              AND ec.evaluation_type = 1)                                                           AS safeEvaluationMember,
+           (SELECT GROUP_CONCAT(DISTINCT CONCAT(dep.name, '-', usr.name))
+            FROM evaluation_config ec
+                     LEFT JOIN department dep ON ec.department_id = dep.id
+                     LEFT JOIN user usr ON ec.user_id = usr.id
+            WHERE ec.corpinfo_id = ci.id
+              AND ec.delete_enum = 'FALSE'
+              AND ec.evaluation_type = 2)                                                           AS envEvaluationMember
+    FROM corp_info ci
+             LEFT JOIN user hu ON hu.corpinfo_id = ci.id
+             LEFT JOIN hidden h ON hu.id = h.creator_id AND h.delete_enum = 'FALSE' AND h.state = 301 AND
+                                   ((h.source IN (4, 5) AND h.final_check = 1) OR h.source NOT IN (4, 5))
+             LEFT JOIN hidden_evaluation_record her
+                       ON h.hidden_id = her.hidden_id AND her.delete_enum = 'FALSE'
+             LEFT JOIN evaluation_config ecConfig
+                       ON ci.id = ecConfig.corpinfo_id AND ecConfig.delete_enum = 'FALSE'
+             LEFT JOIN department configDept
+                       ON ecConfig.department_id = configDept.id
+             LEFT JOIN user configUser
+                       ON ecConfig.user_id = configUser.id
+    WHERE ci.delete_enum = 'FALSE'
+      AND ci.use_flag = 1
+      AND (
+              ci.id IN (SELECT corpinfo_id FROM evaluation_corp WHERE delete_enum = 'FALSE')
+                  OR ci.type = 2
+              )
         <if test="params.departmentId != null and params.departmentId != ''">
             AND configDept.id = #{params.departmentId}
         </if>
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenExchangeBathMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenExchangeBathMapper.xml
index dbce0a2..0f13667 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenExchangeBathMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenExchangeBathMapper.xml
@@ -10,14 +10,14 @@
                  left join user u on u.id = heb.operate_user_id
         where heb.delete_enum = 'FALSE'
           and heb.exchange_user_id = #{params.exchangeUserId}
+
             <!-- 兑换开始时间 -->
             <if test="params.exchangeStartTime != null and params.exchangeStartTime != ''">
-                AND heb.exchange_time >= #{params.exchangeStartTime}
+                AND heb.exchange_time >= DATE_FORMAT(CONCAT(#{params.exchangeStartTime}, ' 00:00:00'), '%Y-%m-%d %H:%i:%s')
             </if>
-
             <!-- 兑换结束时间 -->
             <if test="params.exchangeEndTime != null and params.exchangeEndTime != ''">
-                AND heb.exchange_time &lt;= #{params.exchangeEndTime}
+                AND heb.exchange_time &lt; DATE_FORMAT(DATE_ADD(#{params.exchangeEndTime}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%s')
             </if>
 
 
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml
index b7f017d..7e56fe1 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml
@@ -49,15 +49,16 @@
             AND h.hidden_type = #{params.hiddenType}
         </if>
 
+
         <!-- 兑换开始时间 -->
         <if test="params.exchangeStartTime != null and params.exchangeStartTime != ''">
-            AND her.exchange_time >= #{params.exchangeStartTime}
+            AND her.exchange_time >= DATE_FORMAT(CONCAT(#{params.exchangeStartTime}, ' 00:00:00'), '%Y-%m-%d %H:%i:%s')
         </if>
-
         <!-- 兑换结束时间 -->
         <if test="params.exchangeEndTime != null and params.exchangeEndTime != ''">
-            AND her.exchange_time &lt;= #{params.exchangeEndTime}
+            AND her.exchange_time &lt; DATE_FORMAT(DATE_ADD(#{params.exchangeEndTime}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%s')
         </if>
+
         GROUP BY h.hidden_id
         ORDER BY u.sort, u.create_time desc