xy 1 周之前
父节点
当前提交
da0d4bda0e

+ 2 - 2
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeInspectionOpinionReportedExcelVO.java

@@ -84,8 +84,8 @@ public class PipeInspectionOpinionReportedExcelVO {
     @ExcelProperty("任务单号")
     private String orderNo;
 
-    @Schema(description = "设备代码")
-    @ExcelProperty(value = "设备注册代码")
+    @Schema(description = "工程号")
+    @ExcelProperty(value = "工程号")
     private String equipCode;
 
     @Schema(description = "使用单位")

+ 1 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12024_202403ReportOFData.java

@@ -119,6 +119,7 @@ public class QC12024_202403ReportOFData implements IDynamicOFData {
                 PipeTaskOrderInputDO orderInputDO = pipeTaskOrderInputService.lambdaQuery().eq(PipeTaskOrderInputDO::getOrderId, orderId).one();
                 if (orderInputDO != null && orderInputDO.getEndCheckDate() != null) {
                     checkDateStr += " 至 " + orderInputDO.getEndCheckDate().format(dateFormat);
+                    result.put("checkDate2", orderInputDO.getEndCheckDate().format(dateFormat));
                 }
                 result.put("checkDateEnd", checkDateStr);
             }