修改大屏接口

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`,
+            f.dept,
-            c.type,
+            CONCAT( '{', GROUP_CONCAT( '"', f.type, '":', f.nowScore, '' ), '}' ) json
-            b.dept_name dept,
-            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
+                SELECT
-                LEFT JOIN t_ament_party_affairs c ON a.dept = c.dept_id
+                    a.`events`,
-        WHERE
+                    b.dept_name dept,
-            c.type IN ( '日常考核指标', '年考核指标' )
+                    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">