diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index 9a799775c..fdc980c3d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -50,12 +50,23 @@ public class WxBillAllVo { @Excel(name = "账单状态", width = 20, orderNum = "10", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "_7"}) private Integer status; + + @Excel(name="缴款时间",width = 20,orderNum = "11") + private String payDateStr; + + private Date payDate; + + @Excel(name="账单开始时间",width = 20,orderNum = "12") + private String rentStartTime; + + @Excel(name="账单截止时间",width = 20,orderNum = "13") + private String rentEndTime; + private Integer billTypeValue; private Long needPay; private Long receivePay; private Long pay; private Long owe; - private Date payDate; private Date starttime; private Date endtime; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index e9d044d5f..0d1e8bdea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -331,6 +331,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAllVo.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); } } + wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); + wxBillAllVo.setRentStartTime(DateUtils.format(wxBillAllVo.getStarttime())); + wxBillAllVo.setRentEndTime(DateUtils.format(wxBillAllVo.getEndtime())); datalist.add(wxBillAllVo); } }