feature:开票组织查询调整,名称和税号取设置默认的行,如果不存在取下标0的展示

release
gaorl 2 years ago
parent f27bd5c18b
commit baf36758bb
  1. 15
      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.setGroupName(groupManagementQuery.getGroupName());
groupManagementVO.setEntId(groupManagementQuery.getEntId()); groupManagementVO.setEntId(groupManagementQuery.getEntId());
if (CollectionUtil.isNotEmpty(groupManagementEntityList)) { if (CollectionUtil.isNotEmpty(groupManagementEntityList)) {
groupManagementVO.setGroupType(groupManagementEntityList.get(0).getGroupType()); GroupManagementEntity groupManagementEntity = groupManagementEntityList.stream().filter(t -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_1.getKey().equals(t.getDefaultItem())).findFirst().orElse(groupManagementEntityList.get(0));
groupManagementVO.setXhfNsrsbh(groupManagementEntityList.get(0).getXhfNsrsbh()); groupManagementVO.setGroupType(groupManagementEntity.getGroupType());
groupManagementVO.setXhfMc(groupManagementEntityList.get(0).getXhfMc()); groupManagementVO.setXhfNsrsbh(groupManagementEntity.getXhfNsrsbh());
groupManagementVO.setXhfMc(groupManagementEntity.getXhfMc());
if(StringUtils.isBlank(groupManagementVO.getEntId())){ 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<TaxPayerVO> taxPayerVOList = new ArrayList<>(); List<TaxPayerVO> taxPayerVOList = new ArrayList<>();
groupManagementEntityList.forEach(groupManagementEntity -> { groupManagementEntityList.forEach(t -> {
TaxPayerVO taxPayerVO = new TaxPayerVO(); TaxPayerVO taxPayerVO = new TaxPayerVO();
BeanUtils.copyProperties(groupManagementEntity, taxPayerVO); BeanUtils.copyProperties(t, taxPayerVO);
taxPayerVOList.add(taxPayerVO); taxPayerVOList.add(taxPayerVO);
}); });

Loading…
Cancel
Save