From baf36758bb6c8e2cfbfb36a1c1b362bc0a7c0f05 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 6 Jun 2023 14:55:49 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4=EF=BC=8C=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=92=8C=E7=A8=8E=E5=8F=B7=E5=8F=96=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E8=A1=8C=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=8F=96=E4=B8=8B=E6=A0=870?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupManagementController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java index c528cee1..1b8574e1 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java @@ -61,18 +61,19 @@ public class GroupManagementController { groupManagementVO.setGroupName(groupManagementQuery.getGroupName()); groupManagementVO.setEntId(groupManagementQuery.getEntId()); if (CollectionUtil.isNotEmpty(groupManagementEntityList)) { - groupManagementVO.setGroupType(groupManagementEntityList.get(0).getGroupType()); - groupManagementVO.setXhfNsrsbh(groupManagementEntityList.get(0).getXhfNsrsbh()); - groupManagementVO.setXhfMc(groupManagementEntityList.get(0).getXhfMc()); + GroupManagementEntity groupManagementEntity = groupManagementEntityList.stream().filter(t -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_1.getKey().equals(t.getDefaultItem())).findFirst().orElse(groupManagementEntityList.get(0)); + groupManagementVO.setGroupType(groupManagementEntity.getGroupType()); + groupManagementVO.setXhfNsrsbh(groupManagementEntity.getXhfNsrsbh()); + groupManagementVO.setXhfMc(groupManagementEntity.getXhfMc()); if(StringUtils.isBlank(groupManagementVO.getEntId())){ - groupManagementVO.setEntId(groupManagementEntityList.get(0).getEntId()); + groupManagementVO.setEntId(groupManagementEntity.getEntId()); } - groupManagementVO.setUsingEntId(groupManagementEntityList.get(0).getUsingEntId()); + groupManagementVO.setUsingEntId(groupManagementEntity.getUsingEntId()); List taxPayerVOList = new ArrayList<>(); - groupManagementEntityList.forEach(groupManagementEntity -> { + groupManagementEntityList.forEach(t -> { TaxPayerVO taxPayerVO = new TaxPayerVO(); - BeanUtils.copyProperties(groupManagementEntity, taxPayerVO); + BeanUtils.copyProperties(t, taxPayerVO); taxPayerVOList.add(taxPayerVO); });