From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
index 2f195aa..8807fe2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,6 +11,7 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
@@ -61,16 +63,16 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "绠＄悊鍒跺害鍙�", width = 15)
+ @ApiModelProperty(value = "绠＄悊鍒跺害鍙�")
private String disUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
+ @Excel(name = "瀹℃牳缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃牳缁撴灉")
private String disUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
+ @Excel(name = "瀹℃壒缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃壒缁撴灉")
private String disUda3;
/**澶囩敤瀛楁4*/
@Excel(name = "澶囩敤瀛楁4", width = 15)
@@ -85,7 +87,49 @@
@ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
private String status = CommonConstant.STATUS_1;
+ @ApiModelProperty(value = "绛惧鐘舵�侊紙1宸茬紪鍒讹紝2椹冲洖缂栧埗锛�3宸插鏍革紝4椹冲洖瀹℃牳锛�5閫氳繃锛�")
+ private String approvalStatus;
+
+ @ApiModelProperty(value = "瀹℃牳/椹冲洖鎰忚")
+ private String auditFeedback;
+
+ @ApiModelProperty(value = "瀹℃壒/椹冲洖鎰忚")
+ private String approvalFeedback;
+
+ @ApiModelProperty(value = "缂栧埗浜�")
+ private String writePerson;
+
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String auditPerson;
+
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ private String approvalPerson;
+
+ @ApiModelProperty(value = "瀹℃壒澶辨晥浜�")
+ private String loseEfficacyPerson;
+
+ /**
+ * 鐢熸晥鏃堕棿
+ */
+ @ApiModelProperty(value = "鐢熸晥鏃堕棿")
+ @Excel(name = "鐢熸晥鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date takeEffectTime;
+
+ /**
+ * 澶辨晥鏃堕棿
+ */
+ @ApiModelProperty(value = "澶辨晥鏃堕棿")
+ @Excel(name = "澶辨晥鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date loseEfficacyTime;
+
@TableField(exist = false)
private List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist;
+ @TableField(exist = false)
+ private List<DailyInspectionStandard> dailyInspectionStandardlist;
+
}
--
Gitblit v1.9.3