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/dto/CostStatisticsDto.java |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
index 5abd147..10d4e84 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
@@ -1,5 +1,8 @@
 package com.yuanchu.mom.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yuanchu.mom.annotation.ValueTableShow;
 import com.yuanchu.mom.common.OrderBy;
@@ -13,32 +16,59 @@
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ValueTableShow(value = 1, name = "涓嬪崟鏃堕棿")
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","ZTT/QR-30-01-01","鏃ユ湡"})
     private LocalDateTime createTime;
 
     @ValueTableShow(value = 2, name = "濮旀墭缂栧彿")
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","ZTT/QR-30-01-01","妫�楠岀紪鍙�"})
     private String entrustCode;
 
     @ValueTableShow(value = 3, name = "鏍峰搧鍚嶇О")
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鏍峰搧鍚嶇О"})
     private String sample;
 
     @ValueTableShow(value = 4, name = "瑙勬牸鍨嬪彿")
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","瑙勬牸鍨嬪彿"})
     private String model;
 
     @ValueTableShow(value = 5, name = "鏍峰搧鏁伴噺")
-    private Integer num = 1;
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鏍峰搧鏁伴噺"})
+    private Integer num;
 
     @ValueTableShow(value = 6, name = "鎬讳环")
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鎬讳环"})
     private BigDecimal price;
 
     @ValueTableShow(value = 7, name = "璇曢獙椤圭洰")
-    private String product;
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","璇曢獙椤圭洰"})
+    private String inspectionItem;
 
     @ValueTableShow(value = 8, name = "濮旀墭鍗曚綅")
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","濮旀墭鍗曚綅"})
     private String company;
 
     @ValueTableShow(value = 9, name = "濮旀墭浜�")
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","濮旀墭浜�"})
     private String name;
 
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鐢熶骇鍗曚綅"})
+    private String production;
+
+    @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","宸ョ▼鍚嶇О"})
+    private String engineering;
+
+    @ExcelIgnore
     private Integer createUser;
 
+    @ExcelIgnore
+    private Integer insSampleId;
+
+    @ExcelIgnore
+    private Double cost;//宸ユ椂
+
+    @TableField(exist = false,select = false)
+    @ExcelIgnore
+    private String dates;
+
+
 }

--
Gitblit v1.9.3