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

[日常账单][修改][导入数据精度问题]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
3a29b7a934
3 измененных файлов: 8 добавлений и 4 удалений
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java
  2. +3
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java

+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java Просмотреть файл

@@ -65,9 +65,9 @@ public class BillDailyAsyncTask {
public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) {
ImportParams params = new ImportParams(); ImportParams params = new ImportParams();
// 需要验证 // 需要验证
params.setImportFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*"});
params.setImportFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*", "租赁商铺类型*"});
IExcelDataHandler<WxBillDailyVo> handler = new BillDailyAsyncTask.BillDailyExcelHandler(); IExcelDataHandler<WxBillDailyVo> handler = new BillDailyAsyncTask.BillDailyExcelHandler();
handler.setNeedHandlerFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*"});
handler.setNeedHandlerFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*", "租赁商铺类型*"});
params.setNeedVerify(true); params.setNeedVerify(true);


ExcelImportResult<WxBillDailyVo> datalist = null; ExcelImportResult<WxBillDailyVo> datalist = null;
@@ -101,6 +101,7 @@ public class BillDailyAsyncTask {
WxShop shop = new WxShop(); WxShop shop = new WxShop();
shop.setShopNumber(vo.getShopNumber()); shop.setShopNumber(vo.getShopNumber());
shop.setTenantId(tenantId); shop.setTenantId(tenantId);
shop.setType(vo.getRentShopType());
shop.setStatus(EnumShopStatus.RENT.getCode()); shop.setStatus(EnumShopStatus.RENT.getCode());
shop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); shop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
WxShop wxShop = wxShopMapper.selectOne(shop); WxShop wxShop = wxShopMapper.selectOne(shop);


+ 3
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Просмотреть файл

@@ -82,8 +82,9 @@ public class WxBillDaily extends BaseEntity{
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime")
private Date updatetime; private Date updatetime;


@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
private Integer rentShopType;
@Excel(name = "租赁商铺类型*", orderNum = "6", width = 20, replace = {"店铺_1", "多经点位_2"})
@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
private Integer rentShopType;


@io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay")
private Integer payWay; private Integer payWay;


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

@@ -227,6 +227,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
v1.setPayStr("0"); v1.setPayStr("0");
v1.setReceiveDate(new Date()); v1.setReceiveDate(new Date());
v1.setExpiredDay(0L); v1.setExpiredDay(0L);
v1.setRentShopType(1);
list.add(v1); list.add(v1);


v2.setShopNumber("A0002"); v2.setShopNumber("A0002");
@@ -235,6 +236,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
v2.setPayStr("0"); v2.setPayStr("0");
v2.setReceiveDate(new Date()); v2.setReceiveDate(new Date());
v2.setExpiredDay(0L); v2.setExpiredDay(0L);
v2.setRentShopType(2);
list.add(v2); list.add(v2);


excelService.exportExcel(list, null, "水电费模板", WxBillDailyVo.class, "水电费模板.xlsx", response, true); excelService.exportExcel(list, null, "水电费模板", WxBillDailyVo.class, "水电费模板.xlsx", response, true);


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