From 94fd631ea7ab64aa6c692e4345d2a242950c04d4 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Fri, 25 Aug 2023 11:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/TAmentAdvancedDeptMapper.xml       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
index 3774904..0348e48 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
@@ -50,10 +50,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="advanceDept" resultType="map">
         SELECT
-            `dept`,
-            `events`
+            a.`events`,
+            b.dept_name dept,
+            SUM( c.score ) score,
+            sum( c.now_score ) nowScore
         FROM
-            t_ament_advanced_dept
+            t_ament_advanced_dept a
+                LEFT JOIN sys_dept b ON a.dept = b.dept_id
+                LEFT JOIN t_ament_party_affairs c ON a.dept = c.dept_id
+        WHERE
+            c.type IN ( '日常考核指标', '年考核指标' )
+        GROUP BY
+            c.type
     </select>
         
     <insert id="insertTAmentAdvancedDept" parameterType="TAmentAdvancedDept" useGeneratedKeys="true" keyProperty="id">