From b688c3fe1ecdf645cbc8658139d29f1340acbf4e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 09 十二月 2025 15:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GrainDataReport.java |  269 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 269 insertions(+), 0 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GrainDataReport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GrainDataReport.java
new file mode 100644
index 0000000..3e6d99d
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GrainDataReport.java
@@ -0,0 +1,269 @@
+package com.fzzy.igds.data;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Description 绮儏鐨勬姤琛ㄦ暟鎹紝灏嗘瘡涓�灞傜殑鏁版嵁浣跨敤涓�涓璞″睍绀哄嚭鏉�
+ * @Author CZT
+ * @Date 2025/12/9 10:19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GrainDataReport extends GrainData {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	//绮鍝佺
+	private String foodVariety;
+
+	@Excel(name = "瀹為檯鍌ㄩ噺", sort = 11)
+	//瀹為檯鍌ㄩ噺,鍗曚綅锛氬惃
+	private Double storageReal;
+
+	//浠撳簱绫诲瀷
+	private String depotTypeName;
+
+	//浠撳簱绫诲瀷
+	private String depotType;
+
+	//淇濈鍛�
+	private String storeKeeperName;
+
+	//姘村垎
+	private String perWet = "--";
+
+	//鏉傝川
+	private String perImpurity = "--";
+
+	//鏈�楂樺眰鏁�
+	private int maxZ;
+	
+	// --- 浠ヤ笅鏄墍鏈夊眰淇℃伅---//
+	//鎵�鍦ㄥ眰
+	private int z1;
+	//灞傛渶浣庢俯
+	private String tempMin1 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax1 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve1 = "--";
+	//鎵�鍦ㄥ眰
+	private int z2;
+	//灞傛渶浣庢俯
+	private String tempMin2 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax2 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve2 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z3;
+	//灞傛渶浣庢俯
+	private String tempMin3 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax3 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve3 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z4;
+	//灞傛渶浣庢俯
+	private String tempMin4 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax4 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve4 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z5;
+	//灞傛渶浣庢俯
+	private String tempMin5 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax5 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve5 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z6;
+	//灞傛渶浣庢俯
+	private String tempMin6 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax6 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve6 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z7;
+	//灞傛渶浣庢俯
+	private String tempMin7 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax7 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve7 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z8;
+	//灞傛渶浣庢俯"
+	private String tempMin8 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax8 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve8 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z9;
+	//灞傛渶浣庢俯
+	private String tempMin9 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax9 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve9 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z10;
+	//灞傛渶浣庢俯
+	private String tempMin10 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax10 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve10 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z11;
+	//灞傛渶浣庢俯
+	private String tempMin11 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax11 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve11 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z12;
+	//灞傛渶浣庢俯
+	private String tempMin12 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax12 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve12 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z13;
+	//灞傛渶浣庢俯
+	private String tempMin13 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax13 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve13 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z14;
+	//灞傛渶浣庢俯
+	private String tempMin14 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax14 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve14 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z15;
+	//灞傛渶浣庢俯
+	private String tempMin15 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax15 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve15 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z16;
+	//灞傛渶浣庢俯
+	private String tempMin16 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax16 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve16 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z17;
+	//灞傛渶浣庢俯
+	private String tempMin17 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax17 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve17 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z18;
+	//灞傛渶浣庢俯
+	private String tempMin18 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax18 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve18 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z19;
+	//灞傛渶浣庢俯
+	private String tempMin19 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax19 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve19 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z20;
+	//灞傛渶浣庢俯
+	private String tempMin20 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax20 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve20 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z21;
+	//灞傛渶浣庢俯
+	private String tempMin21 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax21 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve21 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z22;
+	//灞傛渶浣庢俯
+	private String tempMin22 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax22 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve22 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z23;
+	//灞傛渶浣庢俯
+	private String tempMin23 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax23 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve23 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z24;
+	//灞傛渶浣庢俯
+	private String tempMin24 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax24 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve24 = "--";
+
+	//鎵�鍦ㄥ眰
+	private int z25;
+	//灞傛渶浣庢俯
+	private String tempMin25 = "--";
+	//灞傛渶楂樻俯
+	private String tempMax25 = "--";
+	//灞傚钩鍧囨俯
+	private String tempAve25 = "--";
+}

--
Gitblit v1.9.3