diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index e15e65ffe..e72648ec7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -430,7 +431,10 @@ public class WxEnergyController extends BaseController { @ApiOperation("费用区间自动时间") @GetMapping("periodAutoTimes") public ResultData periodAutoTimes(@ModelAttribute WxEnergyFeesTime record) { - return new ResultData(); + Map retMap = new HashMap(); + retMap.put("startTime", new Date()); + retMap.put("endTime", new Date()); + return new ResultData(retMap); } @ApiOperation("费用区间列表") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index 2e00b1297..20742eccd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -802,7 +802,10 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxAllBill wxBillRent) { - String billName = wxBillRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单"; + String billName = "账单"; + if (null != wxBillRent.getRentShopType()) { + billName = wxBillRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单"; + } PageInfo billRentList = listAsPage(wxBillRent,1,10000); List datalist = new ArrayList(); if (null != billRentList && null != billRentList.getList()) {