Merge remote-tracking branch 'origin/dev_zxm' into test

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiTaxationService.java

@@ -2,6 +2,7 @@ package com.yd.csf.api.service;
 
 import com.yd.common.result.Result;
 import com.yd.csf.feign.dto.taxation.ApiObjectTaxationDto;
+import com.yd.csf.feign.dto.taxation.ApiTaxationDto;
 import com.yd.csf.service.model.Taxation;
 
 import java.util.List;
@@ -11,4 +12,6 @@ public interface ApiTaxationService {
     Result saveTaxationList(ApiObjectTaxationDto dto);
 
     Result<List<Taxation>> list(ApiObjectTaxationDto dto);
+
+    List<ApiTaxationDto> apiTaxationDtoList(String objectBizId);
 }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiInsurantServiceImpl.java

@@ -74,6 +74,8 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
             dto.setAddressList(CommonUtil.getAddressList(insurant.getAddressList()));
             //查询证件列表信息
             dto.setApiCertificateDtoList(apiCertificateDtoList(insurant.getInsurantBizId()));
+
+            dto.setApiTaxationDtoList(apiTaxationService.apiTaxationDtoList(insurant.getInsurantBizId()));
         }
         return Result.success(dto);
     }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPolicyholderServiceImpl.java

@@ -67,6 +67,8 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
             dto.setAddressList(CommonUtil.getAddressList(policyholder.getAddressList()));
 
             dto.setApiCertificateDtoList(apiCertificateDtoList(policyholder.getPolicyholderBizId()));
+
+            dto.setApiTaxationDtoList(apiTaxationService.apiTaxationDtoList(policyholder.getPolicyholderBizId()));
         }
         return Result.success(dto);
     }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiTaxationServiceImpl.java

@@ -5,6 +5,7 @@ import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.api.service.ApiTaxationService;
 import com.yd.csf.feign.dto.taxation.ApiObjectTaxationDto;
+import com.yd.csf.feign.dto.taxation.ApiTaxationDto;
 import com.yd.csf.service.dto.TaxationDto;
 import com.yd.csf.service.model.Taxation;
 import com.yd.csf.service.service.ITaxationService;
@@ -13,6 +14,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -59,5 +62,19 @@ public class ApiTaxationServiceImpl implements ApiTaxationService {
         return Result.success(list);
     }
 
+    @Override
+    public List<ApiTaxationDto> apiTaxationDtoList(String objectBizId) {
+        List<ApiTaxationDto> apiTaxationDtoList = new ArrayList<>();
+        Result<List<Taxation>> result = list(ApiObjectTaxationDto.builder().objectBizId(objectBizId).build());
+        if (!CollectionUtils.isEmpty(result.getData())) {
+            apiTaxationDtoList = result.getData().stream().map(d -> {
+                ApiTaxationDto taxationDto = new ApiTaxationDto();
+                BeanUtils.copyProperties(d,taxationDto);
+                return taxationDto;
+            }).collect(Collectors.toList());
+        }
+        return apiTaxationDtoList;
+    }
+
 
 }