|
|
|
@ -108,7 +108,7 @@ public class GroupCommodityCodeController { |
|
|
|
|
List<BuyerEntityExcel> buyerEntityExcels = EasyExcel.read(file.getInputStream()).sheet(0).head(BuyerEntityExcel.class).headRowNumber(1).doReadSync(); |
|
|
|
|
List<BuyerEntityYhItemExcel> 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<String, List<BuyerEntityYhItemExcel>> 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()); |
|
|
|
|