From f4c5fd6e7b05ff9af81ddcc032f75a9fb8e47fef Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Mon, 28 Apr 2025 19:17:57 +0800 Subject: [PATCH 1/3] //item export --- .../impl/WxOfflineActivityGrantAwardServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 05e6eafb0..5d8403237 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -2040,7 +2040,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity grantItemObjectList.add(grantItemObject); }); } - excelService.exportExcel(exportHead, grantItemObjectList, null, "活动("+activityItem.getName()+")联单发放明细", "活动("+activityItem.getName()+")联单发放明细.xlsx",true, response); + String excelName = "活动("+activityItem.getName()+")"; + if(EnumOfflineActivityAwardsModeType.AMOUNT.getCode().equals(activityItem.getType())){ + excelName = excelName + "金额"; + }else if(EnumOfflineActivityAwardsModeType.COUNT.getCode().equals(activityItem.getType())){ + excelName = excelName + "联单"; + } + excelService.exportExcel(exportHead, grantItemObjectList, null, excelName+"发放明细", excelName+"发放明细.xlsx",true, response); } From 12345b70ae74bac33463ff92cfa417cba975225d Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Mon, 28 Apr 2025 20:57:37 +0800 Subject: [PATCH 2/3] //item export --- .../service/impl/WxOfflineActivityGrantAwardServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 5d8403237..76b2b01d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -2041,9 +2041,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity }); } String excelName = "活动("+activityItem.getName()+")"; - if(EnumOfflineActivityAwardsModeType.AMOUNT.getCode().equals(activityItem.getType())){ + if(EnumOfflineActivityAwardsModeType.AMOUNT.getCode().equals(offlineActivityAwardsItemVo.getGrantAwardsMode())){ excelName = excelName + "金额"; - }else if(EnumOfflineActivityAwardsModeType.COUNT.getCode().equals(activityItem.getType())){ + }else if(EnumOfflineActivityAwardsModeType.COUNT.getCode().equals(offlineActivityAwardsItemVo.getGrantAwardsMode())){ excelName = excelName + "联单"; } excelService.exportExcel(exportHead, grantItemObjectList, null, excelName+"发放明细", excelName+"发放明细.xlsx",true, response); From 3973f4160ee8e94d1fa696a63ad66cf8f273852c Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Tue, 29 Apr 2025 21:23:30 +0800 Subject: [PATCH 3/3] //item export bug --- ...xOfflineActivityGrantAwardServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 76b2b01d7..7d2c6aa27 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -2079,13 +2079,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity exportHead.add(entity_3); ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice_"+i,20); exportHead.add(entity_3_); - ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate_"+i,20); + ExcelExportEntity entity_4 = new ExcelExportEntity("商管承担比例(%)","mallShareRate_"+i,20); exportHead.add(entity_4); - ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate_"+i,20); + ExcelExportEntity entity_5 = new ExcelExportEntity("商户承担比例(%)","merchantShareRate_"+i,20); exportHead.add(entity_5); - ExcelExportEntity entity_6 = new ExcelExportEntity("商户承担金额","realMallSharePrice_"+i,20); + ExcelExportEntity entity_6 = new ExcelExportEntity("商管承担金额","realMallSharePrice_"+i,20); exportHead.add(entity_6); - ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice_"+i,20); + ExcelExportEntity entity_7 = new ExcelExportEntity("商户承担金额","realMerchantSharePrice_"+i,20); exportHead.add(entity_7); } @@ -2310,13 +2310,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity headList.add(entity_3); ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice",20); headList.add(entity_3_); - ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); + ExcelExportEntity entity_4 = new ExcelExportEntity("商管承担比例(%)","mallShareRate",20); headList.add(entity_4); - ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); + ExcelExportEntity entity_5 = new ExcelExportEntity("商户承担比例(%)","merchantShareRate",20); headList.add(entity_5); - ExcelExportEntity entity_6 = new ExcelExportEntity("商户承担金额","realMallSharePrice",20); + ExcelExportEntity entity_6 = new ExcelExportEntity("商管承担金额","realMallSharePrice",20); headList.add(entity_6); - ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice",20); + ExcelExportEntity entity_7 = new ExcelExportEntity("商户承担金额","realMerchantSharePrice",20); headList.add(entity_7); }else if(EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())){ @@ -2331,13 +2331,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity headList.add(entity_3); ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担金额","realGrantPrice",20); headList.add(entity_3_); - ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); + ExcelExportEntity entity_4 = new ExcelExportEntity("商管承担比例(%)","mallShareRate",20); headList.add(entity_4); - ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); + ExcelExportEntity entity_5 = new ExcelExportEntity("商户承担比例(%)","merchantShareRate",20); headList.add(entity_5); - ExcelExportEntity entity_6 = new ExcelExportEntity("商户承担金额","realMallSharePrice",20); + ExcelExportEntity entity_6 = new ExcelExportEntity("商管承担金额","realMallSharePrice",20); headList.add(entity_6); - ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice",20); + ExcelExportEntity entity_7 = new ExcelExportEntity("商户承担金额","realMerchantSharePrice",20); headList.add(entity_7); if(EnumOfflineActivityMode.ONE.getCode().equals(activityItem.getModeType())){ ExcelExportEntity entity_8 = new ExcelExportEntity("税点金额起点","startingTaxPoint",20);