1.应急故障原因卡片没数据

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -198,9 +198,9 @@ public class YJDPStatisticsServiceImpl {
         if (orgCode == null) {
             return jsonObject;
         }
-        List<Map<String, Object>> maps = alertCalledMapper.faultCauseRatio(orgCode);
-        List<Object> xdata = maps.stream().map(item -> item.get("errorResult")).collect(Collectors.toList());
-        List<Object> ydata = maps.stream().map(item -> item.get("majorAlertCount")).collect(Collectors.toList());
+        List<CountDto> maps = alertCalledMapper.faultCauseRatio(orgCode);
+        List<Object> xdata = maps.stream().map(CountDto::getKeyStr).collect(Collectors.toList());
+        List<Object> ydata = maps.stream().map(CountDto::getLongValue).collect(Collectors.toList());
         jsonObject.put("xdata", xdata);
         jsonObject.put("ydata", ydata);
         return jsonObject;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/AlertCalledMapper.java

@@ -137,6 +137,6 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
   *
   * @return
   */
- List<Map<String, Object>> faultCauseRatio(@Param("regionCode") String regionCode);
+ List<CountDto> faultCauseRatio(@Param("regionCode") String regionCode);
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -659,21 +659,18 @@
 		ORDER BY ibjuj.USE_PLACE ASC
 	</select>
 
-	<select id="faultCauseRatio" resultType="java.util.Map">
+	<select id="faultCauseRatio" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
 		SELECT
-			tafv.field_value AS errorResult,
-			ifnull ( SUM ( CASE WHEN tac.father_alert IS NULL THEN 1 ELSE 0 END ), 0 ) AS majorAlertCount
+			tafv.field_value AS keyStr,
+			ifnull (SUM (CASE WHEN tac.father_alert IS NULL THEN 1 ELSE 0 END ), 0 ) AS longValue
 		FROM
-			tz_alert_called tac
-				LEFT JOIN tz_dispatch_task tdt ON tac.sequence_nbr = tdt.alert_id
-				LEFT JOIN tz_alert_form_value tafv ON tac.sequence_nbr = tafv.alert_called_id
-				LEFT JOIN cb_data_dictionary cdd ON cdd.NAME = tafv.field_value
+			  tz_alert_form_value tafv
+			  LEFT JOIN tz_dispatch_paper dp on dp.sequence_nbr = tafv.alert_called_id
+			  LEFT JOIN tz_alert_called tac on dp.alert_id = tac.sequence_nbr
 		WHERE
-			tac.biz_org_code LIKE concat(#{regionCode}, '%')
-		  AND tac.alarm_type_code = '961'
-		  AND cdd.TYPE = 'GZYY'
-		  AND tafv.field_code = 'error_result'
-		  AND tafv.field_value IS NOT NULL
+			 tac.biz_org_code LIKE concat(#{regionCode}, '%')
+		     AND tafv.field_code = 'error_result'
+		     AND tafv.field_value IS NOT NULL
 		GROUP BY
 			tafv.field_value
 		ORDER BY