|
@@ -175,11 +175,14 @@ public class ProductMaterialController {
|
|
|
List<List<Object>> excelList = new ArrayList<>();
|
|
|
if (!list.isEmpty()) {
|
|
|
list.forEach(data -> {
|
|
|
+ String endMonth = data.getString("endMonth");
|
|
|
+ if(Check.isNull(endMonth)){
|
|
|
+ endMonth= "-";
|
|
|
+ }
|
|
|
List<Object> temp = new ArrayList<>();
|
|
|
temp.add(data.getString("productName"));
|
|
|
temp.add(data.getString("tradeName"));
|
|
|
- temp.add(data.getString("startMonth"));
|
|
|
- temp.add(data.getString("endMonth"));
|
|
|
+ temp.add(data.getString("startMonth")+" ~ " +endMonth);
|
|
|
temp.add(data.getString("videoUrl"));
|
|
|
temp.add(data.getString("charge"));
|
|
|
temp.add(data.getString("itemRun"));
|
|
@@ -190,12 +193,11 @@ public class ProductMaterialController {
|
|
|
List<String> titles = new ArrayList<>();
|
|
|
titles.add(0, "产品名称");
|
|
|
titles.add(1, "商品名称");
|
|
|
- titles.add(2, "开始时间");
|
|
|
- titles.add(3, "暂停时间");
|
|
|
- titles.add(4, "视频链接");
|
|
|
- titles.add(5, "消耗");
|
|
|
- titles.add(6, "是否跑量");
|
|
|
- titles.add(7, "上传人");
|
|
|
+ titles.add(2, "时间");
|
|
|
+ titles.add(3, "视频链接");
|
|
|
+ titles.add(4, "消耗");
|
|
|
+ titles.add(5, "是否跑量");
|
|
|
+ titles.add(6, "上传人");
|
|
|
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|