|
|
@@ -311,7 +311,7 @@ public class HealthReportService {
|
|
|
}
|
|
|
|
|
|
List<Windturbinewindyaw> nzs =windturbinewindyawService.getnzt(wt.getId(),day);
|
|
|
- if(nzs!=null && nzs.size()>0){
|
|
|
+ if(nzs.get(0)!=null){
|
|
|
Windturbinewindyaw windturbinewindyaw = nzs.get(0);
|
|
|
Field[] field = windturbinewindyaw.getClass().getDeclaredFields(); // 获取实体类的所有属性，返回Field数组
|
|
|
List<NippleVo> nippleVos = new ArrayList<>();
|
|
|
@@ -729,6 +729,9 @@ public class HealthReportService {
|
|
|
qw.eq("year",year);
|
|
|
qw.eq("month",month);
|
|
|
Healthreport healthreport = healthreportService.getOne(qw);
|
|
|
+ if(null==healthreport){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
HealthReportVo healthReportVo = com.gyee.gradeevaluation.util.JSONUtils.jsonStrToJava(healthreport.getHealthreport(),HealthReportVo.class);
|
|
|
HealthReportVo healthReportVo1 = null;
|
|
|
if (healthreport.getIsrecommend()==1){
|
