Selaa lähdekoodia

Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

pull/101/head
suqin 8 kuukautta sitten
vanhempi
commit
0d1249c1fb
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. +2
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/report/ExportReportService.java

+ 2
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airData/report/ExportReportService.java Näytä tiedosto

log.info("导出报告,大气类型不存在,airDataType={}", request.getAirDataType()); log.info("导出报告,大气类型不存在,airDataType={}", request.getAirDataType());
throw new ServiceException("大气类型不存在"); throw new ServiceException("大气类型不存在");
} }
AirDataExport airDataExport = this.checkAirDataExport(request, airDataType);
/* AirDataExport airDataExport = this.checkAirDataExport(request, airDataType);
if (ObjectUtil.isNotEmpty(airDataExport)) { if (ObjectUtil.isNotEmpty(airDataExport)) {
return JsonResult.success(airDataExport.getOssUrl(), "导出成功"); return JsonResult.success(airDataExport.getOssUrl(), "导出成功");
}
}*/
Inspection inspection = (Inspection) result.getData(); Inspection inspection = (Inspection) result.getData();
List<AirData> airDataList = airDataMapper.selectList(Wrappers.<AirData>lambdaQuery() List<AirData> airDataList = airDataMapper.selectList(Wrappers.<AirData>lambdaQuery()
.eq(AirData::getMark, MarkEnum.VALID.getCode()) .eq(AirData::getMark, MarkEnum.VALID.getCode())

Loading…
Peruuta
Tallenna