submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderAcceptanceController.java

@@ -8,6 +8,7 @@ import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.EasyPoiUtil;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
@@ -142,6 +143,7 @@ public class TopOrderAcceptanceController extends BaseController {
         List<TopOrderAcceptanceVo> list = iTopOrderAcceptanceService.queryAcceptanceList(bo);
         List<TopOrderAcceptanceExportBo> collect = list.stream().map(item -> {
             TopOrderAcceptanceExportBo exportBo = BeanUtil.toBean(item, TopOrderAcceptanceExportBo.class);
+            exportBo.setIncomeTime(DateUtils.timestampToDateFormat(item.getIncomeTime(),"yyyy/MM/dd"));
             return exportBo;
         }).collect(Collectors.toList());
         ExcelUtil<TopOrderAcceptanceExportBo> util = new ExcelUtil<TopOrderAcceptanceExportBo>(TopOrderAcceptanceExportBo.class);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderAcceptanceExportBo.java

@@ -40,7 +40,7 @@ public class TopOrderAcceptanceExportBo implements Serializable {
     private String incomeTime;
     /** 付款账户名 */
     @ApiModelProperty("付款账户名")
-    @Excel(name = "*到账时间")
+    @Excel(name = "*付款账户名")
     private String payName;
     /** 付款账户行 */
     @ApiModelProperty("付款账户行")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderStatisticsMoneyVo.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
 public class TopOrderStatisticsMoneyVo implements Serializable {
 
     @ApiModelProperty("客户ID")
-    private Long customerId;
+    private String customerId;
 
     @ApiModelProperty("客户名称")
     private String customerName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderStatisticsNumVo.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
 public class TopOrderStatisticsNumVo implements Serializable {
 
     @ApiModelProperty("客户ID")
-    private Long customerId;
+    private String customerId;
 
     @ApiModelProperty("客户名称")
     private String customerName;