From 56341ed5e8671f7002c295a371d6d4dcf0c55012 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 16 四月 2025 16:48:05 +0800
Subject: [PATCH] 1。检验项目导入新增字段 2.数采新增字段

---
 basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java |   47 +++++++++++++++++++++++++++++------------------
 1 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
index a2b34ba..0a11d7c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
@@ -65,42 +65,42 @@
      * 鍗曚环(鍏�)
      */
     @ApiModelProperty(value = "鍗曚环(鍏�)")
-    @ExcelProperty(value = "鍗曚环",index = 13)
+    @ExcelProperty(value = "鍗曚环",index = 14)
     private String price;
 
     /**
      * 鍦烘墍
      */
     @ApiModelProperty(value = "鍦烘墍")
-    @ExcelProperty(value = "鍦烘墍",index = 24)
+    @ExcelProperty(value = "鍦烘墍",index = 25)
     private String laboratory;
 
     /**
      * 璇曢獙瀹�
      */
     @ApiModelProperty(value = "璇曢獙瀹�")
-    @ExcelProperty(value = "璇曢獙瀹�",index = 9)
+    @ExcelProperty(value = "璇曢獙瀹�",index = 10)
     private String sonLaboratory;
 
     /**
      * 瑕佹眰鎻忚堪
      */
     @ApiModelProperty(value = "瑕佹眰鎻忚堪")
-    @ExcelProperty(value = "鏍囧噯鏄剧ず",index = 11)
+    @ExcelProperty(value = "鏍囧噯鏄剧ず",index = 12)
     private String askTell;
 
     /**
      * 瑕佹眰鍊�
      */
     @ApiModelProperty(value = "瑕佹眰鍊�")
-    @ExcelProperty(value = "鍒ゆ柇瑕佹眰",index = 12)
+    @ExcelProperty(value = "鍒ゆ柇瑕佹眰",index = 13)
     private String ask;
 
     /**
      * 璁¢噺鍗曚綅
      */
     @ApiModelProperty(value = "璁¢噺鍗曚綅")
-    @ExcelProperty(value = "璁¢噺鍗曚綅",index = 10)
+    @ExcelProperty(value = "璁¢噺鍗曚綅",index = 11)
     private String unit;
 
     /**
@@ -114,35 +114,35 @@
      * 宸ユ椂(H)
      */
     @ApiModelProperty(value = "宸ユ椂(H)")
-    @ExcelProperty(value = "宸ユ椂绯绘暟",index = 14)
+    @ExcelProperty(value = "宸ユ椂绯绘暟",index = 15)
     private Double manHour;
 
     /**
      * 棰勮鏃堕棿(H)
      */
     @ApiModelProperty(value = "棰勮鏃堕棿(H)")
-    @ExcelProperty(value = "棰勮瀹屾垚鏃堕棿",index = 16)
+    @ExcelProperty(value = "棰勮瀹屾垚鏃堕棿",index = 17)
     private Integer manDay;
 
     /**
      * 宸ユ椂鍒嗙粍
      */
     @ApiModelProperty(value = "宸ユ椂鍒嗙粍")
-    @ExcelProperty(value = "宸ユ椂鍒嗙粍",index = 15)
+    @ExcelProperty(value = "宸ユ椂鍒嗙粍",index = 16)
     private String manHourGroup;
 
     /**
      * 妫�楠岄」绫诲瀷
      */
     @ApiModelProperty(value = "妫�楠岄」绫诲瀷")
-    @ExcelProperty(value = "鏁版嵁绫诲瀷",index = 17)
+    @ExcelProperty(value = "鏁版嵁绫诲瀷",index = 18)
     private String inspectionItemType;
 
     /**
      * 妫�楠屽�肩被鍨�
      */
     @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
-    @ExcelProperty(value = "妫�楠屽�肩被鍨�",index = 18)
+    @ExcelProperty(value = "妫�楠屽�肩被鍨�",index = 19)
     private String inspectionValueType;
 
     /**
@@ -161,7 +161,7 @@
      * 鐗规畩鏍囪瘑
      */
     @ApiModelProperty(value = "鐗规畩鏍囪瘑")
-    @ExcelProperty(value = "鐗规畩鏍囪瘑",index = 19)
+    @ExcelProperty(value = "鐗规畩鏍囪瘑",index = 20)
     private String bsm;
 
     /**
@@ -171,7 +171,7 @@
     private Integer templateId;
 
     @TableField(exist = false)
-    @ExcelProperty(value = "鍘熷璁板綍妯℃澘",index = 21)
+    @ExcelProperty(value = "鍘熷璁板綍妯℃澘",index = 22)
     private String templateName;
 
     /**
@@ -208,35 +208,35 @@
      * 瀛楀吀绫诲瀷
      */
     @ApiModelProperty(value = "瀛楀吀绫诲瀷")
-    @ExcelProperty(value = "鏁版嵁瀛楀吀",index = 20)
+    @ExcelProperty(value = "鏁版嵁瀛楀吀",index = 21)
     private String dic;
 
     /**
      * 妫�楠岄」鍒嗙被
      */
     @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
-    @ExcelProperty(value = "妫�楠岄」鍒嗙被",index = 22)
+    @ExcelProperty(value = "妫�楠岄」鍒嗙被",index = 23)
     private String inspectionItemClass;
 
     /**
      * 妫�楠岄」鍒嗙被EN
      */
     @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
-    @ExcelProperty(value = "妫�楠岄」鍒嗙被",index = 23)
+    @ExcelProperty(value = "妫�楠岄」鍒嗙被",index = 24)
     private String inspectionItemClassEn;
 
     /**
      * 鏉′欢
      */
     @ApiModelProperty(value = "鏉′欢")
-    @ExcelProperty(value = "璇曢獙鏉′欢",index = 25)
+    @ExcelProperty(value = "璇曢獙鏉′欢",index = 26)
     private String radiusList;
 
     /**
      * 鏀惰垂鏍囧噯(鍏�/娆�)
      */
     @ApiModelProperty(value = "鏀惰垂鏍囧噯(鍏�/娆�)")
-    @ExcelProperty(value = "鏀惰垂鏍囧噯",index = 26)
+    @ExcelProperty(value = "鏀惰垂鏍囧噯",index = 28)
     private String rates;
 
     @TableField(exist = false)
@@ -246,4 +246,15 @@
     @ExcelProperty(value = "妫�娴嬪弬鏁扮紪鍙�",index = 3)
     @TableField(exist = false)
     private String parameterNumber;
+
+    @ApiModelProperty(value = "鏄惁濮旀墭瑕佹眰 0 鍚� 1 鏄�")
+    private String delegateRequestFlag;
+
+    @ApiModelProperty(value = "棰戞")
+    @ExcelProperty(value = "妫�娴嬪弬鏁扮紪鍙�",index = 9)
+    private String frequency;
+
+    @ApiModelProperty(value = "鏀惰垂鏍囧噯鍒嗙粍")
+    @ExcelProperty(value = "妫�娴嬪弬鏁扮紪鍙�",index = 27)
+    private String ratesGroup;
 }
\ No newline at end of file

--
Gitblit v1.9.3