图表表修改

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -42,8 +42,8 @@
             r.`HOUR` as "dateLabel",
             CONCAT(r.`YEAR`,'-',if(r.`MONTH`<10,CONCAT(0,r.`MONTH`),r.`MONTH`),'-',if(r.`DAY`<10,CONCAT(0,r.`DAY`),r.`DAY`),' ',if(r.`HOUR`<10,CONCAT(0,r.`HOUR`),r.`HOUR`),':00') as "dateStringLabel",
         </if>
-        cast(ifnull(r.AVG_VALUE,'') as char)+ifnull(da.UNIT,'') as "monitorData"
-        ,r.AVG_VALUE as "data"
+        CONCAT(cast(ifnull(ROUND(r.AVG_VALUE,2),'') as char),ifnull(da.unit,'')) as "monitorData"
+        ,ROUND(r.AVG_VALUE,2) as "data"
         ,r.COLLECT_DATE as "date"
 
         ,d.DEVICE_CODE as "devoceCode"
@@ -128,8 +128,8 @@
         ,da.unit as "unit"
         ,if(da.ATTRIBUTE_TYPE=3,'用水量','耗电量') as  "attributeName"
 
-        ,cast(ifnull(sum(r.SUM_VALUE),0) as char)+ifnull(da.UNIT,'') as "monitorData"
-        ,ifnull(sum(r.SUM_VALUE) ,0)  as "data"
+        ,CONCAT(cast(ifnull(ROUND(sum(r.SUM_VALUE),2),0) as char),ifnull(da.unit,'')) as "monitorData"
+        ,ifnull(ROUND(sum(r.SUM_VALUE),2) ,0)  as "data"
         ,max(r.COLLECT_DATE) as "date"
 
         <if test="type != null and type ==1">
@@ -217,8 +217,8 @@
         ,da.unit as "unit"
         ,if(da.ATTRIBUTE_TYPE=8,'PH',if(da.ATTRIBUTE_TYPE=11,'余氯','浊度')) as  "attributeName"
 
-        ,cast(ifnull(avg(r.SUM_VALUE),0) as char)+ifnull(da.UNIT,'') as "monitorData"
-        ,ifnull(avg(r.SUM_VALUE) ,0)  as "data"
+        ,CONCAT(cast(ifnull(ROUND(avg(r.SUM_VALUE),2),0) as char),ifnull(da.UNIT,'')) as "monitorData"
+        ,ifnull(ROUND(avg(r.SUM_VALUE),2) ,0)  as "data"
         ,max(r.COLLECT_DATE) as "date"
 
         <if test="type != null and type ==1">