winter 1 год назад
Родитель
Сommit
afd6dd3d6a
2 измененных файлов: 9 добавлений и 2 удалений
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  2. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java

+ 5
- 1
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 javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -430,7 +431,10 @@ public class WxEnergyController extends BaseController {
@ApiOperation("费用区间自动时间") @ApiOperation("费用区间自动时间")
@GetMapping("periodAutoTimes") @GetMapping("periodAutoTimes")
public ResultData periodAutoTimes(@ModelAttribute WxEnergyFeesTime record) { 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("费用区间列表") @ApiOperation("费用区间列表")


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java Просмотреть файл

@@ -802,7 +802,10 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill


@Override @Override
public void exportBill(HttpServletRequest request, HttpServletResponse response, WxAllBill wxBillRent) { 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<WxAllBill> billRentList = listAsPage(wxBillRent,1,10000); PageInfo<WxAllBill> billRentList = listAsPage(wxBillRent,1,10000);
List<WxAllBill> datalist = new ArrayList<WxAllBill>(); List<WxAllBill> datalist = new ArrayList<WxAllBill>();
if (null != billRentList && null != billRentList.getList()) { if (null != billRentList && null != billRentList.getList()) {


Загрузка…
Отмена
Сохранить