From 256f9c48f2c52985a094a220b644d60d24cb6ed4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 14 十月 2025 09:49:32 +0800
Subject: [PATCH] 省质检报告提交
---
igds-core/src/main/java/com/ld/igds/models/MQuality.java | 185 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 181 insertions(+), 4 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/MQuality.java b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
index 6ee6f21..867d282 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MQuality.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.check.dto.CheckItemData;
+import com.ld.igds.constant.Constant;
import lombok.Data;
import javax.persistence.*;
@@ -59,13 +60,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-鍏朵粬")
@@ -79,6 +80,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 = "绛惧彂鏃ユ湡")
@@ -148,4 +153,176 @@
@Transient
private List<CheckItemData> checkItems;
+ /**
+ * --------闄勪欢--------
+ **/
+ @Column(name = "FILE_ID_", length = 30)
+ @PropertyDef(label = "闄勪欢id")
+ private String fileId;
+
+ @Column(name = "FILE_NAME_", length = 50)
+ @PropertyDef(label = "闄勪欢鍚嶇О")
+ private String fileName;
+
+ @Column(name = "FILE_TIME_")
+ @PropertyDef(label = "闄勪欢涓婁紶鏃堕棿")
+ private Date fileTime;
+
+
+ /************
+ * 榛勯檪鍐涚伯鐢�-鐪佽川妫�涓績鎶ュ憡
+ ************/
+
+ @Column(name = "PROV_RESERVE_", length = 1)
+ @PropertyDef(label = "鏄惁涓虹渷绾ц川妫�涓績鎶ュ憡", description = "Y-鏄紝N-鍚�")
+ private String provReserve = Constant.YN_N;
+
+
+ @Column(name = "QLY_ORG_REPORTID_", length = 20)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡id")
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡id
+
+ @Column(name = "ORDER_ID_", length = 20)
+ @PropertyDef(label = "璁㈠崟琛↖D")
+ private String orderId; //璁㈠崟琛↖D
+
+ @Column(name = "SAMPLE_ID_", length = 20)
+ @PropertyDef(label = "鏍峰搧琛↖D")
+ private String sampleId; //鏍峰搧琛↖D
+
+ @Column(name = "ORG_ID_", length = 20)
+ @PropertyDef(label = "鏈烘瀯琛↖D")
+ private String orgId; //鏈烘瀯琛↖D
+
+ @Column(name = "QUALITY_ORG_ID_", length = 50)
+ @PropertyDef(label = "璐ㄦ鏈烘瀯缂栧彿")
+ private String qualityOrgId; //璐ㄦ鏈烘瀯缂栧彿
+
+ @Column(name = "QUALITY_ORG_NAME_", length = 50)
+ @PropertyDef(label = "璐ㄦ鏈烘瀯鍚嶇О")
+ private String qualityOrgName; //璐ㄦ鏈烘瀯鍚嶇О
+
+ @Column(name = "GYSXYDM_", length = 50)
+ @PropertyDef(label = "渚涘簲鍟嗕俊鐢ㄤ唬鐮�")
+ private String gysxydm; //渚涘簲鍟嗕俊鐢ㄤ唬鐮�
+
+ @Column(name = "JLQYBH_", length = 50)
+ @PropertyDef(label = "鍐涚伯浼佷笟缂栧彿")
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+
+ @Column(name = "JLQYMC_", length = 50)
+ @PropertyDef(label = "鍐涚伯浼佷笟鍚嶇О")
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
+
+ @Column(name = "KDBM_", length = 20)
+ @PropertyDef(label = "搴撶偣缂栫爜")
+ private String kdbm; //搴撶偣缂栫爜
+
+ @Column(name = "KDMC_", length = 50)
+ @PropertyDef(label = "搴撶偣鍚嶇О")
+ private String kdmc; //搴撶偣鍚嶇О
+
+ @Column(name = "DELECTION_TYPE_", length = 20)
+ @PropertyDef(label = "妫�娴嬫姤鍛婄被鍨�")
+ private String delectionType; //妫�娴嬫姤鍛婄被鍨�
+
+ @Column(name = "DELETCTION_NUMBER_", length = 50)
+ @PropertyDef(label = "妫�娴嬫姤鍛婄紪鍙�")
+ private String deletctionNumber; //妫�娴嬫姤鍛婄紪鍙�
+
+ @Column(name = "JLCPMC_", length = 50)
+ @PropertyDef(label = "鍐涚伯浜у搧鍚嶇О")
+ private String jlcpmc; //鍐涚伯浜у搧鍚嶇О
+
+ @Column(name = "JLLSPZ_", length = 50)
+ @PropertyDef(label = "鍐涚伯绮鍝佺")
+ private String jllspz; //鍐涚伯绮鍝佺
+
+ @Column(name = "LOT_NUMBER_", length = 50)
+ @PropertyDef(label = "鎵瑰彿")
+ private String lotNumber; //鎵瑰彿
+
+ @Column(name = "SPECIFICATION_MODEL_", length = 50)
+ @PropertyDef(label = "瑙勬牸鍨嬪彿")
+ private String specificationModel; //瑙勬牸鍨嬪彿
+
+ @Column(name = "CYSM_", length = 200)
+ @PropertyDef(label = "鎶芥牱璇存槑")
+ private String cysm; //鎶芥牱璇存槑
+
+ @JSONField(format = "yyyy-MM-dd")
+ @Column(name = "REGISTRATION_", length = 20)
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private String registration; //鐧昏鏃堕棿
+
+ @Column(name = "INSPECT_PLAN_", length = 200)
+ @PropertyDef(label = "妫�楠屾柟妗�")
+ private String inspectPlan; //妫�楠屾柟妗�
+
+ @Column(name = "PRODUCT_TYPE_", length = 20)
+ @PropertyDef(label = "浜у搧绫诲瀷")
+ private String productType; //浜у搧绫诲瀷
+
+ @Column(name = "CYJS_", length = 20)
+ @PropertyDef(label = "鎶芥牱鍩烘暟")
+ private String cyjs; //鎶芥牱鍩烘暟
+
+ @Column(name = "CYSL_", length = 20)
+ @PropertyDef(label = "鎶芥牱鏁伴噺")
+ private String cysl; //鎶芥牱鏁伴噺
+
+ @Column(name = "SAMPLER_", length = 50)
+ @PropertyDef(label = "鎶芥牱浜�")
+ private String sampler; //鎶芥牱浜�
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "SAMPLER_TIME_", length = 20)
+ @PropertyDef(label = "鎶芥牱鏃堕棿")
+ private String samplerTime; //鎶芥牱鏃堕棿
+
+ @Column(name = "SAMPLER_AREA_", length = 200)
+ @PropertyDef(label = "鎶芥牱鍦扮偣")
+ private String samplerArea; //鎶芥牱鍦扮偣
+
+ @JSONField(format = "yyyy-MM-dd")
+ @Column(name = "CREATE_TIME_", length = 20)
+ @PropertyDef(label = "鐢熶骇鏃ユ湡")
+ private Date createTime; //鐢熶骇鏃ユ湡
+
+ @Column(name = "IS_ACTIVE_", length = 1)
+ @PropertyDef(label = "鏄惁鏈夋晥")
+ private String isActive; //鏄惁鏈夋晥
+
+ @Column(name = "REPORT_FILE_", length = 200)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鏂囦欢")
+ private String reportFile; //璐ㄦ鎶ュ憡鏂囦欢
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "CREATE_DATE_", length = 20)
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private String createDate; //鍒涘缓鏃堕棿
+
+ @Column(name = "CREATE_BY_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createBy; //鍒涘缓浜�
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "UPDATE_DATE_", length = 20)
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private String updateDate; //鏇存柊鏃堕棿
+
+ @Column(name = "UPDATE_BY_", length = 50)
+ @PropertyDef(label = "鏇存柊浜�")
+ private String updateBy; //鏇存柊浜�
+
+
+ @Transient
+ private List<CheckItemDm> orgReportRiceList; //澶х背妫�楠岀粨鏋�
+ @Transient
+ private List<CheckItemXmf> orgReportNoodlesList; //灏忛害绮夎川妫�缁撴灉
+ @Transient
+ private List<CheckItemDd> orgReportSoybeanList; //澶ц眴璐ㄦ缁撴灉
+ @Transient
+ private List<CheckItemSyy> orgReportOilList; //椋熺敤娌硅川妫�缁撴灉
+
}
--
Gitblit v1.9.3