| @@ -1187,10 +1187,12 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| ExcelExportEntity entity13_5 = new ExcelExportEntity("业态","businessName",20); | ExcelExportEntity entity13_5 = new ExcelExportEntity("业态","businessName",20); | ||||
| entity13_list.add(entity13_5); | entity13_list.add(entity13_5); | ||||
| ExcelExportEntity entity13_6 = new ExcelExportEntity("提交时间","createDate",20); | ExcelExportEntity entity13_6 = new ExcelExportEntity("提交时间","createDate",20); | ||||
| entity13_6.setFormat("yyyy-MM-dd HH:mm:ss"); | |||||
| entity13_list.add(entity13_6); | entity13_list.add(entity13_6); | ||||
| ExcelExportEntity entity13_7 = new ExcelExportEntity("审核人","auditByName",20); | ExcelExportEntity entity13_7 = new ExcelExportEntity("审核人","auditByName",20); | ||||
| entity13_list.add(entity13_7); | entity13_list.add(entity13_7); | ||||
| ExcelExportEntity entity13_8 = new ExcelExportEntity("审核时间","auditTime",20); | ExcelExportEntity entity13_8 = new ExcelExportEntity("审核时间","auditTime",20); | ||||
| entity13_8.setFormat("yyyy-MM-dd HH:mm:ss"); | |||||
| entity13_list.add(entity13_8); | entity13_list.add(entity13_8); | ||||
| entity13.setList(entity13_list); | entity13.setList(entity13_list); | ||||
| headList.add(entity13); | headList.add(entity13); | ||||
| @@ -1286,9 +1288,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| entity15_list.add(entity15_1); | entity15_list.add(entity15_1); | ||||
| ExcelExportEntity entity15_2 = new ExcelExportEntity("返现金额","awardsItemPrice",20); | ExcelExportEntity entity15_2 = new ExcelExportEntity("返现金额","awardsItemPrice",20); | ||||
| entity15_list.add(entity15_2); | entity15_list.add(entity15_2); | ||||
| ExcelExportEntity entity15_3 = new ExcelExportEntity("商管承担比例","mallRate(%)",20); | |||||
| ExcelExportEntity entity15_3 = new ExcelExportEntity("商管承担比例(%)","mallRate",20); | |||||
| entity15_list.add(entity15_3); | entity15_list.add(entity15_3); | ||||
| ExcelExportEntity entity15_4 = new ExcelExportEntity("商户承担比例","merchantRate(%)",20); | |||||
| ExcelExportEntity entity15_4 = new ExcelExportEntity("商户承担比例(%)","merchantRate",20); | |||||
| entity15_list.add(entity15_4); | entity15_list.add(entity15_4); | ||||
| ExcelExportEntity entity15_5 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); | ExcelExportEntity entity15_5 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); | ||||
| entity15_list.add(entity15_5); | entity15_list.add(entity15_5); | ||||