Browse Source

20260417 导出优化

dev
wangguorui 4 days ago
parent
commit
cc49c82f3c
  1. 24
      src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java
  2. 2
      src/main/java/com/example/demo/domain/entity/User.java
  3. 1
      src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java
  4. 1
      src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java
  5. 1
      src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java
  6. 1
      src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java
  7. 1
      src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java
  8. 1
      src/main/java/com/example/demo/domain/vo/cash/CashCollection.java
  9. 1
      src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java

24
src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java

@ -160,7 +160,6 @@ public class ExcelHeaderTranslator {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 定义所有表头的原始中文名称对应 BeanConsumeLive 类的字段 // 定义所有表头的原始中文名称对应 BeanConsumeLive 类的字段
headers.put("id", "序号");
headers.put("name", "姓名"); headers.put("name", "姓名");
headers.put("jwcode", "精网号"); headers.put("jwcode", "精网号");
headers.put("dept", "地区"); headers.put("dept", "地区");
@ -186,7 +185,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getBeanConsumeLiveColumnOrder() { public List<String> getBeanConsumeLiveColumnOrder() {
return Arrays.asList( return Arrays.asList(
"id", "name", "jwcode", "dept", "gift", "isBackpackDesc",
"name", "jwcode", "dept", "gift", "isBackpackDesc",
"beanNum", "liveChannel", "freeBean", "buyBean", "liveName", "consumeTime" "beanNum", "liveChannel", "freeBean", "buyBean", "liveName", "consumeTime"
); );
} }
@ -199,7 +198,6 @@ public class ExcelHeaderTranslator {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 定义所有表头的原始中文名称对应 BeanOnlineRechargeInfo 类的字段 // 定义所有表头的原始中文名称对应 BeanOnlineRechargeInfo 类的字段
headers.put("id", "序号");
headers.put("jwcode", "精网号"); headers.put("jwcode", "精网号");
headers.put("name", "姓名"); headers.put("name", "姓名");
headers.put("market", "所属地区"); headers.put("market", "所属地区");
@ -222,7 +220,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getBeanOnlineRechargeColumnOrder() { public List<String> getBeanOnlineRechargeColumnOrder() {
return Arrays.asList( 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<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 定义所有表头的原始中文名称对应 CashCollection 类的字段 // 定义所有表头的原始中文名称对应 CashCollection 类的字段
headers.put("id", "序号");
headers.put("jwcode", "精网号"); headers.put("jwcode", "精网号");
headers.put("name", "姓名"); headers.put("name", "姓名");
headers.put("performanceMarket", "业绩归属地区"); headers.put("performanceMarket", "业绩归属地区");
@ -274,7 +271,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getCashCollectionColumnOrder() { public List<String> getCashCollectionColumnOrder() {
return Arrays.asList( return Arrays.asList(
"id", "jwcode", "name", "performanceMarket", "marketName", "activity", "orderCode", "bankCode",
"jwcode", "name", "performanceMarket", "marketName", "activity", "orderCode", "bankCode",
"goodsName", "goodNum", "numUnit", "permanentGold", "freeGold", "paymentCurrency", "goodsName", "goodNum", "numUnit", "permanentGold", "freeGold", "paymentCurrency",
"paymentAmount", "receivedCurrency", "receivedAmount", "handlingCharge", "paymentAmount", "receivedCurrency", "receivedAmount", "handlingCharge",
"receivedMarket", "payType", "payTime", "receivedTime", "submitterName", "receivedMarket", "payType", "payTime", "receivedTime", "submitterName",
@ -331,7 +328,6 @@ public class ExcelHeaderTranslator {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 定义所有表头的原始中文名称对应 BeanConsumeArticle 类的字段 // 定义所有表头的原始中文名称对应 BeanConsumeArticle 类的字段
headers.put("id", "序号");
headers.put("name", "姓名"); headers.put("name", "姓名");
headers.put("jwcode", "精网号"); headers.put("jwcode", "精网号");
headers.put("dept", "地区"); headers.put("dept", "地区");
@ -357,7 +353,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getBeanConsumeArticleColumnOrder() { public List<String> getBeanConsumeArticleColumnOrder() {
return Arrays.asList( return Arrays.asList(
"id", "name", "jwcode", "dept", "typeDesc", "beanNum", "buyBean",
"name", "jwcode", "dept", "typeDesc", "beanNum", "buyBean",
"freeBean", "articleId", "articleName", "author", "consumeTime" "freeBean", "articleId", "articleName", "author", "consumeTime"
); );
} }
@ -370,7 +366,6 @@ public class ExcelHeaderTranslator {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 定义所有表头的原始中文名称对应 BeanSystemRechargeInfo 类的字段 // 定义所有表头的原始中文名称对应 BeanSystemRechargeInfo 类的字段
headers.put("id", "序号");
headers.put("jwcode", "精网号"); headers.put("jwcode", "精网号");
headers.put("name", "姓名"); headers.put("name", "姓名");
headers.put("market", "所属地区"); headers.put("market", "所属地区");
@ -392,7 +387,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getBeanSystemRechargeColumnOrder() { public List<String> getBeanSystemRechargeColumnOrder() {
return Arrays.asList( 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<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 定义所有表头的原始中文名称对应 BeanConsumeFan 类的字段 // 定义所有表头的原始中文名称对应 BeanConsumeFan 类的字段
headers.put("id", "序号");
headers.put("name", "姓名"); headers.put("name", "姓名");
headers.put("jwcode", "精网号"); headers.put("jwcode", "精网号");
headers.put("dept", "地区"); headers.put("dept", "地区");
@ -428,7 +422,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getBeanConsumeFanColumnOrder() { public List<String> getBeanConsumeFanColumnOrder() {
return Arrays.asList( return Arrays.asList(
"id", "name", "jwcode", "dept", "beanNum", "freeBean", "buyBean",
"name", "jwcode", "dept", "beanNum", "freeBean", "buyBean",
"channel", "typeDesc", "consumeTime" "channel", "typeDesc", "consumeTime"
); );
} }
@ -441,7 +435,6 @@ public class ExcelHeaderTranslator {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 定义所有表头的原始中文名称对应 User 类的字段 // 定义所有表头的原始中文名称对应 User 类的字段
headers.put("id", "序号");
headers.put("jwcode", "精网号"); headers.put("jwcode", "精网号");
headers.put("name", "姓名"); headers.put("name", "姓名");
headers.put("market", "所属地区"); headers.put("market", "所属地区");
@ -469,7 +462,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getUserColumnOrder() { public List<String> getUserColumnOrder() {
return Arrays.asList( return Arrays.asList(
"id", "jwcode", "name", "market", "sumGold", "currentPermanentGold",
"jwcode", "name", "market", "sumGold", "currentPermanentGold",
"currentFreeJune", "currentFreeDecember", "currentTaskGold", "rechargeNum", "currentFreeJune", "currentFreeDecember", "currentTaskGold", "rechargeNum",
"consumeNum", "firstRecharge", "createTime", "updateTime" "consumeNum", "firstRecharge", "createTime", "updateTime"
); );
@ -564,7 +557,6 @@ public class ExcelHeaderTranslator {
Map<String, String> headers = new LinkedHashMap<>(); Map<String, String> headers = new LinkedHashMap<>();
// 添加所有表头的原始中文名称对应 FundsDTO 类的字段 // 添加所有表头的原始中文名称对应 FundsDTO 类的字段
headers.put("id", "ID");
headers.put("orderCode", "金币订单号"); headers.put("orderCode", "金币订单号");
headers.put("receivedMarket", "到账地区"); headers.put("receivedMarket", "到账地区");
headers.put("performanceMarket", "业绩归属地区"); headers.put("performanceMarket", "业绩归属地区");
@ -600,7 +592,7 @@ public class ExcelHeaderTranslator {
*/ */
public List<String> getFundsColumnOrder() { public List<String> getFundsColumnOrder() {
return Arrays.asList( return Arrays.asList(
"id", "orderCode", "receivedMarket", "performanceMarket", "activityName",
"orderCode", "receivedMarket", "performanceMarket", "activityName",
"name", "jwcode", "remark", "goodNum", "goodsName", "voucher", "payType", "name", "jwcode", "remark", "goodNum", "goodsName", "voucher", "payType",
"paymentAmount", "handlingCharge", "receivedAmount", "receivedTime", "paymentAmount", "handlingCharge", "receivedAmount", "receivedTime",
"marketName", "paymentCurrencyName", "receivedCurrencyName", "statusName", "marketName", "paymentCurrencyName", "receivedCurrencyName", "statusName",

2
src/main/java/com/example/demo/domain/entity/User.java

@ -22,7 +22,7 @@ import java.util.Set;
public class User implements Serializable { public class User implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelIgnore
private Integer id; // 客户id private Integer id; // 客户id
private Integer jwcode; // 精网号 private Integer jwcode; // 精网号
private String name; // 客户姓名 private String name; // 客户姓名

1
src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java

@ -24,6 +24,7 @@ import java.util.Date;
public class BeanConsumeArticle implements Serializable { public class BeanConsumeArticle implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelIgnore
private Integer id; private Integer id;
private String name; //姓名 private String name; //姓名
private Integer jwcode; //精网号 private Integer jwcode; //精网号

1
src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java

@ -24,6 +24,7 @@ import java.util.Date;
public class BeanConsumeFan implements Serializable { public class BeanConsumeFan implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelIgnore
private Integer id; private Integer id;
private String name; //姓名 private String name; //姓名
@ExcelIgnore @ExcelIgnore

1
src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java

@ -29,6 +29,7 @@ import java.util.List;
public class BeanConsumeLive implements Serializable { public class BeanConsumeLive implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelIgnore
private Integer id; private Integer id;
@ExcelIgnore @ExcelIgnore
private Integer roleId; //角色Id private Integer roleId; //角色Id

1
src/main/java/com/example/demo/domain/vo/bean/BeanOnlineRechargeInfo.java

@ -23,6 +23,7 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class BeanOnlineRechargeInfo { public class BeanOnlineRechargeInfo {
@ExcelIgnore
private Long id;//id private Long id;//id
private Integer jwcode; // 精网号 private Integer jwcode; // 精网号
private String name; // 姓名 private String name; // 姓名

1
src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java

@ -23,6 +23,7 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class BeanSystemRechargeInfo { public class BeanSystemRechargeInfo {
@ExcelIgnore
private Long id;//id private Long id;//id
private Integer jwcode; // 精网号 private Integer jwcode; // 精网号
private String name; // 姓名 private String name; // 姓名

1
src/main/java/com/example/demo/domain/vo/cash/CashCollection.java

@ -29,6 +29,7 @@ import java.util.List;
public class CashCollection implements Serializable { public class CashCollection implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelIgnore
private Integer id; private Integer id;
@ExcelIgnore @ExcelIgnore
private Integer orderType; // 订单类型1-收款2-退款 private Integer orderType; // 订单类型1-收款2-退款

1
src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java

@ -23,6 +23,7 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class FundsDTO { public class FundsDTO {
@ExcelIgnore
private Integer id; private Integer id;
@ExcelIgnore @ExcelIgnore
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

Loading…
Cancel
Save