新单跟进v2

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

@@ -85,7 +85,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         // 关联查询保单信息
         // 关联查询保单信息
         Set<String> policyNoSet = CommissionExpectedList.stream().map(CommissionExpected::getPolicyNo).collect(Collectors.toSet());
         Set<String> policyNoSet = CommissionExpectedList.stream().map(CommissionExpected::getPolicyNo).collect(Collectors.toSet());
         QueryWrapper<Policy> queryWrapper = new QueryWrapper<Policy>();
         QueryWrapper<Policy> queryWrapper = new QueryWrapper<Policy>();
-        queryWrapper.select("policy_no", "payment_premium", "product_name", "insurance_company", "reconciliation_company");
+        queryWrapper.select("policy_no", "payment_premium", "product_name", "insurance_company", "reconciliation_company", "currency");
         queryWrapper.in("policy_no", policyNoSet);
         queryWrapper.in("policy_no", policyNoSet);
         List<Policy> policyList = policyService.list(queryWrapper);
         List<Policy> policyList = policyService.list(queryWrapper);
         Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
         Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
@@ -100,6 +100,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                 commissionExpectedVO.setProductName(policy.getProductName());
                 commissionExpectedVO.setProductName(policy.getProductName());
                 commissionExpectedVO.setInsuranceCompany(policy.getInsuranceCompany());
                 commissionExpectedVO.setInsuranceCompany(policy.getInsuranceCompany());
                 commissionExpectedVO.setReconciliationCompany(policy.getReconciliationCompany());
                 commissionExpectedVO.setReconciliationCompany(policy.getReconciliationCompany());
+                commissionExpectedVO.setPolicyCurrency(policy.getCurrency());
             }
             }
             return commissionExpectedVO;
             return commissionExpectedVO;
         }).collect(Collectors.toList());
         }).collect(Collectors.toList());

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedVO.java

@@ -54,6 +54,12 @@ public class CommissionExpectedVO implements Serializable {
     private Object premium;
     private Object premium;
 
 
     /**
     /**
+     * 保单币种
+     */
+    @Schema(description = "保单币种")
+    private String policyCurrency;
+
+    /**
      * 产品计划名称
      * 产品计划名称
      */
      */
     @Schema(description = "产品计划名称")
     @Schema(description = "产品计划名称")