diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java index 6fdda42d..bbcc9c88 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java @@ -9,7 +9,6 @@ import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.consumer.modules.taxcodematch.emum.SdenergyTaxCodeMatchEnum; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; -import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMathchImport; import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO; import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDeleteDTO; import com.dxhy.order.consumer.modules.taxcodematch.service.SdenergyTaxCodeMatchService; @@ -133,7 +132,7 @@ public class SdenergyTaxCodeMatchController { for (SdenergyTaxCodeMatchEnum flowStatus : SdenergyTaxCodeMatchEnum.values()) { headToProperty.put(flowStatus.getKey(), flowStatus.getValue()); } - ExcelReadContext context = new ExcelReadContext(SdenergyTaxCodeMathchImport.class, headToProperty, false); + ExcelReadContext context = new ExcelReadContext(SdenergyTaxCodeMatch.class, headToProperty, false); if (StringUtils.isBlank(file.getOriginalFilename())) { context.setFilePrefix(".xlsx"); } else { @@ -141,9 +140,9 @@ public class SdenergyTaxCodeMatchController { } ExcelReadHandle handle = new ExcelReadHandle(context); - List uploadList = new ArrayList<>(); + List uploadList = new ArrayList<>(); try { - uploadList = handle.readFromExcel(file.getInputStream(), SdenergyTaxCodeMathchImport.class); + uploadList = handle.readFromExcel(file.getInputStream(), SdenergyTaxCodeMatch.class); } catch (ExcelReadException e) { log.error("{},导入物料分类编码异常", LOGGER_MSG, e); return R.error("导入物料分类编码异常,请重新上传"); @@ -156,12 +155,12 @@ public class SdenergyTaxCodeMatchController { } List> errorMsgList = Lists.newArrayList(); int resultIndex = 2; - Map> collect = uploadList.stream().collect(Collectors.groupingBy(t -> t.getSsflbm())); + Map> collect = uploadList.stream().collect(Collectors.groupingBy(t -> t.getSsflbm())); List collect1 = collect.keySet().stream().filter(t -> collect.get(t).size() > 1).collect(Collectors.toList()); if(!collect1.isEmpty()){ return R.error("导入物料分类编码异常,物料分类编码存在重复项,请检查"); } - for (SdenergyTaxCodeMathchImport taxCodeMatch : uploadList) { + for (SdenergyTaxCodeMatch taxCodeMatch : uploadList) { resultIndex++; String wlflbm = taxCodeMatch.getWlflbm(); if(StringUtils.isNotBlank(wlflbm)){ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java index a6e76625..17741582 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/dao/SdenergyTaxCodeMatchDao.java @@ -1,7 +1,6 @@ package com.dxhy.order.consumer.modules.taxcodematch.dao; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; -import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMathchImport; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -78,6 +77,6 @@ public interface SdenergyTaxCodeMatchDao { * @param id * @return */ - int batchInsert(List id); + int batchInsert(List id); } \ No newline at end of file diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java index 3780b322..7975363f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/SdenergyTaxCodeMatchService.java @@ -1,7 +1,6 @@ package com.dxhy.order.consumer.modules.taxcodematch.service; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; -import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMathchImport; import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO; import com.dxhy.order.model.PageUtils; @@ -60,7 +59,7 @@ public interface SdenergyTaxCodeMatchService { boolean deleteById(Long id); - int upload(List list); + int upload(List list); SdenergyTaxCodeMatch queryByWlflbm(String wlflbm); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java index 2fa3cc1a..9e973e89 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/service/impl/SdenergyTaxCodeMatchServiceImpl.java @@ -3,7 +3,6 @@ package com.dxhy.order.consumer.modules.taxcodematch.service.impl; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch; import com.dxhy.order.consumer.modules.taxcodematch.dao.SdenergyTaxCodeMatchDao; -import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMathchImport; import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO; import com.dxhy.order.consumer.modules.taxcodematch.service.SdenergyTaxCodeMatchService; import com.dxhy.order.model.PageUtils; @@ -118,7 +117,7 @@ public class SdenergyTaxCodeMatchServiceImpl implements SdenergyTaxCodeMatchServ */ @Override @Transactional - public int upload(List list) { + public int upload(List list) { return this.sdenergyTaxCodeMatchDao.batchInsert(list); }