|
|
@@ -126,8 +126,13 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
|
|
|
result.put("materialStandard_"+(i+1),pipeDetail.getMaterialStandard());
|
|
|
result.put("weldCount_"+(i+1),pipeDetail.getWeldCount());
|
|
|
|
|
|
- result.put("designPressure_"+(i+1),pipeDetail.getDesignPressure());
|
|
|
- result.put("designTemperature_"+(i+1),pipeDetail.getDesignTemperature());
|
|
|
+ String designPressure = pipeDetail.getDesignPressure() != null ? pipeDetail.getDesignPressure() : "";
|
|
|
+ String workPressure = pipeDetail.getWorkPressure() != null ? pipeDetail.getWorkPressure() : "";
|
|
|
+ result.put("designPressure_" + (i + 1), designPressure + "/" + workPressure);
|
|
|
+
|
|
|
+ String designTemperature = pipeDetail.getDesignTemperature() != null ? pipeDetail.getDesignTemperature() : "";
|
|
|
+ String workTemperature = pipeDetail.getWorkTemperature() != null ? pipeDetail.getWorkTemperature() : "";
|
|
|
+ result.put("designTemperature_" + (i + 1), designTemperature + "/" + workTemperature);
|
|
|
result.put("pipeMedium_"+(i+1),pipeDetail.getPipeMedium());
|
|
|
|
|
|
String startPoint = pipeDetail.getStartPoint() != null ? pipeDetail.getStartPoint() : "";
|