From 43ff1154b8dc58f439fbe6b4d69acfe82123d817 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Fri, 25 Aug 2023 11:33:16 +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  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
index 49591f3..ae7d87f 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
@@ -50,19 +50,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="advanceDept" resultType="map">
         SELECT
-            a.`events`,
-            c.type,
-            b.dept_name dept,
-            SUM( c.score ) score,
-            sum( c.now_score ) nowScore
+            f.dept,
+            CONCAT( '{', GROUP_CONCAT( '"', f.type, '":', f.nowScore, '' ), '}' ) json
         FROM
-            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 ( '日常考核指标', '年考核指标' )
+            (
+                SELECT
+                    a.`events`,
+                    b.dept_name dept,
+                    c.type,
+                    SUM( c.score ) score,
+                    sum( c.now_score ) nowScore
+                FROM
+                    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
+            ) f
         GROUP BY
-            c.type
+            f.dept
     </select>
         
     <insert id="insertTAmentAdvancedDept" parameterType="TAmentAdvancedDept" useGeneratedKeys="true" keyProperty="id">