Просмотр исходного кода

feat: 对账导出数据调整

hejq 7 лет назад
Родитель
Сommit
f01bb453c0

+ 1 - 1
src/main/java/com/uas/platform/b2b/controller/SaleApCheckController.java

@@ -581,7 +581,7 @@ public class SaleApCheckController {
 		ModelAndView modelAndView = new ModelAndView();
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", erpProdIODetailService.findXlsApChecks(distributes, keyword, fromDate, endDate, checkDate));
+		modelAndView.addObject("data", erpProdIODetailService.findXlsApChecks(distributes, keyword, fromDate, endDate, checkDate).getDetails());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApCheck", "客户应收对账单"));
 		logger.log("客户应收对账单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

+ 2 - 1
src/main/java/com/uas/platform/b2b/model/ErpProdIo.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.model;
 
 import com.uas.platform.b2b.publicapi.model.TradeCount;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -15,7 +16,7 @@ public class ErpProdIo {
     /**
      * 应收对账单数据
      */
-    private List<ErpProdIODetail> details;
+    private List<ErpProdIODetail> details = new ArrayList<>();
 
     /**
      * 本月应收(前端传入指定月份)