报表修改

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

@@ -244,7 +244,7 @@
         FROM sms_day_report a
         inner join sms_device d on d.id = a.DEVICE_ID
         inner join sms_device_parm b on a.DEVICE_ID = b.DEVICE_ID and a.ATTRIBUTE_ID=b.ATTRIBUTE_ID and b.`STATUS`=1
-            and (b.PARM_TYPE = 7 or b.PARM_TYPE = 10  or b.PARM_TYPE = 11)
+            and (b.PARM_TYPE = 7 or b.PARM_TYPE = 9  or b.PARM_TYPE = 11)
         <where>
             <if test="dayReport.tenantId != null  and dayReport.tenantId != ''">and a.tenant_id =
                 #{dayReport.tenantId}

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

@@ -205,7 +205,7 @@
         FROM sms_device_parm a
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
         where
-        a.IS_REPORT=1
+        a.IS_REPORT=1 and a.status=1
         <if test="report.deviceIds != null and report.deviceIds.size() > 0">
             and a.DEVICE_ID in
             <foreach collection="report.deviceIds" item="dramaId" open="(" close=")" separator=",">

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

@@ -239,7 +239,7 @@
         FROM sms_month_report a
         inner join sms_device d on d.id = a.DEVICE_ID
         inner join sms_device_parm b on a.DEVICE_ID = b.DEVICE_ID and a.ATTRIBUTE_ID=b.ATTRIBUTE_ID and b.`STATUS`=1
-        and (b.PARM_TYPE = 7 or b.PARM_TYPE = 10  or b.PARM_TYPE = 11)
+        and (b.PARM_TYPE = 7 or b.PARM_TYPE = 9  or b.PARM_TYPE = 11)
         <where>
             <if test="monthReport.tenantId != null  and monthReport.tenantId != ''">and a.tenant_id =
                 #{monthReport.tenantId}

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

@@ -236,7 +236,7 @@
         FROM sms_year_report a
         inner join sms_device d on d.id = a.DEVICE_ID
         inner join sms_device_parm b on a.DEVICE_ID = b.DEVICE_ID and a.ATTRIBUTE_ID=b.ATTRIBUTE_ID and b.`STATUS`=1
-        and (b.PARM_TYPE = 7 or b.PARM_TYPE = 10  or b.PARM_TYPE = 11)
+        and (b.PARM_TYPE = 7 or b.PARM_TYPE = 9  or b.PARM_TYPE = 11)
         <where>
             <if test="yearReport.tenantId != null  and yearReport.tenantId != ''">and a.tenant_id =
                 #{yearReport.tenantId}