From ee97b24e5151b7825692570e3a68a63e8f4f097f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E4=B8=AD?= <admin@xx.com>
Date: Fri, 16 May 2025 16:26:10 +0800
Subject: [PATCH] =?UTF-8?q?feat=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E3=80=91=E5=88=9B=E5=AE=A2=E6=88=90=E6=9E=9C=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1SQL=E9=94=99=E8=AF=AF=E3=80=81=E3=80=90=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=BA=93=E3=80=91=E5=8F=82=E4=B8=8E=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B=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

---
 .../main/resources/mapper/dms/AchievementsMapper.xml  |  3 ++-
 .../mapper/dms/TaskResourceLibraryMapper.xml          | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml
index be34d134a..efdfb61a4 100644
--- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml
+++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml
@@ -388,7 +388,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="indexCompetitionStatistic" resultType="java.util.Map">
         select COUNT(*) as CompetitionCountAchievementCount,
-               IFNULL(SUM(is_expert_audit), 0) as expertAuditCount,
+               (select COUNT(distinct crl.open_competition_id) from achievements a join competition_resource_library crl
+                   on a.source_id = crl.id where source = '3' and a.is_expert_audit = 1) as expertAuditCount,
                (select count(1) from clickers c inner join achievements a ON  a.id = c.click_id where click_type = 'Achievements'  and a.source='3') as clickCount,
                (select COUNT(distinct open_competition_id) from competition_resource_library) as  CompetitionCount
         from achievements
diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml
index b72ca6283..978f2d6d5 100644
--- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml
+++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/TaskResourceLibraryMapper.xml
@@ -522,11 +522,12 @@
     </select>
 
     <select id="getConvertedTaskAmount" resultType="java.lang.Double">
-        select IFNULL(sum(t.bounty), 0)
-        from tasks t
-                 join (select distinct task_id from papers where status = 2) p on t.id = p.task_id
-                 join task_resource_library on t.id = task_resource_library.task_id
-        where is_transferred_to_results_library = 1
+        select IFNULL(SUM(bounty), 0)
+        from (select distinct t.id, t.bounty
+              from tasks t
+                       join (select distinct task_id from papers where status = 2) p on t.id = p.task_id
+                       join task_resource_library on t.id = task_resource_library.task_id
+              where is_transferred_to_results_library = 1) tmp
     </select>
 
     <select id="getConvertedTasksCount" resultType="java.lang.Long">