10098调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10098_202400RecordOFData.java

@@ -96,6 +96,8 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 result.put("unitInternalCode",equipBoilerDO.getUnitInternalCode());
                 if (equipBoilerDO.getMadeTime() != null){
                     result.put("madeTime",equipBoilerDO.getMadeTime().format(dateFormat));
+                }else{
+                    result.put("madeTime"," - ");
                 }
                 result.put("productCode",equipBoilerDO.getProductCode());
                 result.put("equipCode",equipBoilerDO.getEquipCode());
@@ -113,9 +115,11 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 result.put("buringMethod",equipBoilerDO.getBuringMethod());
                 result.put("ratedOutput",equipBoilerDO.getRatedOutput());
                 //上次内检日期
-//                if (equipBoilerDO.getLastAllDate() != null){
-//                    result.put("nextInCheckDate",equipBoilerDO.getLastAllDate().format(dateFormat));
-//                }
+                if (equipBoilerDO.getLastAllDate() != null){
+                    result.put("nextInCheckDate",equipBoilerDO.getLastAllDate().format(dateFormat));
+                }else{
+                    result.put("nextInCheckDate"," - ");
+                }
                 //上次外检日期
 //                if (equipBoilerDO.getLastYearDate() != null){
 //                    result.put("nextOutCheckDate",equipBoilerDO.getLastYearDate().format(dateFormat));
@@ -123,6 +127,8 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 //上次耐压日期
                 if (equipBoilerDO.getLastPressureDate() != null){
                     result.put("nextPressureCheckDate",equipBoilerDO.getLastPressureDate().format(dateFormat));
+                }else {
+                    result.put("nextPressureCheckDate"," - ");
                 }
                 result.put("contact",equipBoilerDO.getContact());
                 if (equipBoilerDO.getUseTime() != null){