应收管理、应付管理8

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

@@ -17,9 +17,9 @@ public class CommissionExpectedQueryRequest extends PageDto {
     private String policyNo;
 
     /**
-     * 入账状态 0=待来佣 1=已来佣 2=部分来佣
+     * 入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选
      */
-    @Schema(description = "入账状态 0=待来佣 1=已来佣 2=部分来佣 可多选")
+    @Schema(description = "入账状态 0=待入账 1=完成入账 2=部分入账 3=已失效 可多选")
     private List<String> statusList;
 
     /**
@@ -37,9 +37,9 @@ public class CommissionExpectedQueryRequest extends PageDto {
     private Date commissionDateEnd;
 
     /**
-     * 预计来佣期数
+     * 入账期数
      */
-    @Schema(description = "预计来佣期数")
+    @Schema(description = "入账期数")
     private Integer commissionPeriod;
 
     /**
@@ -67,10 +67,10 @@ public class CommissionExpectedQueryRequest extends PageDto {
     private String productLaunchBizId;
 
     /**
-     * 应收款类型 1=关联保单应收单 2=非关联保单应收单
+     * 应收款类型 R=关联保单应收单 U=非关联保单应收单
      */
-    @Schema(description = "应收款类型 1=关联保单应收单 2=非关联保单应收单")
-    private Integer commissionBizType;
+    @Schema(description = "应收款类型 R=关联保单应收单 U=非关联保单应收单")
+    private String commissionBizType;
 
     /**
      * 转介人所属团队业务ID

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

@@ -101,7 +101,7 @@ public class CommissionExpected implements Serializable {
     private Date commissionDate;
 
     /**
-     * 来佣状态 0=待来佣 1=已来佣 2=部分来佣
+     * 来佣状态 0=待入账 1=完成入账 2=部分入账 3=已失效
      */
     private String status;
 

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

@@ -153,12 +153,14 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         List<String> statusList = commissionExpectedQueryRequest.getStatusList();
         Date commissionDateStart = commissionExpectedQueryRequest.getCommissionDateStart();
         Date commissionDateEnd = commissionExpectedQueryRequest.getCommissionDateEnd();
+        Integer commissionPeriod = commissionExpectedQueryRequest.getCommissionPeriod();
         String productLaunchBizId = commissionExpectedQueryRequest.getProductLaunchBizId();
-        Integer commissionBizType = commissionExpectedQueryRequest.getCommissionBizType();
+        String commissionBizType = commissionExpectedQueryRequest.getCommissionBizType();
         String teamBizId = commissionExpectedQueryRequest.getTeamBizId();
         // 精确查询
         queryWrapper.eq(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(insurerBizId), "insurer_biz_id", insurerBizId);
+        queryWrapper.eq(ObjectUtils.isNotEmpty(commissionPeriod), "commission_period", commissionPeriod);
         queryWrapper.eq(ObjectUtils.isNotEmpty(productLaunchBizId), "product_launch_biz_id", productLaunchBizId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(commissionBizType), "commission_biz_type", commissionBizType);
         queryWrapper.in(ObjectUtils.isNotEmpty(statusList), "status", statusList);

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

@@ -35,10 +35,10 @@ public class CommissionExpectedVO implements Serializable {
     private String receivableNo;
 
     /**
-     * 应收款类型 1=关联保单应收单 2=非关联保单应收单
+     * 应收款类型 R=关联保单应收单 U=非关联保单应收单
      */
-    @Schema(description = "应收款类型 1=关联保单应收单 2=非关联保单应收单")
-    private Integer commissionBizType;
+    @Schema(description = "应收款类型 R=关联保单应收单 U=非关联保单应收单")
+    private String commissionBizType;
 
     /**
      * 保单号