新单跟进v2

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java

@@ -32,6 +32,7 @@ import com.yd.csf.service.service.*;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowRecordVO;
 import com.yd.csf.service.vo.PolicyFollowRecordVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
+import com.yd.csf.service.vo.PolicyNumberResponseVO;
 import com.yd.feign.config.FeignTokenInterceptor;
 import com.yd.feign.config.FeignTokenInterceptor;
 import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
 import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
 import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
 import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
@@ -728,8 +729,7 @@ public class ApiPolicyFollowController {
      */
      */
     @PostMapping("/policyNos")
     @PostMapping("/policyNos")
     @Operation(summary = "查询保单号列表")
     @Operation(summary = "查询保单号列表")
-    public Result<List<String>> queryPolicyNumbers(@RequestBody PolicyNosQueryRequest policyNosQueryRequest) {
-        List<String> policyNumbers = policyFollowService.queryPolicyNumbers(policyNosQueryRequest.getPolicyNo());
-        return Result.success(policyNumbers);
+    public Result<List<PolicyNumberResponseVO>> queryPolicyNumbers(@RequestBody PolicyNosQueryRequest policyNosQueryRequest) {
+        return Result.success(policyFollowService.queryPolicyNumbers(policyNosQueryRequest.getPolicyNo()));
     }
     }
 }
 }
\ No newline at end of file

yd-csf-service/src/main/java/com/yd/csf/service/service/PolicyFollowService.java

@@ -8,6 +8,7 @@ import com.yd.csf.service.enums.PolicyFollowStatusEnum;
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
+import com.yd.csf.service.vo.PolicyNumberResponseVO;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -81,5 +82,5 @@ public interface PolicyFollowService extends IService<PolicyFollow> {
      * @param policyNo 保单号
      * @param policyNo 保单号
      * @return 保单号列表
      * @return 保单号列表
      */
      */
-    List<String> queryPolicyNumbers(String policyNo);
+    List<PolicyNumberResponseVO> queryPolicyNumbers(String policyNo);
 }
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java

@@ -24,10 +24,10 @@ import com.yd.csf.service.model.*;
 import com.yd.csf.service.service.*;
 import com.yd.csf.service.service.*;
 import com.yd.csf.service.dao.PolicyFollowMapper;
 import com.yd.csf.service.dao.PolicyFollowMapper;
 import com.yd.csf.service.utils.AsyncQueryUtil;
 import com.yd.csf.service.utils.AsyncQueryUtil;
-import com.yd.csf.service.utils.GSONUtil;
 import com.yd.csf.service.vo.PolicyAdditionalVO;
 import com.yd.csf.service.vo.PolicyAdditionalVO;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
+import com.yd.csf.service.vo.PolicyNumberResponseVO;
 import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
 import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
 import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
 import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -814,18 +814,37 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
     }
     }
 
 
     @Override
     @Override
-    public List<String> queryPolicyNumbers(String policyNo) {
+    public List<PolicyNumberResponseVO> queryPolicyNumbers(String policyNo) {
         QueryWrapper<PolicyFollow> queryWrapper = new QueryWrapper<>();
         QueryWrapper<PolicyFollow> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("policy_no");
+        queryWrapper.select("policy_no", "insurance_company", "insurance_company_biz_id", "insured", "insured_biz_id");
         queryWrapper.like(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.like(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.isNotNull("policy_no");
         queryWrapper.isNotNull("policy_no");
-        return policyFollowService.list(queryWrapper)
-                .stream()
-                .map(PolicyFollow::getPolicyNo)
+        List<PolicyFollow> policyFollows = policyFollowService.list(queryWrapper);
+        return policyFollows.stream()
+                .map(this::convertToPolicyNumberResponseVO)
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
     }
     }
 
 
     /**
     /**
+     * 转换为保单号查询响应视图
+     *
+     * @param policyFollow 新单跟进实体
+     * @return 保单号查询响应视图
+     */
+    private PolicyNumberResponseVO convertToPolicyNumberResponseVO(PolicyFollow policyFollow) {
+        if (policyFollow == null) {
+            return null;
+        }
+        PolicyNumberResponseVO vo = new PolicyNumberResponseVO();
+        vo.setPolicyNo(policyFollow.getPolicyNo());
+        vo.setInsuranceCompany(policyFollow.getInsuranceCompany());
+        vo.setInsuranceCompanyBizId(policyFollow.getInsuranceCompanyBizId());
+        vo.setInsured(policyFollow.getInsured());
+        vo.setInsuredBizId(policyFollow.getInsuredBizId());
+        return vo;
+    }
+
+    /**
      * 根据保单生成预计入账记录
      * 根据保单生成预计入账记录
      *
      *
      * @param policyFollow 保单跟进信息
      * @param policyFollow 保单跟进信息