From 35a0b6ec927613681522b8b24ca77af4c7e9ff2f Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Wed, 12 Apr 2023 10:53:30 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=A2=9E=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AE=A2=E5=95=86=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/controller/GroupCommodityCodeController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java index 3032b411..70f9a1d2 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java @@ -108,7 +108,7 @@ public class GroupCommodityCodeController { List buyerEntityExcels = EasyExcel.read(file.getInputStream()).sheet(0).head(BuyerEntityExcel.class).headRowNumber(1).doReadSync(); List buyerEntityYhItemExcels = EasyExcel.read(file.getInputStream()).sheet(1).head(BuyerEntityYhItemExcel.class).headRowNumber(1).doReadSync(); log.info("解析的数据：{}", JSONObject.toJSONString(buyerEntityExcels)); - if (buyerEntityExcels == null || buyerEntityExcels.isEmpty() || buyerEntityYhItemExcels == null || !buyerEntityYhItemExcels.isEmpty()) { + if (buyerEntityExcels == null || buyerEntityExcels.isEmpty() || buyerEntityYhItemExcels == null || buyerEntityYhItemExcels.isEmpty()) { return R.error("数据解析失败"); } Map> listMap = buyerEntityYhItemExcels.stream().collect(Collectors.groupingBy(BuyerEntityYhItemExcel::getCODEID)); @@ -123,8 +123,10 @@ public class GroupCommodityCodeController { reqBO.setDESC23(buyerEntity.getDESC23()); reqBO.setDESC24(buyerEntity.getDESC24()); reqBO.setDESC26(buyerEntity.getDESC26()); + reqBO.setDESC38(buyerEntity.getDESC38()); reqBO.setDESC39(buyerEntity.getDESC39()); + reqBO.setDESC48(buyerEntity.getDESC48()); reqBO.setDESC49(buyerEntity.getDESC49()); reqBO.setDESC27(buyerEntity.getDESC27());