新单跟进15

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

+package com.yd.csf.service.dto;
+
+import com.yd.csf.feign.dto.appointment.ApiProductPlanAdditionalInfoDto;
+import com.yd.csf.service.model.Policy;
+import com.yd.csf.service.model.PolicyAdditional;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PolicyDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产品计划(保单信息)
+     */
+    @Schema(description = "产品计划(保单信息)")
+    private Policy apiProductPlanMainInfoDto;
+
+    /**
+     * 保单附加险列表
+     */
+    @Schema(description = "保单附加险列表")
+    private List<ApiProductPlanAdditionalInfoDto> apiProductPlanAdditionalInfoDtoList;
+}

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

@@ -11,7 +11,6 @@ import org.springframework.beans.BeanUtils;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
-import java.util.Objects;
 
 
 /**
 /**
  * 新单跟进聚合查询结果DTO
  * 新单跟进聚合查询结果DTO
@@ -34,7 +33,7 @@ public class PolicyFollowAggregateDto implements Serializable {
      * 保单产品计划（保单）
      * 保单产品计划（保单）
      */
      */
     @Schema(description = "保单产品计划（保单）")
     @Schema(description = "保单产品计划（保单）")
-    private ApiProductPlanInfoDto apiProductPlanInfoDto;
+    private PolicyDto apiProductPlanInfoDto;
 
 
     /**
     /**
      * 保单投保人
      * 保单投保人
@@ -82,11 +81,9 @@ public class PolicyFollowAggregateDto implements Serializable {
 
 
         // 设置保单产品计划（保单）
         // 设置保单产品计划（保单）
         if (ObjectUtils.isNotEmpty(policy)) {
         if (ObjectUtils.isNotEmpty(policy)) {
-            ApiProductPlanInfoDto apiProductPlanInfoDto = new ApiProductPlanInfoDto();
+            PolicyDto apiProductPlanInfoDto = new PolicyDto();
             // 产品计划主信息
             // 产品计划主信息
-            ApiProductPlanMainInfoDto apiProductPlanMainInfoDto = new ApiProductPlanMainInfoDto();
-            BeanUtils.copyProperties(policy, apiProductPlanMainInfoDto);
-            apiProductPlanInfoDto.setApiProductPlanMainInfoDto(apiProductPlanMainInfoDto);
+            apiProductPlanInfoDto.setApiProductPlanMainInfoDto(policy);
 
 
             // 附加险列表
             // 附加险列表
             List<ApiProductPlanAdditionalInfoDto> apiProductPlanAdditionalInfoDtoList = new ArrayList<>();
             List<ApiProductPlanAdditionalInfoDto> apiProductPlanAdditionalInfoDtoList = new ArrayList<>();
@@ -98,6 +95,7 @@ public class PolicyFollowAggregateDto implements Serializable {
                 });
                 });
             }
             }
             apiProductPlanInfoDto.setApiProductPlanAdditionalInfoDtoList(apiProductPlanAdditionalInfoDtoList);
             apiProductPlanInfoDto.setApiProductPlanAdditionalInfoDtoList(apiProductPlanAdditionalInfoDtoList);
+            dto.setApiProductPlanInfoDto(apiProductPlanInfoDto);
         }
         }
         // 设置保单投保人
         // 设置保单投保人
         if (ObjectUtils.isNotEmpty(policyPolicyholder)) {
         if (ObjectUtils.isNotEmpty(policyPolicyholder)) {