前端对接问题修复7

yd-csf-api/src/main/java/com/yd/csf/api/dto/PolicyExcelDTO.java

@@ -44,7 +44,7 @@ public class PolicyExcelDTO {
     private String productCate;
     private String productCate;
 
 
     @ExcelProperty("保险公司")
     @ExcelProperty("保险公司")
-    private String insurer;
+    private String insuranceCompany;
 
 
     @ExcelProperty("对账公司")
     @ExcelProperty("对账公司")
     private String reconciliationCompany;
     private String reconciliationCompany;

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

@@ -641,7 +641,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
             //首期保费（不含徽费，预缴保费）每期保费
             //首期保费（不含徽费，预缴保费）每期保费
             follow.setInitialPremium(apiProductPlanMainInfoDto.getEachIssuePremium());
             follow.setInitialPremium(apiProductPlanMainInfoDto.getEachIssuePremium());
             //保险公司
             //保险公司
-            follow.setInsurer(apiProductPlanMainInfoDto.getCompanyName());
+            follow.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName());
             //是否预缴
             //是否预缴
             follow.setIsPrepaid(Integer.parseInt(apiProductPlanMainInfoDto.getIsPrepay()));
             follow.setIsPrepaid(Integer.parseInt(apiProductPlanMainInfoDto.getIsPrepay()));
             //供款年期
             //供款年期

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

