任务总览 近七日接口修改

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -68,24 +68,24 @@
 <!--        ORDER BY-->
 <!--            b.alarmDate ASC-->
         SELECT
-        a.date as axisData ,
+        DATE_FORMAT(a.date,'%m/%d')  as axisData ,
         IFNULL(b.seriesData,0) as seriesData
         FROM
         (
         SELECT
-        CURDATE( ) AS date UNION ALL
+        DATE_SUB( CURDATE( ), INTERVAL 6 DAY ) AS date UNION ALL
         SELECT
-        DATE_SUB( CURDATE( ), INTERVAL 1 DAY ) AS date UNION ALL
+        DATE_SUB( CURDATE( ), INTERVAL 5 DAY ) AS date UNION ALL
         SELECT
-        DATE_SUB( CURDATE( ), INTERVAL 2 DAY ) AS date UNION ALL
+        DATE_SUB( CURDATE( ), INTERVAL 4 DAY ) AS date UNION ALL
         SELECT
         DATE_SUB( CURDATE( ), INTERVAL 3 DAY ) AS date UNION ALL
         SELECT
-        DATE_SUB( CURDATE( ), INTERVAL 4 DAY ) AS date UNION ALL
+        DATE_SUB( CURDATE( ), INTERVAL 2 DAY ) AS date UNION ALL
         SELECT
-        DATE_SUB( CURDATE( ), INTERVAL 5 DAY ) AS date UNION ALL
+        DATE_SUB( CURDATE( ), INTERVAL 1 DAY ) AS date UNION ALL
         SELECT
-        DATE_SUB( CURDATE( ), INTERVAL 6 DAY ) AS date
+        CURDATE( ) AS date
         ) a
         LEFT JOIN  (SELECT
         IFNULL( count( log.SEQUENCE_NBR ), 0 ) AS seriesData,
@@ -96,7 +96,7 @@
         log.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
         AND date( log.CREATE_DATE ) >= CURDATE( ) - INTERVAL 7 DAY
         GROUP BY
-        date( log.CREATE_DATE )) b ON a.date = b.axisData
+        date( log.CREATE_DATE )) b ON a.date = b.axisData ORDER BY axisData
     </select>
 
     <select id="queryWarningList" resultType="java.util.Map">