调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12024_202403JRecordOFData.java

@@ -144,8 +144,12 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                         result.put("undergroundLength", String.valueOf(sum1));
 
                         if (equipPipeDetailDOList.size() > 0) {
-                            result.put("designLifeYears", String.valueOf(equipPipeDetailDOList.get(0).getDesignLifeYears()));
-                            result.put("commissioningDate", String.valueOf(equipPipeDetailDOList.get(0).getCommissioningDate().format(dateFormat)));
+                            if (equipPipeDetailDOList.get(0).getDesignLifeYears() != null){
+                                result.put("designLifeYears", String.valueOf(equipPipeDetailDOList.get(0).getDesignLifeYears()));
+                            }
+                            if (equipPipeDetailDOList.get(0).getCommissioningDate() != null){
+                                result.put("commissioningDate", String.valueOf(equipPipeDetailDOList.get(0).getCommissioningDate().format(dateFormat)));
+                            }
                         }