From 97bb7a8832281eafe0ef947ea095258d355e52f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 30 十二月 2024 15:57:51 +0800
Subject: [PATCH] 无源器件的数采+电路模版查询

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
index d39542d..95d6e99 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -1,5 +1,7 @@
 package com.yuanchu.mom.pojo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -20,138 +22,166 @@
     /**
      * 涓婚敭id
      */
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
     @JsonSerialize(using = ToStringSerializer.class)
+    @ExcelIgnore
     private Long id;
 
     /**
      * 妫�楠岄」
      */
     @ApiModelProperty("妫�楠岄」")
+    @ExcelProperty(value = "妫�娴嬪弬鏁板悕绉�")
     private String inspectionItem;
 
     @ApiModelProperty("妫�楠岄」EN")
+    @ExcelProperty(value = "妫�娴嬪弬鏁板悕绉�(EN)")
     private String inspectionItemEn;
 
     /**
      * 妫�楠岄」灏忕被
      */
     @ApiModelProperty("妫�楠岄」灏忕被")
+    @ExcelProperty(value = "妫�娴嬪瓙椤�")
     private String inspectionItemSubclass;
 
     @ApiModelProperty("妫�楠岄」灏忕被EN")
+    @ExcelProperty(value = "妫�娴嬪瓙椤�(EN)")
     private String inspectionItemSubclassEn;
 
     /**
      * 瀹為獙瀹�
      */
     @ApiModelProperty("瀹為獙瀹�")
+    @ExcelIgnore
     private String laboratory;
 
     @ApiModelProperty("瀛愬疄楠屽")
+    @ExcelProperty(value = "璇曢獙瀹�")
     private String sonLaboratory;
 
     /**
      * 璁￠噺鍗曚綅
      */
     @ApiModelProperty("璁￠噺鍗曚綅")
+    @ExcelProperty(value = "璁￠噺鍗曚綅")
     private String unit;
 
     /**
      * 鍗曚环(鍏�)
      */
     @ApiModelProperty("鍗曚环")
+    @ExcelProperty(value = "鍗曚环")
     private String price;
 
     /**
      * 宸ユ椂(H)
      */
     @ApiModelProperty("宸ユ椂")
+    @ExcelProperty(value = "宸ユ椂绯绘暟")
     private String manHour;
 
     /**
      * 宸ユ椂鍒嗙粍
      */
     @ApiModelProperty("宸ユ椂鍒嗙粍")
+    @ExcelProperty(value = "宸ユ椂鍒嗙粍")
     private String manHourGroup;
 
     /**
      * 妫�楠岄」绫诲瀷
      */
     @ApiModelProperty("妫�楠岄」绫诲瀷")
+    @ExcelProperty(value = "妫�楠岄」绫诲瀷")
     private String inspectionItemType;
 
     /**
      * 妫�楠屽�肩被鍨�
      */
     @ApiModelProperty("妫�楠屽�肩被鍨�")
+    @ExcelProperty(value = "鏁版嵁绫诲瀷")
     private String inspectionValueType;
 
     /**
      * 妫�楠屾鏁�
      */
     @ApiModelProperty("妫�楠屾鏁�")
+    @ExcelIgnore
     private Integer checkoutNumber;
 
     /**
      * 鍖洪棿
      */
     @ApiModelProperty("鍖洪棿")
+    @ExcelIgnore
     private String section;
 
     /**
      * 鏂规硶
      */
     @ApiModelProperty("鏂规硶鍒楄〃")
+    @ExcelIgnore
     private String method;
 
     @ApiModelProperty("鏂规硶")
+    @ExcelProperty(value = "鏂规硶鍚嶇О")
     private String methodS;
 
     /**
      * 棰勮鏃堕棿(澶�)
      */
     @ApiModelProperty("棰勮鏃堕棿")
+    @ExcelProperty(value = "棰勮瀹屾垚鏃堕棿")
     private Integer manDay;
 
     /**
      * 鐗规畩鏍囪瘑
      */
     @ApiModelProperty("鐗规畩鏍囪瘑")
+    @ExcelProperty(value = "鐗规畩鏍囪瘑")
     private String bsm;
 
     /**
      * 瑕佹眰鍊�
      */
     @ApiModelProperty("瑕佹眰鍊�")
+    @ExcelProperty(value = "鍒ゆ柇瑕佹眰")
     private String ask;
 
     @ApiModelProperty("瑕佹眰鎻忚堪")
+    @ExcelProperty(value = "鏍囧噯鏄剧ず")
     private String tell;
 
     /**
      * 澶栭敭锛氭爣鍑嗘柟娉昳d
      */
     @ApiModelProperty("鏍囧噯鏂规硶id")
+    @ExcelIgnore
     private Integer standardMethodListId;
 
     @ApiModelProperty("宸ュ巶")
+    @ExcelIgnore
     private String factory;
 
     @ApiModelProperty("鏍峰搧鍒嗙被")
+    @ExcelProperty(value = "娴嬭瘯瀵硅薄")
     private String sampleType;
 
     @ApiModelProperty("鏍峰搧")
+    @ExcelProperty(value = "浜у搧")
     private String sample;
 
     @ApiModelProperty("鍨嬪彿")
+    @ExcelProperty(value = "鍨嬪彿")
     private String model;
 
-    @ApiModelProperty("鍨嬪彿")
+    @ApiModelProperty("妯＄増id")
+    @ExcelIgnore
     private Integer templateId;
 
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
+    @ExcelIgnore
     private Integer createUser;
     /**
      *
@@ -159,12 +189,14 @@
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
     private LocalDateTime createTime;
     /**
      *
      */
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @ExcelIgnore
     private Integer updateUser;
     /**
      *
@@ -172,15 +204,27 @@
     @ApiModelProperty("淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
     private LocalDateTime updateTime;
 
     @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
+    @ExcelIgnore
     private Integer state;
 
+    @ExcelIgnore
     private String dic;
 
+    @ExcelIgnore
     private String tree;
 
-    @TableField(exist = false,select = false)
+    @ExcelIgnore
     private Integer structureItemParameterId;
+
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+    @ExcelIgnore
+    private String inspectionItemClass;
+
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+    @ExcelIgnore
+    private String inspectionItemClassEn;
 }
\ No newline at end of file

--
Gitblit v1.9.3