From 2820d7073612da3f87d657a50dbf7fcbe6d0cd40 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Mon, 30 Dec 2024 17:43:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=204447=E4=BF=AE=E5=A4=8D=EF=BC=9A=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9D=9F=E5=90=8E=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=A7=E4=BB=B6=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/subeva/SubCorepersonMapper.xml     | 57 +++++++++----------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
index c1c432a..3ac4a90 100644
--- a/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/subeva/SubCorepersonMapper.xml
@@ -59,26 +59,27 @@
 
         WHERE bsc.is_active = '1' and td.`value` = #{params.month} and fcpe.eva_date is not null
     </select>
-    <select id="list" resultType="com.bonus.bmw.subeva.entity.SubEvaBean" >
-          SELECT
-            bsc.`id` as id,
-            bp.`NAME` as proName,
-            bs.sub_name as subName,
-          bsc.contract_name as contractName,
-         COUNT(bsr.id) AS teamNumber,
-          td.`value` AS evaMonth,
-            fcpe.eva_grade AS evaGrade,
-            fcpe.eva_name AS evaName,
-            fcpe.eva_date AS evaDate,
-            fcpe.eva_id as evaId,
-            fcpe.eva_year as evaYear
+
+    <sql id="listRef">
+        SELECT
+        bsc.`id` as id,
+        bp.`NAME` as proName,
+        bs.sub_name as subName,
+        bsc.contract_name as contractName,
+        COUNT(bsr.id) AS teamNumber,
+        td.`value` AS evaMonth,
+        fcpe.eva_grade AS evaGrade,
+        fcpe.eva_name AS evaName,
+        fcpe.eva_date AS evaDate,
+        fcpe.eva_id as evaId,
+        fcpe.eva_year as evaYear
         FROM
-          `bm_sub_contract` bsc
-            LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
-            LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
-            LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id AND bsr.type = '3' and bsr.is_active = '1'
-          LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
-          LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
+        `bm_sub_contract` bsc
+        LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
+        LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
+        LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id AND bsr.type = '3' and bsr.is_active = '1'
+        LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
+        LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
 
         WHERE bsc.is_active = '1' and td.`value` = #{params.month}
         <if test="params != null and params != ''">
@@ -91,21 +92,15 @@
 
         </if>
         GROUP BY bsc.id
-    limit #{offset}, #{limit}
+    </sql>
+
+    <select id="list" resultType="com.bonus.bmw.subeva.entity.SubEvaBean" >
+          <include refid="listRef"></include>
+          limit #{offset}, #{limit}
     </select>
 
     <select id="count" resultType="java.lang.Integer">
-      SELECT
-             count(1)
-        FROM
-          `bm_sub_contract` bsc
-            LEFT JOIN bm_project bp on bp.id = bsc.pro_id and bp.is_active = '1'
-            LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1'
-            LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id AND bsr.type = '1' and bsr.is_active = '3'
-          LEFT JOIN t_dict td ON td.type = 'monthcheck' and td.is_active = '1'
-          LEFT JOIN fbeva_core_person_evalu fcpe ON fcpe.eva_month = td.`value` AND bsc.id = fcpe.contract_id and fcpe.eva_year = #{params.year}
-
-        WHERE bsc.is_active = '1' and td.`value` = #{params.month}
+        select count(*) from (<include refid="listRef"></include>) as c
     </select>
     <select id="getPersonNameList" resultType="com.bonus.bmw.subeva.entity.SubEvaBean">
         select