新单跟进22

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyDto.java

@@ -23,5 +23,5 @@ public class PolicyDto implements Serializable {
      * 保单附加险列表
      * 保单附加险列表
      */
      */
     @Schema(description = "保单附加险列表")
     @Schema(description = "保单附加险列表")
-    private List<ApiProductPlanAdditionalInfoDto> apiProductPlanAdditionalInfoDtoList;
+    private List<PolicyAdditional> apiProductPlanAdditionalInfoDtoList;
 }
 }

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowAggregateDto.java

@@ -45,25 +45,25 @@ public class PolicyFollowAggregateDto implements Serializable {
      * 保单投保人
      * 保单投保人
      */
      */
     @Schema(description = "保单投保人")
     @Schema(description = "保单投保人")
-    private ApiPolicyholderInfoDto apiPolicyholderInfoDto;
+    private PolicyPolicyholder apiPolicyholderInfoDto;
 
 
     /**
     /**
      * 保单受保人
      * 保单受保人
      */
      */
     @Schema(description = "保单受保人")
     @Schema(description = "保单受保人")
-    private ApiInsurantInfoDto apiInsurantInfoDto;
+    private PolicyInsurant apiInsurantInfoDto;
 
 
     /**
     /**
      * 保单受益人
      * 保单受益人
      */
      */
     @Schema(description = "保单受益人")
     @Schema(description = "保单受益人")
-    private List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList;
+    private List<PolicyBeneficiary> apiBeneficiaryInfoDtoList;
 
 
     /**
     /**
      * 保单第二持有人
      * 保单第二持有人
      */
      */
     @Schema(description = "保单第二持有人")
     @Schema(description = "保单第二持有人")
-    private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
+    private PolicySecondHolder apiSecondHolderInfoDto;
 
 
     // 错误信息（如果有查询失败的情况）
     // 错误信息（如果有查询失败的情况）
     private String errorMessage;
     private String errorMessage;
@@ -89,44 +89,24 @@ public class PolicyFollowAggregateDto implements Serializable {
             apiProductPlanInfoDto.setApiProductPlanMainInfoDto(policy);
             apiProductPlanInfoDto.setApiProductPlanMainInfoDto(policy);
 
 
             // 附加险列表
             // 附加险列表
-            List<ApiProductPlanAdditionalInfoDto> apiProductPlanAdditionalInfoDtoList = new ArrayList<>();
-            if (CollectionUtils.isNotEmpty(policyAdditionals)) {
-                policyAdditionals.forEach(policyAdditional -> {
-                    ApiProductPlanAdditionalInfoDto apiProductPlanAdditionalInfoDto = new ApiProductPlanAdditionalInfoDto();
-                    BeanUtils.copyProperties(policyAdditional, apiProductPlanAdditionalInfoDto);
-                    apiProductPlanAdditionalInfoDtoList.add(apiProductPlanAdditionalInfoDto);
-                });
-            }
-            apiProductPlanInfoDto.setApiProductPlanAdditionalInfoDtoList(apiProductPlanAdditionalInfoDtoList);
+            apiProductPlanInfoDto.setApiProductPlanAdditionalInfoDtoList(policyAdditionals);
             dto.setApiProductPlanInfoDto(apiProductPlanInfoDto);
             dto.setApiProductPlanInfoDto(apiProductPlanInfoDto);
         }
         }
         // 设置保单投保人
         // 设置保单投保人
         if (ObjectUtils.isNotEmpty(policyPolicyholder)) {
         if (ObjectUtils.isNotEmpty(policyPolicyholder)) {
-            ApiPolicyholderInfoDto apiPolicyholderInfoDto = new ApiPolicyholderInfoDto();
-            BeanUtils.copyProperties(policyPolicyholder, apiPolicyholderInfoDto);
-            dto.setApiPolicyholderInfoDto(apiPolicyholderInfoDto);
+            dto.setApiPolicyholderInfoDto(policyPolicyholder);
         }
         }
         // 设置保单受保人
         // 设置保单受保人
         if (ObjectUtils.isNotEmpty(policyInsurant)) {
         if (ObjectUtils.isNotEmpty(policyInsurant)) {
-            ApiInsurantInfoDto apiInsurantInfoDto = new ApiInsurantInfoDto();
-            BeanUtils.copyProperties(policyInsurant, apiInsurantInfoDto);
-            dto.setApiInsurantInfoDto(apiInsurantInfoDto);
+            dto.setApiInsurantInfoDto(policyInsurant);
         }
         }
         // 设置保单受益人
         // 设置保单受益人
         if (CollectionUtils.isNotEmpty(beneficiaryList)) {
         if (CollectionUtils.isNotEmpty(beneficiaryList)) {
-            List<ApiBeneficiaryInfoDto> apiBeneficiaryInfoDtoList = new ArrayList<>();
-            beneficiaryList.forEach(beneficiary -> {
-                ApiBeneficiaryInfoDto apiBeneficiaryInfoDto = new ApiBeneficiaryInfoDto();
-                BeanUtils.copyProperties(beneficiary, apiBeneficiaryInfoDto);
-                apiBeneficiaryInfoDtoList.add(apiBeneficiaryInfoDto);
-            });
-            dto.setApiBeneficiaryInfoDtoList(apiBeneficiaryInfoDtoList);
+            dto.setApiBeneficiaryInfoDtoList(beneficiaryList);
         }
         }
         // 设置保单第二持有人
         // 设置保单第二持有人
         if (ObjectUtils.isNotEmpty(policySecondHolder)) {
         if (ObjectUtils.isNotEmpty(policySecondHolder)) {
-            ApiSecondHolderInfoDto apiSecondHolderInfoDto = new ApiSecondHolderInfoDto();
-            BeanUtils.copyProperties(policySecondHolder, apiSecondHolderInfoDto);
-            dto.setApiSecondHolderInfoDto(apiSecondHolderInfoDto);
+            dto.setApiSecondHolderInfoDto(policySecondHolder);
         }
         }
 
 
         return dto;
         return dto;