修改大屏接口

cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml

@@ -49,10 +49,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="advanceDept" resultType="map">
+        SELECT
+            f.dept,
+            CONCAT( '{', GROUP_CONCAT( '"', f.type, '":', f.nowScore, '' ), '}' ) json
+        FROM
+            (
                 SELECT
                     a.`events`,
-            c.type,
                     b.dept_name dept,
+                    c.type,
                     SUM( c.score ) score,
                     sum( c.now_score ) nowScore
                 FROM
@@ -60,9 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         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 ( '日常考核指标', '年考核指标' )
+                    c.type IN ( '日常考核指标', '年度考核指标' )
                 GROUP BY
                     c.type
+            ) f
+        GROUP BY
+            f.dept
     </select>
         
     <insert id="insertTAmentAdvancedDept" parameterType="TAmentAdvancedDept" useGeneratedKeys="true" keyProperty="id">