From f012fc079c5f0d11be14db18f73bfa38b1b38a94 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 04 三月 2025 16:12:33 +0800 Subject: [PATCH] art: 所有设备 台账 点检工单 根据设备id查询点检工单,并过滤掉已完成和已取消的点检工单 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java index fa55386..25e96e5 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java @@ -143,7 +143,7 @@ /**鐘舵��*/ @Excel(name = "鐘舵��", width = 15) @ApiModelProperty(value = "鐘舵��") - private String status = DailyInspectionOrder.STATUS_1; + private String status; /**澶囩敤瀛楁1*/ @Excel(name = "澶囩敤瀛楁1", width = 15) @ApiModelProperty(value = "澶囩敤瀛楁1") @@ -169,6 +169,13 @@ @ApiModelProperty(value = "澶囩敤瀛楁6") private String inspectionOrderUda6; + /**缁翠慨浜虹‘璁ゆ椂闂�*/ + @Excel(name = "缁翠慨浜虹‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "缁翠慨浜虹‘璁ゆ椂闂�") + private Date repairConfirmDate; + @TableField(exist = false) private List<InspectionOrderDetail> inspectionOrderDetailList; -- Gitblit v1.9.3