|
@@ -797,16 +797,12 @@ public class TFurnancePressureController extends BaseController
|
|
am = furnancePressure;
|
|
am = furnancePressure;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (recordTime.getTime() >= parse.getTime()) {
|
|
|
|
- if (pm == null ) {
|
|
|
|
- return AjaxResult.error("当天数据未生成");
|
|
|
|
- } else {
|
|
|
|
|
|
+ if (tFurnancePressures.size() == 0) {
|
|
|
|
+ return AjaxResult.error("当天数据未生成");
|
|
|
|
+ } else {
|
|
|
|
+ if (recordTime.getTime() >= parse.getTime()) {
|
|
this.isComplete(pm);
|
|
this.isComplete(pm);
|
|
return AjaxResult.success(pm);
|
|
return AjaxResult.success(pm);
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- if (am == null ) {
|
|
|
|
- return AjaxResult.error("当天数据未生成");
|
|
|
|
} else {
|
|
} else {
|
|
this.isComplete(am);
|
|
this.isComplete(am);
|
|
return AjaxResult.success(am);
|
|
return AjaxResult.success(am);
|