报表修改

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

@@ -160,13 +160,13 @@
         (SELECT
         c.year,c.month,c.day,c.hour,
         case when a.PARM_TYPE=4 then
-        c.latest_value end as "intakeWaterUsage",
+        c.SUM_VALUE end as "intakeWaterUsage",
         case when a.PARM_TYPE=3 then
-        c.latest_value end as "yieldWaterUsage",
+        c.SUM_VALUE end as "yieldWaterUsage",
         case when a.PARM_TYPE=5 then
-        c.latest_value end as "powerUsage",
+        c.SUM_VALUE end as "powerUsage",
         case when a.PARM_TYPE=6 then
-        c.latest_value end as "drugUsage"
+        c.SUM_VALUE end as "drugUsage"
         FROM sms_device_parm a
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
         INNER JOIN sms_day_report c on a.ATTRIBUTE_ID=c.ATTRIBUTE_ID and a.DEVICE_ID=c.DEVICE_ID

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

@@ -157,13 +157,13 @@
         (SELECT
         c.year,c.month,c.day,
         case when a.PARM_TYPE=4 then
-        c.latest_value end as "intakeWaterUsage",
+        c.SUM_VALUE end as "intakeWaterUsage",
         case when a.PARM_TYPE=3 then
-        c.latest_value end as "yieldWaterUsage",
+        c.SUM_VALUE end as "yieldWaterUsage",
         case when a.PARM_TYPE=5 then
-        c.latest_value end as "powerUsage",
+        c.SUM_VALUE end as "powerUsage",
         case when a.PARM_TYPE=6 then
-        c.latest_value end as "drugUsage"
+        c.SUM_VALUE end as "drugUsage"
         FROM sms_device_parm a
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
         INNER JOIN sms_month_report c on a.ATTRIBUTE_ID=c.ATTRIBUTE_ID and a.DEVICE_ID=c.DEVICE_ID

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

@@ -154,13 +154,13 @@
         (SELECT
         c.year,c.month,
         case when a.PARM_TYPE=4 then
-        c.latest_value end as "intakeWaterUsage",
+        c.SUM_VALUE end as "intakeWaterUsage",
         case when a.PARM_TYPE=3 then
-        c.latest_value end as "yieldWaterUsage",
+        c.SUM_VALUE end as "yieldWaterUsage",
         case when a.PARM_TYPE=5 then
-        c.latest_value end as "powerUsage",
+        c.SUM_VALUE end as "powerUsage",
         case when a.PARM_TYPE=6 then
-        c.latest_value end as "drugUsage"
+        c.SUM_VALUE end as "drugUsage"
         FROM sms_device_parm a
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
         INNER JOIN sms_year_report c on a.ATTRIBUTE_ID=c.ATTRIBUTE_ID and a.DEVICE_ID=c.DEVICE_ID