From cc49c82f3cac6f817e7623e31c644f45cb87a61e Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Fri, 17 Apr 2026 16:56:32 +0800 Subject: [PATCH] =?UTF-8?q?20260417=20=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/Util/ExcelHeaderTranslator.java | 24 ++++++++-------------- .../java/com/example/demo/domain/entity/User.java | 2 +- .../demo/domain/vo/bean/BeanConsumeArticle.java | 1 + .../demo/domain/vo/bean/BeanConsumeFan.java | 1 + .../demo/domain/vo/bean/BeanConsumeLive.java | 1 + .../domain/vo/bean/BeanOnlineRechargeInfo.java | 1 + .../domain/vo/bean/BeanSystemRechargeInfo.java | 1 + .../demo/domain/vo/cash/CashCollection.java | 1 + .../com/example/demo/domain/vo/cash/FundsDTO.java | 1 + 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index ff2f454..cd51d8f 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -160,7 +160,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 定义所有表头的原始中文名称（对应 BeanConsumeLive 类的字段） - headers.put("id", "序号"); headers.put("name", "姓名"); headers.put("jwcode", "精网号"); headers.put("dept", "地区"); @@ -186,7 +185,7 @@ public class ExcelHeaderTranslator { */ public List getBeanConsumeLiveColumnOrder() { return Arrays.asList( - "id", "name", "jwcode", "dept", "gift", "isBackpackDesc", + "name", "jwcode", "dept", "gift", "isBackpackDesc", "beanNum", "liveChannel", "freeBean", "buyBean", "liveName", "consumeTime" ); } @@ -199,7 +198,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 定义所有表头的原始中文名称（对应 BeanOnlineRechargeInfo 类的字段） - headers.put("id", "序号"); headers.put("jwcode", "精网号"); headers.put("name", "姓名"); headers.put("market", "所属地区"); @@ -222,7 +220,7 @@ public class ExcelHeaderTranslator { */ public List getBeanOnlineRechargeColumnOrder() { return Arrays.asList( - "id","jwcode", "name", "market", "money", "num", "orderNo", "platformDesc", "rechargeTime" + "jwcode", "name", "market", "money", "num", "orderNo", "platformDesc", "rechargeTime" ); } @@ -234,7 +232,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 定义所有表头的原始中文名称（对应 CashCollection 类的字段） - headers.put("id", "序号"); headers.put("jwcode", "精网号"); headers.put("name", "姓名"); headers.put("performanceMarket", "业绩归属地区"); @@ -274,7 +271,7 @@ public class ExcelHeaderTranslator { */ public List getCashCollectionColumnOrder() { return Arrays.asList( - "id", "jwcode", "name", "performanceMarket", "marketName", "activity", "orderCode", "bankCode", + "jwcode", "name", "performanceMarket", "marketName", "activity", "orderCode", "bankCode", "goodsName", "goodNum", "numUnit", "permanentGold", "freeGold", "paymentCurrency", "paymentAmount", "receivedCurrency", "receivedAmount", "handlingCharge", "receivedMarket", "payType", "payTime", "receivedTime", "submitterName", @@ -331,7 +328,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 定义所有表头的原始中文名称（对应 BeanConsumeArticle 类的字段） - headers.put("id", "序号"); headers.put("name", "姓名"); headers.put("jwcode", "精网号"); headers.put("dept", "地区"); @@ -357,7 +353,7 @@ public class ExcelHeaderTranslator { */ public List getBeanConsumeArticleColumnOrder() { return Arrays.asList( - "id", "name", "jwcode", "dept", "typeDesc", "beanNum", "buyBean", + "name", "jwcode", "dept", "typeDesc", "beanNum", "buyBean", "freeBean", "articleId", "articleName", "author", "consumeTime" ); } @@ -370,7 +366,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 定义所有表头的原始中文名称（对应 BeanSystemRechargeInfo 类的字段） - headers.put("id", "序号"); headers.put("jwcode", "精网号"); headers.put("name", "姓名"); headers.put("market", "所属地区"); @@ -392,7 +387,7 @@ public class ExcelHeaderTranslator { */ public List getBeanSystemRechargeColumnOrder() { return Arrays.asList( - "id","jwcode", "name", "market", "freeBean", "permanentBean", "remark", "rechargeTime" + "jwcode", "name", "market", "freeBean", "permanentBean", "remark", "rechargeTime" ); } @@ -404,7 +399,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 定义所有表头的原始中文名称（对应 BeanConsumeFan 类的字段） - headers.put("id", "序号"); headers.put("name", "姓名"); headers.put("jwcode", "精网号"); headers.put("dept", "地区"); @@ -428,7 +422,7 @@ public class ExcelHeaderTranslator { */ public List getBeanConsumeFanColumnOrder() { return Arrays.asList( - "id", "name", "jwcode", "dept", "beanNum", "freeBean", "buyBean", + "name", "jwcode", "dept", "beanNum", "freeBean", "buyBean", "channel", "typeDesc", "consumeTime" ); } @@ -441,7 +435,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 定义所有表头的原始中文名称（对应 User 类的字段） - headers.put("id", "序号"); headers.put("jwcode", "精网号"); headers.put("name", "姓名"); headers.put("market", "所属地区"); @@ -469,7 +462,7 @@ public class ExcelHeaderTranslator { */ public List getUserColumnOrder() { return Arrays.asList( - "id", "jwcode", "name", "market", "sumGold", "currentPermanentGold", + "jwcode", "name", "market", "sumGold", "currentPermanentGold", "currentFreeJune", "currentFreeDecember", "currentTaskGold", "rechargeNum", "consumeNum", "firstRecharge", "createTime", "updateTime" ); @@ -564,7 +557,6 @@ public class ExcelHeaderTranslator { Map headers = new LinkedHashMap<>(); // 添加所有表头的原始中文名称（对应 FundsDTO 类的字段） - headers.put("id", "ID"); headers.put("orderCode", "金币订单号"); headers.put("receivedMarket", "到账地区"); headers.put("performanceMarket", "业绩归属地区"); @@ -600,7 +592,7 @@ public class ExcelHeaderTranslator { */ public List getFundsColumnOrder() { return Arrays.asList( - "id", "orderCode", "receivedMarket", "performanceMarket", "activityName", + "orderCode", "receivedMarket", "performanceMarket", "activityName", "name", "jwcode", "remark", "goodNum", "goodsName", "voucher", "payType", "paymentAmount", "handlingCharge", "receivedAmount", "receivedTime", "marketName", "paymentCurrencyName", "receivedCurrencyName", "statusName", diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java index 44b927a..c4ed315 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -22,7 +22,7 @@ import java.util.Set; public class User implements Serializable { @Serial private static final long serialVersionUID = 1L; - + @ExcelIgnore private Integer id; // 客户id private Integer jwcode; // 精网号 private String name; // 客户姓名 diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java index a0b7ef6..62c0de0 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java @@ -24,6 +24,7 @@ import java.util.Date; public class BeanConsumeArticle implements Serializable { @Serial private static final long serialVersionUID = 1L; + @ExcelIgnore private Integer id; private String name; //姓名 private Integer jwcode; //精网号 diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java index 87f2686..5deca75 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java @@ -24,6 +24,7 @@ import java.util.Date; public class BeanConsumeFan implements Serializable { @Serial private static final long serialVersionUID = 1L; + @ExcelIgnore private Integer id; private String name; //姓名 @ExcelIgnore diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java index c4e7ccb..49091e1 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java @@ -29,6 +29,7 @@ import java.util.List; public class BeanConsumeLive implements Serializable { @Serial private static final long serialVersionUID = 1L; + @ExcelIgnore private Integer id; @ExcelIgnore private Integer roleId; //角色Id diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java index b7d6820..9fcd906 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java @@ -23,6 +23,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class BeanOnlineRechargeInfo { + @ExcelIgnore private Long id;//id private Integer jwcode; // 精网号 private String name; // 姓名 diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java index 762c6b7..02160e8 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java @@ -23,6 +23,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class BeanSystemRechargeInfo { + @ExcelIgnore private Long id;//id private Integer jwcode; // 精网号 private String name; // 姓名 diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 1b40479..a4aa4f8 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -29,6 +29,7 @@ import java.util.List; public class CashCollection implements Serializable { @Serial private static final long serialVersionUID = 1L; + @ExcelIgnore private Integer id; @ExcelIgnore private Integer orderType; // 订单类型：1-收款，2-退款 diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java index 79c5b34..48f3676 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java @@ -23,6 +23,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor public class FundsDTO { + @ExcelIgnore private Integer id; @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")