wangyangyang преди 4 години
родител
ревизия
5c0ab15af2
променени са 2 файла, в които са добавени 4 реда и са изтрити 1 реда
  1. 2 0
      sms_water/src/main/java/com/huaxu/dto/ReportAttributeDto.java
  2. 2 1
      sms_water/src/main/resources/mapper/DeviceParmMapper.xml

+ 2 - 0
sms_water/src/main/java/com/huaxu/dto/ReportAttributeDto.java

@@ -91,5 +91,7 @@ public class ReportAttributeDto  implements Serializable {
     @ApiModelProperty(value = "报表维度设置ID")
     private Integer dimensionId;
 
+    @ApiModelProperty(value = "报表维护类型")
+    private Integer type;
 
 }

+ 2 - 1
sms_water/src/main/resources/mapper/DeviceParmMapper.xml

@@ -300,7 +300,8 @@
         s.SHOW_ON_OFF AS "showOnOff",
         d.DEVICE_NAME AS "deviceName",
         a.ATTRIBUTE_ID AS "deviceParmId",
-        b.UNIT as "unit"
+        b.UNIT as "unit",
+        1 as "type"
         FROM sms_device_parm a
         INNER JOIN sms_device d on d.ID = a.DEVICE_ID
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID