浏览代码

Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

pull/101/head
suqin 10 个月前
父节点
当前提交
0d1249c1fb
共有 1 个文件被更改,包括 2 次插入2 次删除
  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 查看文件

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

正在加载...
取消
保存