From 8003d2dfce2741d1b7f86e11d1bae9cf6a4f171e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 20 Dec 2019 19:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/item/ItemDao.xml    | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index fa0acf159..7efdddbe5 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -897,51 +897,52 @@
     <select id="selectListPeopleEvaluationMetaData"
             resultType="com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO">
         SELECT
-            dept.deptId,
-            COUNT( ei.EVALUATION_SCORE = '0' OR NULL ) lowAmount,
-            COUNT( ei.EVALUATION_SCORE = '1' OR NULL ) mediumAmount,
-            COUNT( ei.EVALUATION_SCORE = '2' OR NULL ) highAmount
+        dept.deptId,
+        COUNT( ei.EVALUATION_SCORE = '0' OR NULL ) lowAmount,
+        COUNT( ei.EVALUATION_SCORE = '1' OR NULL ) mediumAmount,
+        COUNT( ei.EVALUATION_SCORE = '2' OR NULL ) highAmount
         FROM
-            (
-            <foreach collection="gridIdList" item="item" separator="UNION ALL">
-                SELECT #{item} AS deptId
-            </foreach>
-            ) dept
-            LEFT JOIN epdc_item ei ON ei.GRID_ID = dept.deptId
+        (
+        <foreach collection="gridIdList" item="item" separator="UNION ALL">
+            SELECT #{item} AS deptId
+        </foreach>
+        ) dept
+        LEFT JOIN epdc_item ei ON ei.GRID_ID = dept.deptId
         WHERE
-            (ei.DEL_FLAG = '0' AND ei.CREATED_TIME BETWEEN #{startDate} AND #{endDate})
-            OR ei.DEL_FLAG IS NULL
+        (ei.DEL_FLAG = '0' AND ei.CREATED_TIME BETWEEN #{startDate} AND #{endDate})
+        OR ei.DEL_FLAG IS NULL
         GROUP BY
-            dept.deptId
+        dept.deptId
     </select>
 
 
     <select id="selectListJobEvaluation" resultType="com.elink.esua.epdc.dto.KpiMetaDataDTO">
         SELECT
-            <if test="evaluationLevel=='0'">
-                '网格评议不满意数' as dataName,
-                'grid_low_evaluation_amount' as dataCode,
-            </if>
-            <if test="evaluationLevel=='1'">
-                '网格评议基本满意数' as dataName,
-                'grid_medium_evaluation_amount' as dataCode,
-            </if>
-            <if test="evaluationLevel=='2'">
-                '网格评议满意数' as data_name,
-                'grid_high_evaluation_amount' as dataCode,
-            </if>
-            COUNT(ed.ID) as dataValue,
-            #{startDate} as startDate,
-            #{endDate} as endDate
+        <if test="evaluationLevel=='0'">
+            '网格评议不满意数' as dataName,
+            'grid_low_evaluation_amount' as dataCode,
+        </if>
+        <if test="evaluationLevel=='1'">
+            '网格评议基本满意数' as dataName,
+            'grid_medium_evaluation_amount' as dataCode,
+        </if>
+        <if test="evaluationLevel=='2'">
+            '网格评议满意数' as data_name,
+            'grid_high_evaluation_amount' as dataCode,
+        </if>
+        COUNT(ed.ID) as dataValue,
+        #{startDate} as startDate,
+        #{endDate} as endDate,
+        dept.deptId AS deptId
         FROM
         <foreach item="deptId" collection="deptIdList" open="(  " separator="UNION ALL" close=") dept">
             SELECT #{deptId} AS deptId
         </foreach>
         LEFT JOIN
-            epdc_item_evaluate_dept ed ON dept.deptId = ed.DEPT_ID
+        epdc_item_evaluate_dept ed ON dept.deptId = ed.DEPT_ID
         AND
         #{evaluationLevel} = ed.EVALUATION_LEVEL
-        AND  ed.DEL_FLAG = '0' AND ed.CREATED_TIME BETWEEN #{startDate} AND #{endDate}
+        AND ed.DEL_FLAG = '0' AND ed.CREATED_TIME BETWEEN #{startDate} AND #{endDate}
         GROUP BY
         dept.deptId
     </select>