| @@ -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(offlineActivityAwardsItemVo.getGrantAwardsMode())){ | |||
| excelName = excelName + "金额"; | |||
| }else if(EnumOfflineActivityAwardsModeType.COUNT.getCode().equals(offlineActivityAwardsItemVo.getGrantAwardsMode())){ | |||
| excelName = excelName + "联单"; | |||
| } | |||
| excelService.exportExcel(exportHead, grantItemObjectList, null, excelName+"发放明细", excelName+"发放明细.xlsx",true, response); | |||
| } | |||
| @@ -2073,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); | |||
| } | |||
| @@ -2304,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())){ | |||
| @@ -2325,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); | |||