From d98cb5dc64de58399ecc3ae6a295f08ff415ff6b Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 15 Aug 2023 10:53:23 +0800 Subject: [PATCH] =?UTF-8?q?bug:=E7=89=A9=E6=96=99=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ .../SdenergyTaxCodeMatchController.java | 11 ++++---- .../dao/SdenergyTaxCodeMatchDao.java | 3 ++- .../entity/SdenergyTaxCodeMathchImport.java | 25 +++++++++++++++++++ .../service/SdenergyTaxCodeMatchService.java | 3 ++- .../impl/SdenergyTaxCodeMatchServiceImpl.java | 3 ++- 6 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/entity/SdenergyTaxCodeMathchImport.java diff --git a/.gitignore b/.gitignore index 5d18031c..84ed3d17 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ */target/ */.classpath */*.iml +order-management-consumer/src/main/resources/bootstrap.yaml +order-management-consumer/src/main/resources/generator.properties ## 其他web 模式忽略文件 order-management-consumer/src/main/resources/META-INF/ 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 bbcc9c88..6fdda42d 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,6 +9,7 @@ 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; @@ -132,7 +133,7 @@ public class SdenergyTaxCodeMatchController { for (SdenergyTaxCodeMatchEnum flowStatus : SdenergyTaxCodeMatchEnum.values()) { headToProperty.put(flowStatus.getKey(), flowStatus.getValue()); } - ExcelReadContext context = new ExcelReadContext(SdenergyTaxCodeMatch.class, headToProperty, false); + ExcelReadContext context = new ExcelReadContext(SdenergyTaxCodeMathchImport.class, headToProperty, false); if (StringUtils.isBlank(file.getOriginalFilename())) { context.setFilePrefix(".xlsx"); } else { @@ -140,9 +141,9 @@ public class SdenergyTaxCodeMatchController { } ExcelReadHandle handle = new ExcelReadHandle(context); - List uploadList = new ArrayList<>(); + List uploadList = new ArrayList<>(); try { - uploadList = handle.readFromExcel(file.getInputStream(), SdenergyTaxCodeMatch.class); + uploadList = handle.readFromExcel(file.getInputStream(), SdenergyTaxCodeMathchImport.class); } catch (ExcelReadException e) { log.error("{},导入物料分类编码异常", LOGGER_MSG, e); return R.error("导入物料分类编码异常，请重新上传"); @@ -155,12 +156,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 (SdenergyTaxCodeMatch taxCodeMatch : uploadList) { + for (SdenergyTaxCodeMathchImport 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 17741582..a6e76625 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,6 +1,7 @@ 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; @@ -77,6 +78,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/entity/SdenergyTaxCodeMathchImport.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/entity/SdenergyTaxCodeMathchImport.java new file mode 100644 index 00000000..6725462c --- /dev/null +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/entity/SdenergyTaxCodeMathchImport.java @@ -0,0 +1,25 @@ +package com.dxhy.order.consumer.modules.taxcodematch.entity; + +import lombok.Data; + +@Data +public class SdenergyTaxCodeMathchImport { + + + /** + * 物料分类编码 + */ + private String wlflbm; + /** + * 物料名称 + */ + private String flmc; + /** + * 税收分类编码 + */ + private String ssflbm; + /** + * 税收分类名称 + */ + private String ssflmc; +} 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 7975363f..3780b322 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,6 +1,7 @@ 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; @@ -59,7 +60,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 9e973e89..2fa3cc1a 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,6 +3,7 @@ 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; @@ -117,7 +118,7 @@ public class SdenergyTaxCodeMatchServiceImpl implements SdenergyTaxCodeMatchServ */ @Override @Transactional - public int upload(List list) { + public int upload(List list) { return this.sdenergyTaxCodeMatchDao.batchInsert(list); }