From 607e112467e23feb6f3e34d36e302ef6a9c3f7bc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 15:58:10 +0800
Subject: [PATCH] 修改不合格导出字段顺序
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 18472d4..baf075d 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -34,27 +34,25 @@
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!!")
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
private Integer inspectType;
/**
* 鐘舵��(0:寰呭鐞�;1:宸插鐞�)
*/
@NotBlank(message = "鐘舵�佷笉鑳戒负绌�!!")
- @Excel(name = "鐘舵��",readConverterExp = "0=寰呭鐞�,1=宸插鐞�")
private Integer inspectState;
/**
* 妫�娴嬫棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 1)
private Date checkTime;
/**
* 妫�楠屽憳
*/
- @Excel(name = "妫�楠屽憳")
+ @Excel(name = "妫�楠屽憳", sort = 4)
private String checkName;
/**
@@ -65,50 +63,49 @@
/**
* 浜у搧鍚嶇О
*/
- @Excel(name = "浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О", sort = 5)
private String productName;
/**
* 瑙勬牸鍨嬪彿
*/
- @Excel(name = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿", sort = 6)
private String model;
/**
* 鍗曚綅
*/
- @Excel(name = "鍗曚綅")
+ @Excel(name = "鍗曚綅", sort = 7)
private String unit;
/**
* 鏁伴噺
*/
- @Excel(name = "鏁伴噺")
private BigDecimal quantity;
/**
* 涓嶅悎鏍肩幇璞�
*/
- @Excel(name = "涓嶅悎鏍肩幇璞�")
+ @Excel(name = "涓嶅悎鏍肩幇璞�", sort = 8)
private String defectivePhenomena;
/**
* 澶勭悊缁撴灉
*/
- @Excel(name = "澶勭悊缁撴灉")
+ @Excel(name = "澶勭悊缁撴灉", sort = 9)
private String dealResult;
/**
* 澶勭悊浜�
*/
- @Excel(name = "澶勭悊浜�")
+ @Excel(name = "澶勭悊浜�", sort = 10)
private String dealName;
/**
* 澶勭悊鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 11)
private Date dealTime;
@@ -141,8 +138,10 @@
private Boolean method;
@ApiModelProperty("鎵瑰彿")
- private Boolean batchNo;
+ @Excel(name = "鎵瑰彿", sort = 2)
+ private String batchNo;
@ApiModelProperty("妫�娴嬬被鍨�")
+ @Excel(name = "妫�娴嬬被鍨�",readConverterExp = "0=鍏ュ巶妫�,1=杞﹂棿楠�,2=鍑哄巶妫�", sort = 3)
private Integer checkType;
}
--
Gitblit v1.9.3