@@ -23,8 +23,8 @@ public class FortuneAccountQueryRequest extends PageDto {
     @Schema(description = "所属团队业务ID列表")
     @Schema(description = "所属团队业务ID列表")
     private List<String> teamBizIdList;
     private List<String> teamBizIdList;
 
 
-    @Schema(description = "出账状态 字典值：csf_fortune_account_status")
-    private String status;
+    @Schema(description = "出账状态, 可多选 字典值：csf_fortune_account_status")
+    private List<String> statusList;
 
 
     @Schema(description = "出账日期开始", format = "date")
     @Schema(description = "出账日期开始", format = "date")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyFollow.java

@@ -156,12 +156,12 @@ public class PolicyFollow implements Serializable {
     /**
     /**
      * 保险公司
      * 保险公司
      */
      */
-    private String insurer;
+    private String insuranceCompany;
 
 
     /**
     /**
      * 保险公司业务id
      * 保险公司业务id
      */
      */
-    private String insurerBizId;
+    private String insuranceCompanyBizId;
 
 
     /**
     /**
      * 对账公司
      * 对账公司

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

@@ -64,6 +64,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
         if (fortuneAccountQueryRequest == null) {
         if (fortuneAccountQueryRequest == null) {
             return queryWrapper;
             return queryWrapper;
         }
         }
+        List<String> statusList = fortuneAccountQueryRequest.getStatusList();
         List<String> brokerBizIdList = fortuneAccountQueryRequest.getBrokerBizIdList();
         List<String> brokerBizIdList = fortuneAccountQueryRequest.getBrokerBizIdList();
         List<String> teamBizIdList = fortuneAccountQueryRequest.getTeamBizIdList();
         List<String> teamBizIdList = fortuneAccountQueryRequest.getTeamBizIdList();
         queryWrapper.in(CollectionUtils.isNotEmpty(brokerBizIdList), "broker_biz_id", brokerBizIdList);
         queryWrapper.in(CollectionUtils.isNotEmpty(brokerBizIdList), "broker_biz_id", brokerBizIdList);
@@ -71,7 +72,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
 
 
         queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getBroker()), "broker", fortuneAccountQueryRequest.getBroker());
         queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getBroker()), "broker", fortuneAccountQueryRequest.getBroker());
         queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getTeam()), "team", fortuneAccountQueryRequest.getTeam());
         queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getTeam()), "team", fortuneAccountQueryRequest.getTeam());
-        queryWrapper.eq(StringUtils.isNotBlank(fortuneAccountQueryRequest.getStatus()), "status", fortuneAccountQueryRequest.getStatus());
+        queryWrapper.in(CollectionUtils.isNotEmpty(statusList), "status", statusList);
         queryWrapper.ge(fortuneAccountQueryRequest.getAccountDateStart() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateStart());
         queryWrapper.ge(fortuneAccountQueryRequest.getAccountDateStart() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateStart());
         queryWrapper.le(fortuneAccountQueryRequest.getAccountDateEnd() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateEnd());
         queryWrapper.le(fortuneAccountQueryRequest.getAccountDateEnd() != null, "fortune_account_date", fortuneAccountQueryRequest.getAccountDateEnd());
 
 

yd-csf-service/src/main/resources/mappers/PolicyFollowMapper.xml

@@ -32,8 +32,8 @@
         <result property="productLaunchBizId" column="product_launch_biz_id" />
         <result property="productLaunchBizId" column="product_launch_biz_id" />
         <result property="productName" column="product_name" />
         <result property="productName" column="product_name" />
         <result property="productCate" column="product_cate" />
         <result property="productCate" column="product_cate" />
-        <result property="insurer" column="insurer" />
-        <result property="insurerBizId" column="insurer_biz_id" />
+        <result property="insuranceCompany" column="insurance_company" />
+        <result property="insuranceCompanyBizId" column="insurance_company_biz_id" />
         <result property="reconciliationCompany" column="reconciliation_company" />
         <result property="reconciliationCompany" column="reconciliation_company" />
         <result property="reconciliationCompanyBizId" column="reconciliation_company_biz_id" />
         <result property="reconciliationCompanyBizId" column="reconciliation_company_biz_id" />
         <result property="status" column="status" />
         <result property="status" column="status" />
@@ -65,8 +65,8 @@
         customer_biz_id,submit_date,customer_name,sign_date,signer_list,
         customer_biz_id,submit_date,customer_name,sign_date,signer_list,
         issue_date,effective_date,cooling_off_end_date,cooling_off_days,renewal_date,payment_term,payment_premium,
         issue_date,effective_date,cooling_off_end_date,cooling_off_days,renewal_date,payment_term,payment_premium,
         is_prepaid,prepaid_term,prepaid_amount,prepaid_amount_after_discount,policy_expiration_date,
         is_prepaid,prepaid_term,prepaid_amount,prepaid_amount_after_discount,policy_expiration_date,
-        payment_number,product_launch_biz_id,product_name,product_cate,insurer,
-        insurer_biz_id,reconciliation_company,reconciliation_company_biz_id,status,next_status_list,
+        payment_number,product_launch_biz_id,product_name,product_cate,insurance_company,
+        insurance_company_biz_id,reconciliation_company,reconciliation_company_biz_id,status,next_status_list,
         policy_holder,insured,currency,initial_premium,initial_premium_paid,initial_premium_due,latest_payment_date,policy_levy,mailing_method,
         policy_holder,insured,currency,initial_premium,initial_premium_paid,initial_premium_due,latest_payment_date,policy_levy,mailing_method,
         delivery_no,broker_sign_date,insurer_mailing_date,customer_sign_date,attachments,
         delivery_no,broker_sign_date,insurer_mailing_date,customer_sign_date,attachments,
         remark,is_deleted,creator_id,updater_id,create_time,
         remark,is_deleted,creator_id,updater_id,create_time,
@@ -78,7 +78,7 @@
             t.id,
             t.id,
             t.policy_biz_id,
             t.policy_biz_id,
             t.policy_no               as policyNumber,
             t.policy_no               as policyNumber,
-            t.insurer                 as insuranceCompany,
+            t.insurance_company       as insuranceCompany,
             t.product_name            as insurancePlan,
             t.product_name            as insurancePlan,
             t.payment_term            as paymentPeriod,
             t.payment_term            as paymentPeriod,
             t.initial_premium         as annualAmount,
             t.initial_premium         as annualAmount,