Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

sms_water/src/main/java/com/huaxu/dto/DevicePressReportAttributeDto.java

@@ -26,18 +26,13 @@ public class DevicePressReportAttributeDto implements Serializable {
     private Date collectDate;
 
     @ApiModelProperty(value = "最小值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double minValue;
     @ApiModelProperty(value = "最大值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double maxValue;
     @ApiModelProperty(value = "平均值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double avgValue;
     @ApiModelProperty(value = "合计值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double sumValue;
     @ApiModelProperty(value = "最新值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double latestValue;
 }

sms_water/src/main/java/com/huaxu/dto/DeviceWaterReportAttributeDto.java

@@ -23,52 +23,37 @@ public class DeviceWaterReportAttributeDto implements Serializable {
     private Date collectDate;
 
     @ApiModelProperty(value = "PH最小值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double minPHValue;
     @ApiModelProperty(value = "PH最大值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double maxPHValue;
     @ApiModelProperty(value = "PH平均值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double avgPHValue;
     @ApiModelProperty(value = "PH合计值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double sumPHValue;
     @ApiModelProperty(value = "PH最新值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double latestPHValue;
 
 
     @ApiModelProperty(value = "CL最小值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double minCLValue;
     @ApiModelProperty(value = "CL最大值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double maxCLValue;
     @ApiModelProperty(value = "CL平均值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double avgCLValue;
     @ApiModelProperty(value = "CL合计值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double sumCLValue;
     @ApiModelProperty(value = "CL最新值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double latestCLValue;
 
     @ApiModelProperty(value = "Qu最小值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double minQuValue;
     @ApiModelProperty(value = "Qu最大值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double maxQuValue;
     @ApiModelProperty(value = "Qu平均值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double avgQuValue;
     @ApiModelProperty(value = "Qu合计值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double sumQuValue;
     @ApiModelProperty(value = "Qu最新值")
-    @JsonSerialize(using = Object6Serialize.class)
     private Double latestQuValue;
 
 }

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

@@ -177,6 +177,12 @@
                 #{dramaId.id}
             </foreach>
         </if>
+        <if test="report.parentSceneIds != null">
+           and  a.PARENT_SCENE_ID in
+            <foreach collection="report.parentSceneIds" item="dramaId" open="(" close=")" separator=",">
+                #{dramaId}
+            </foreach>
+        </if>
         <if test="report.year != null ">and c.`YEAR`=#{report.year}</if>
         <if test="report.month != null ">and c.`MONTH`=#{report.month}</if>
         <if test="report.day != null ">and c.`DAY`=#{report.day}</if>

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

@@ -174,6 +174,12 @@
                 #{dramaId.id}
             </foreach>
         </if>
+        <if test="report.parentSceneIds != null">
+            and  a.PARENT_SCENE_ID in
+            <foreach collection="report.parentSceneIds" item="dramaId" open="(" close=")" separator=",">
+                #{dramaId}
+            </foreach>
+        </if>
         <if test="report.year != null ">and c.`YEAR`=#{report.year}</if>
         <if test="report.month != null ">and c.`MONTH`=#{report.month}</if>
         <if test="report.parentSceneId != null ">and c.PARENT_SCENE_ID=#{report.parentSceneId}</if>

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

@@ -171,6 +171,12 @@
                 #{dramaId.id}
             </foreach>
         </if>
+        <if test="report.parentSceneIds != null > 0">
+            and  a.PARENT_SCENE_ID in
+            <foreach collection="report.parentSceneIds" item="dramaId" open="(" close=")" separator=",">
+                #{dramaId}
+            </foreach>
+        </if>
         <if test="report.year != null ">and c.`YEAR`=#{report.year}</if>
         <if test="report.month != null ">and c.`MONTH`=#{report.month}</if>
         <if test="report.parentSceneId != null ">and a.PARENT_SCENE_ID=#{report.parentSceneId}</if>