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

[账单列表][修改[导出数据]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
5e8c580cb5
2 измененных файлов: 4 добавлений и 5 удалений
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 4
- 4
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java Просмотреть файл

@@ -17,13 +17,13 @@ public class WxBillAllVo {

private Long shopId;

//@Excel(name="商铺号",width = 20,orderNum = "1")
@Excel(name = "商铺号", width = 20, orderNum = "1")
private String shopNumber;

//@Excel(name="商户名称",width = 20,orderNum = "2")
@Excel(name = "商户名称", width = 20, orderNum = "2")
private String merchantName;

//@Excel(name="商铺类型",width = 20,orderNum = "3", replace = {"店铺_1","多经点位_2"})
@Excel(name = "商铺类型", width = 20, orderNum = "3", replace = {"店铺_1", "多经点位_2"})
private Integer rentShopType;

@Excel(name="费用类型",width = 20,orderNum = "4")
@@ -44,7 +44,7 @@ public class WxBillAllVo {
@Excel(name="逾期天数",width = 20,orderNum = "9")
private Integer expiredDay;

@Excel(name="账单状态",width = 20,orderNum = "10", replace = {"欠缴_1","待缴_2","已结清_3","未到期_4","已退还_5","失效_6"})
@Excel(name = "账单状态", width = 20, orderNum = "10", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "_7"})
private Integer status;

private Integer billTypeValue;


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

@@ -230,7 +230,6 @@ public class WxBillAllServiceImpl implements WxBillAllService {

Set<Map.Entry<Long, List<WxBillAllVo>>> entries = billMapList.entrySet();
for (Map.Entry<Long, List<WxBillAllVo>> entry : entries) {
list.add(new WxBillAllVo());
list.addAll(entry.getValue());
}



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