调整报表

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

@@ -105,14 +105,12 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     PipeTaskOrderInputDO orderInputDO = pipeTaskOrderInputService.lambdaQuery().eq(PipeTaskOrderInputDO::getOrderId, itemReportDO.getOrderId()).one();
                     if (orderInputDO != null && orderInputDO.getEndCheckDate() != null){
                         checkDateStr += " 至 " + orderInputDO.getEndCheckDate().format(dateFormat);
+                        result.put("checkDate2", orderInputDO.getEndCheckDate().format(dateFormat));
                     }
                     result.put("checkDateEnd",checkDateStr);
                     if (taskOrderDO.getCheckDate() != null) {
                         result.put("checkDate1", taskOrderDO.getCheckDate().format(dateFormat));
                     }
-                    if (orderInputDO.getEndCheckDate() != null) {
-                        result.put("checkDate2", orderInputDO.getEndCheckDate().format(dateFormat));
-                    }
                 }
                 //设备信息
                 if (itemDOList.size() > 1) {