From a63ccbac7d05e8f7592fd2040275770d59f67c5f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 05 十二月 2024 11:21:47 +0800
Subject: [PATCH] 同步调整
---
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java
index 679f70b..88ac4a8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java
@@ -7,6 +7,7 @@
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 璐ㄩ噺绠＄悊锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲璋冩暣
@@ -22,7 +23,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
+ @PropertyDef(label = "涓婚敭ID", description = "yyyyMMdd + 4浣嶉『搴忓彿")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -57,13 +58,13 @@
@PropertyDef(label = "妫�楠屾椂闂�")
private Date time;
- @Column(name = "USER_", length = 50)
- @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
- private String user;
-
@Column(name = "UNIT_", length = 50)
@PropertyDef(label = "妫�楠屽崟浣�")
private String unit;
+
+ @Column(name = "USER_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
+ private String user;
@Column(name = "STANDARD_", length = 4)
@PropertyDef(label = "妫�楠屼緷鎹�", description = "1-鍥芥爣锛�0-鍏朵粬")
@@ -77,6 +78,10 @@
@Column(name = "RESULT_", length = 40)
@PropertyDef(label = "妫�楠岀粨璁�", description = "1銆佽川閲忔寚鏍囧～鍐�/杈炬爣/涓嶈揪鏍� 2銆佸偍瀛樺搧璐ㄦ寚鏍囧～鍐欌�滃疁瀛樷�濄�佽交搴︿笉瀹滃瓨鈥濄�佲�滈噸搴︿笉瀹滃瓨鈥�3銆侀鍝佸畨鍏ㄦ寚鏍囧～鍐欌�滃悎鏍尖�濄�佷笉鍚堟牸鈥� 澶氶」鎸囨爣鏃朵互#鍒嗛殧锛屼緥濡傦細杈炬爣|缁煎悎鍒ゅ畾#瀹滃瓨#鍚堟牸 ")
private String result;
+
+ @Column(name = "spaqzbsfhg", length = 40)
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸", description = "0-涓嶅悎鏍硷紝1-鍚堟牸")
+ private String spaqzbsfhg;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "绛惧彂鏃ユ湡")
@@ -118,11 +123,11 @@
@PropertyDef(label = "鏍峰搧鏁伴噺", required = true)
@Column(name = "ypsl", precision = 20, scale = 6)
- private double ypsl;
+ private Double ypsl;
@PropertyDef(label = "浠ｈ〃鏁伴噺")
@Column(name = "dbsl", precision = 20, scale = 6)
- private double dbsl;
+ private Double dbsl;
@PropertyDef(label = "鏍峰搧绛夌骇")
@Column(name = "ypdj", length = 2)
@@ -139,11 +144,9 @@
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
private Date updateTime;
-//
-// /**
-// * 鍖栭獙椤圭洰鏄庣粏
-// */
-// @Transient
-// private List<CheckItemData> checkItems;
+
+ @Column(name = "REPORT_TYPE_", length = 10)
+ @PropertyDef(label = "鎶ュ憡绫诲瀷", description = "1-鍗曚綅妫�楠岋紝2-鏁翠綋妫�楠�(鍔犳潈骞冲潎)锛�3-鍏朵粬")
+ private String reportType;
}
--
Gitblit v1.9.3