From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
index 9b360d6..bdb4a17 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
@@ -85,7 +85,7 @@
/**鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級*/
@Excel(name = "鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級")
- private String status = CommonConstant.STATUS_1;
+ private String status;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
@@ -94,17 +94,17 @@
@Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
private String maintenanceOrderUda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
+ /**浜岀骇淇濆吇瀹屽伐绉讳氦鍗曞崟鎹紪鐮乮d*/
+ @Excel(name = "浜岀骇淇濆吇瀹屽伐绉讳氦鍗曞崟鎹紪鐮乮d", width = 15)
+ @ApiModelProperty(value = "浜岀骇淇濆吇瀹屽伐绉讳氦鍗曞崟鎹紪鐮乮d")
private String maintenanceOrderUda3;
/**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁4")
+ @Excel(name = "涓夌骇淇濆吇绮惧害妫�楠屽崟鍗曟嵁缂栫爜id", width = 15)
+ @ApiModelProperty(value = "涓夌骇淇濆吇绮惧害妫�楠屽崟鍗曟嵁缂栫爜id")
private String maintenanceOrderUda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁5")
+ /**涓夌骇淇濆吇楠屾敹鍗曞崟鎹紪鐮乮d*/
+ @Excel(name = "涓夌骇淇濆吇楠屾敹鍗曞崟鎹紪鐮乮d", width = 15)
+ @ApiModelProperty(value = "涓夌骇淇濆吇楠屾敹鍗曞崟鎹紪鐮乮d")
private String maintenanceOrderUda5;
/**鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�*/
@Excel(name = "鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�", width = 15)
@@ -117,7 +117,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "淇濆吇鏃ユ湡")
+ private Date maintenanceDate;
+
+ @ApiModelProperty(value = "浜屼繚绉讳氦鍗曠‘璁ょ姸鎬侊紙0鏈‘璁わ紝1鎿嶄綔鍛樼‘璁わ紝2椹冲洖鎿嶄綔鍛橈紝3缁翠慨纭锛�4椹冲洖缁翠慨鍛橈紝5缁翠慨瀹や富浠荤‘璁わ紝6椹冲洖缁翠慨瀹や富浠伙紝7璁惧妫�楠屽憳纭锛�")
private String confirmStatus;
@ApiModelProperty(value = "绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�")
@@ -126,8 +131,23 @@
@ApiModelProperty(value = "闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�")
private String description;
+ @ApiModelProperty(value = "鐐夌被璁惧璞佸厤20椤圭姸鎬侊紙0鏈‘璁わ紝1缁翠慨瀹や富浠伙紝2淇濆吇浜哄憳锛�3浠〃宸ワ級")
private String stoveExemptStatus;
+ @ApiModelProperty(value = "3淇濋獙鏀跺崟妫�鏌ヤ汉鍛�")
+ private String inspectUser;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "3淇濋獙鏀跺崟妫�鏌ユ椂闂�")
+ private Date inspectDate;
+
+ @ApiModelProperty(value = "3淇濋獙鏀舵湭閫氳繃鍘熷洜")
+ private String notPassReason;
+
+ @ApiModelProperty(value = "涓夌骇淇濆吇楠屾敹鐘舵�侊紙1閫氳繃锛�2鏈�氳繃锛�")
+ private String checkStatus;
+
@TableField(exist = false)
private List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails;
}
--
Gitblit v1.9.3