Commit eac0551a by jinxin

群发记录导出bug修复

parent d597d376
...@@ -452,14 +452,10 @@ public class GroupChatPlanController { ...@@ -452,14 +452,10 @@ public class GroupChatPlanController {
List<ExcelSheet> mysheet = new ArrayList<>(); List<ExcelSheet> mysheet = new ArrayList<>();
ExcelSheet groupChatListExcel = new ExcelSheet("客户群发列表", groupChatListSheetHead, changeGroupChatPlanExcelVOList(groupChatPlanExcelVOList)); ExcelSheet groupChatListExcel = new ExcelSheet("客户群发列表", groupChatListSheetHead, changeGroupChatPlanExcelVOList(groupChatPlanExcelVOList));
mysheet.add(groupChatListExcel); mysheet.add(groupChatListExcel);
if (CollectionUtils.isNotEmpty(sendExcelVOList)){
ExcelSheet sendExcel = new ExcelSheet("发送人群发详情", sendSheetHead, changeSendExcelVOList(sendExcelVOList)); ExcelSheet sendExcel = new ExcelSheet("发送人群发详情", sendSheetHead, changeSendExcelVOList(sendExcelVOList));
mysheet.add(sendExcel); mysheet.add(sendExcel);
}
if (CollectionUtils.isNotEmpty(receiveExcelVOList)){
ExcelSheet receiveExcel = new ExcelSheet("客户群接收详情", receiveSheetHead, changeReceiveExcelVOList(receiveExcelVOList)); ExcelSheet receiveExcel = new ExcelSheet("客户群接收详情", receiveSheetHead, changeReceiveExcelVOList(receiveExcelVOList));
mysheet.add(receiveExcel); mysheet.add(receiveExcel);
}
String s = DateUtil.formatString(new Date(), DateUtil.FORMAT_DATE_10); String s = DateUtil.formatString(new Date(), DateUtil.FORMAT_DATE_10);
String fileName = "客户群群发"+s; String fileName = "客户群群发"+s;
ExportSheetUtil.exportManySheetExcel(fileName, mysheet, response); ExportSheetUtil.exportManySheetExcel(fileName, mysheet, response);
...@@ -479,6 +475,9 @@ public class GroupChatPlanController { ...@@ -479,6 +475,9 @@ public class GroupChatPlanController {
} }
private List<String[]> changeSendExcelVOList(List<SendExcelVO> sendExcelVOList){ private List<String[]> changeSendExcelVOList(List<SendExcelVO> sendExcelVOList){
List<String[]> result = new ArrayList<>(); List<String[]> result = new ArrayList<>();
if(CollectionUtils.isEmpty(sendExcelVOList)){
return result;
}
for (SendExcelVO vo : sendExcelVOList){ for (SendExcelVO vo : sendExcelVOList){
String sendTime = DateUtil.formatString(vo.getSendTime(), DateUtil.FORMAT_DATETIME_19); String sendTime = DateUtil.formatString(vo.getSendTime(), DateUtil.FORMAT_DATETIME_19);
String startTime = DateUtil.formatString(vo.getStartTime(), DateUtil.FORMAT_DATETIME_19); String startTime = DateUtil.formatString(vo.getStartTime(), DateUtil.FORMAT_DATETIME_19);
...@@ -490,6 +489,9 @@ public class GroupChatPlanController { ...@@ -490,6 +489,9 @@ public class GroupChatPlanController {
} }
private List<String[]> changeReceiveExcelVOList(List<ReceiveExcelVO> receiveExcelVOList){ private List<String[]> changeReceiveExcelVOList(List<ReceiveExcelVO> receiveExcelVOList){
List<String[]> result = new ArrayList<>(); List<String[]> result = new ArrayList<>();
if(CollectionUtils.isEmpty(receiveExcelVOList)){
return result;
}
for (ReceiveExcelVO vo : receiveExcelVOList){ for (ReceiveExcelVO vo : receiveExcelVOList){
String sendTime = DateUtil.formatString(vo.getSendTime(), DateUtil.FORMAT_DATETIME_19); String sendTime = DateUtil.formatString(vo.getSendTime(), DateUtil.FORMAT_DATETIME_19);
String startTime = DateUtil.formatString(vo.getStartTime(), DateUtil.FORMAT_DATETIME_19); String startTime = DateUtil.formatString(vo.getStartTime(), DateUtil.FORMAT_DATETIME_19);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment