Commit 15578c60 authored by chenzhao's avatar chenzhao

风电健康指数查询优化

parent 62aae5d9
...@@ -175,7 +175,9 @@ public class TdInfoQueryController extends BaseController { ...@@ -175,7 +175,9 @@ public class TdInfoQueryController extends BaseController {
List<FanHealthIndex> fanHealthIndexIPage = fanHealthIndexMapper.getInfoByPage(dto); List<FanHealthIndex> fanHealthIndexIPage = fanHealthIndexMapper.getInfoByPage(dto);
fanHealthIndexIPage.forEach(item -> { fanHealthIndexIPage.forEach(item -> {
item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex()))); item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex())));
item.setAnalysisType(dto.getAnalysisType()); if (null != dto.getAnalysisType()){
item.setAnalysisType(dto.getAnalysisType());
}
}); });
Integer infoByPageTotal = fanHealthIndexMapper.getInfoByPageTotal(dto); Integer infoByPageTotal = fanHealthIndexMapper.getInfoByPageTotal(dto);
resultPage.setRecords(fanHealthIndexIPage); resultPage.setRecords(fanHealthIndexIPage);
...@@ -290,7 +292,9 @@ public class TdInfoQueryController extends BaseController { ...@@ -290,7 +292,9 @@ public class TdInfoQueryController extends BaseController {
List<PvHealthIndex> pvHealthIndexIPage = pvHealthIndexMapper.getInfoByPage(dto); List<PvHealthIndex> pvHealthIndexIPage = pvHealthIndexMapper.getInfoByPage(dto);
pvHealthIndexIPage.forEach(item -> { pvHealthIndexIPage.forEach(item -> {
item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex()))); item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex())));
item.setAnalysisType(dto.getAnalysisType()); if (null != dto.getAnalysisType()){
item.setAnalysisType(dto.getAnalysisType());
}
}); });
Integer infoByPageTotal = pvHealthIndexMapper.getInfoByPageTotal(dto); Integer infoByPageTotal = pvHealthIndexMapper.getInfoByPageTotal(dto);
resultPage.setRecords(pvHealthIndexIPage); resultPage.setRecords(pvHealthIndexIPage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment