diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java index bccd1ea92..371fb78c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java @@ -63,8 +63,9 @@ public class WxImportTemplateController extends BaseController { throw new MallinkException(Result.ERROR, "上传文件不能为空"); } //得到当前用户ID + String typeStr = EnumImportType.getEnum(type).getMessage(); final MallUserInfo user = getUser(); - String userId = type + "_" + user.getId(); + String userId = typeStr + "_" + user.getId(); String importKey = Constant.importMemPrev + userId; final String tenantId = getTenantId(); @@ -145,8 +146,9 @@ public class WxImportTemplateController extends BaseController { @GetMapping("/queryTemplateCount") @SystemControllerLog(description = "导入数据查询") - public ResultData queryTemplateCount(@RequestParam("type") MultipartFile type) { - String importKey = Constant.importMemPrev + type + "_" + getUser().getId(); + public ResultData queryTemplateCount(@RequestParam("type") Integer type) { + String typeStr = EnumImportType.getEnum(type).getMessage(); + String importKey = Constant.importMemPrev + typeStr + "_" + getUser().getId(); Map entries = stringRedisTemplate.opsForHash().entries(importKey); logger.info(JSONArray.toJSONString(entries) + ">>>>>>>>>>>>>>>>>>>>>1"); if (entries.size() < 4) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumImportType.java b/mallinkService/src/main/java/com/iformall/enums/EnumImportType.java index bf57cc319..8ec14c903 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumImportType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumImportType.java @@ -7,14 +7,14 @@ package com.iformall.enums; public enum EnumImportType { - MEMBER(1, "会员"), - SHOP_RENT(2, "商铺租金"), - POINT_RENT(3, "多经点位租金"), - SHOP_PROPERTY(4, "商铺物业费"), - POINT_PROPERTY(5, "多经点位物业费"), - DAILY(6, "日常费用"), - OTHER(7, "其他费用"), - OTHER_DEPOSIT(8, "其他押金"),; + MEMBER(1, "member"), + SHOP_RENT(2, "shop_rent"), + POINT_RENT(3, "point_rent"), + SHOP_PROPERTY(4, "shop_property"), + POINT_PROPERTY(5, "point_property"), + DAILY(6, "daily"), + OTHER(7, "other"), + OTHER_DEPOSIT(8, "other_deposit"),; public static EnumImportType getEnum(Integer code) { for (EnumImportType value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index efdd4a9bd..ec15b9501 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -268,7 +268,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillOtherDeposit wxBillDeposit) { List datalist = wxBillOtherDepositMapper.queryBillList(wxBillDeposit); - excelService.exportExcel(datalist, null, "其他押金账单", WxBillProperty.class, "其他押金账单.xlsx", response, false); + excelService.exportExcel(datalist, null, "其他押金账单", WxBillOtherDeposit.class, "其他押金账单.xlsx", response, false); }