From 0ee340a21c1061cb68eb124ab26b482552634dba Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 23 十月 2024 20:23:22 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 2638fb8..9a85b2a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -22,7 +22,7 @@
*/
@Data
-@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cardState", "districtTitle", "villageId"})
+@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
@HeadRowHeight(30)
@ContentRowHeight(20)
public class VoTradeDetails implements BaseEntity {
@@ -31,6 +31,7 @@
/**
* 璁㈠崟鍙�
*/
+ @ExcelProperty(value = {"${title}", "璁㈠崟鍙�"})
@ColumnWidth(25)
private String orderNumber;
@@ -45,19 +46,21 @@
* 姘村崱缂栧彿
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- @ColumnWidth(15)
- private Long cardNum;
+ @ExcelProperty(value = {"${title}", "姘村崱缂栧彿"})
+ @ColumnWidth(20)
+ private String cardNum;
/**
* 韬唤璇佸彿
*/
+ @ExcelProperty(value = {"${title}", "韬唤璇佸彿"})
@ColumnWidth(15)
private String idCard;
/**
* 鍐滄埛缂栧彿
*/
- //@ExcelIgnore
+ @ExcelProperty(value = {"${title}", "鍐滄埛缂栧彿"})
@ColumnWidth(15)
private String clientNum;
@@ -113,9 +116,9 @@
/**
* 浣欓
*/
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @ExcelProperty(value = {"${title}", "浣欓"})
@ColumnWidth(15)
- private Long money;
+ private Double money;
/**
* 浠樻鏂瑰紡
@@ -140,8 +143,16 @@
private Long cashierId;
/**
+ * 鏀堕摱鍛樺鍚�
+ */
+ @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
+ @ColumnWidth(15)
+ private String cashierName;
+
+ /**
* 鍗＄墖鐘舵��
*/
+ @ExcelProperty(value = {"${title}", "鍗＄墖鐘舵��"})
@ColumnWidth(15)
private String cardState;
@@ -149,7 +160,7 @@
* 鏉戝簞鍚嶇О
*/
@ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
- @ColumnWidth(20)
+ @ColumnWidth(35)
private String districtTitle;
/**
--
Gitblit v1.8.0