报表修改

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

@@ -27,6 +27,10 @@ public class ReportDto implements Serializable {
     private Integer hour;
     @ApiModelProperty("一级场景信息")
     private Integer parentSceneId;
+    /** 一级场景s */
+    @JsonIgnore
+    @ApiModelProperty(value = "一级场景IDS")
+    private Long[] parentSceneIds;
     @ApiModelProperty("一级场景名称")
     private String parentSceneName;
     @ApiModelProperty("今日供水量or今日出水量")

sms_water/src/main/java/com/huaxu/service/DayReportService.java

@@ -94,6 +94,7 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
             reportDto.setMonth(month);
             reportDto.setDay(day);
             reportDto.setDeviceIds(devices);
+            reportDto.setParentSceneIds(ids);
             List<ReportAttributeDto> reportAttributeDtos2 = deviceParmService.findAttributeNameList(reportDto);
             List<String> dataTitle = new ArrayList<>();
             Map<String, Integer> mapsTitle = new LinkedHashMap<>();

sms_water/src/main/java/com/huaxu/service/MonthReportService.java

@@ -87,6 +87,7 @@ public class MonthReportService extends ServiceImpl<MonthReportMapper, MonthRepo
             reportDto.setYear(year);
             reportDto.setMonth(month);
             reportDto.setDeviceIds(devices);
+            reportDto.setParentSceneIds(ids);
             List<ReportAttributeDto> reportAttributeDtos2 = deviceParmService.findAttributeNameList(reportDto);
             List<String> dataTitle = new ArrayList<>();
             Map<String, Integer> mapsTitle = new LinkedHashMap<>();

sms_water/src/main/java/com/huaxu/service/YearReportService.java

@@ -87,6 +87,7 @@ public class YearReportService extends ServiceImpl<YearReportMapper, YearReportE
             ReportDto reportDto = new ReportDto();
             reportDto.setYear(year);
             reportDto.setDeviceIds(devices);
+            reportDto.setParentSceneIds(ids);
             List<ReportAttributeDto> reportAttributeDtos2 = deviceParmService.findAttributeNameList(reportDto);
             List<String> dataTitle = new ArrayList<>();
             Map<String, Integer> mapsTitle = new LinkedHashMap<>();

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

@@ -212,6 +212,10 @@
                 #{dramaId.id}
             </foreach>
         </if>
+        and a.PARENT_SCENE_ID in
+        <foreach collection="report.parentSceneIds" item="dramaId" open="(" close=")" separator=",">
+            #{dramaId}
+        </foreach>
         ORDER BY a.SEQ
         ) as tab
     </select>