发佣检核23-来佣比对和发佣检核根据保单号查询

yd-api/src/main/java/com/yd/api/agms/vo/fortune/CommissionPayoutStatusQueryRequestVO.java

@@ -8,6 +8,10 @@ import com.yd.dal.entity.agms.fortune.CommissionPayoutStatus;
  */
  */
 public class CommissionPayoutStatusQueryRequestVO {
 public class CommissionPayoutStatusQueryRequestVO {
     /**
     /**
+     * 保单号
+     */
+    private String policyNo;
+    /**
      * 保险公司
      * 保险公司
      */
      */
     private Long insurerId;
     private Long insurerId;
@@ -50,7 +54,6 @@ public class CommissionPayoutStatusQueryRequestVO {
      * 预计发佣年月
      * 预计发佣年月
      */
      */
     private String predictMonthPeriod;
     private String predictMonthPeriod;
-
     /**
     /**
      * 系统标志，区分公司营业部和体系，1，分公司，2营业部，3，S1分部,4,S2体系,5,S3纵队
      * 系统标志，区分公司营业部和体系，1，分公司，2营业部，3，S1分部,4,S2体系,5,S3纵队
      */
      */
@@ -187,5 +190,13 @@ public class CommissionPayoutStatusQueryRequestVO {
     public void setPredictMonthPeriod(String predictMonthPeriod) {
     public void setPredictMonthPeriod(String predictMonthPeriod) {
         this.predictMonthPeriod = predictMonthPeriod;
         this.predictMonthPeriod = predictMonthPeriod;
     }
     }
+
+    public String getPolicyNo() {
+        return policyNo;
+    }
+
+    public void setPolicyNo(String policyNo) {
+        this.policyNo = policyNo;
+    }
 }
 }
 
 

yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QueryComeCommissionListRequestVO.java

@@ -8,6 +8,7 @@ public class QueryComeCommissionListRequestVO {
     private String startDate;
     private String startDate;
     private String endDate;
     private String endDate;
     private String historyDate;
     private String historyDate;
+    private String policyNo;
     private Long insurerId;
     private Long insurerId;
     private Long insurerBranchId;
     private Long insurerBranchId;
     private Long practitionerTypeId;
     private Long practitionerTypeId;

yd-api/src/main/java/com/yd/dal/entity/agms/fortune/CommissionPayoutStatusQueryInfo.java

@@ -9,6 +9,10 @@ import java.util.List;
  */
  */
 public class CommissionPayoutStatusQueryInfo {
 public class CommissionPayoutStatusQueryInfo {
     /**
     /**
+     * 保单号
+     */
+    private String policyNo;
+    /**
      * 保险公司
      * 保险公司
      */
      */
     private Long insurerId;
     private Long insurerId;
@@ -160,4 +164,12 @@ public class CommissionPayoutStatusQueryInfo {
     public void setPredictMonthPeriod(String predictMonthPeriod) {
     public void setPredictMonthPeriod(String predictMonthPeriod) {
         this.predictMonthPeriod = predictMonthPeriod;
         this.predictMonthPeriod = predictMonthPeriod;
     }
     }
+
+    public String getPolicyNo() {
+        return policyNo;
+    }
+
+    public void setPolicyNo(String policyNo) {
+        this.policyNo = policyNo;
+    }
 }
 }

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -103,6 +103,9 @@
         AND mas1.scenario_code = 'practitioner_level'
         AND mas1.scenario_code = 'practitioner_level'
         AND oc.commission_status = '2'
         AND oc.commission_status = '2'
         and setting.practitioner_type_id = 28
         and setting.practitioner_type_id = 28
+        <if test="item.policyNo != null">
+            and o.policy_no = #{item.policyNo,jdbcType=VARCHAR}
+        </if>
         <if test="item.insurerId != null">
         <if test="item.insurerId != null">
             AND i.id = #{item.insurerId,jdbcType=BIGINT}
             AND i.id = #{item.insurerId,jdbcType=BIGINT}
         </if>
         </if>

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -53,7 +53,7 @@
                     ) o
                     ) o
                 RIGHT JOIN
                 RIGHT JOIN
                     (SELECT id commissionId, policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,
                     (SELECT id commissionId, policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,
-                        t.commission_type,  t.commission_item,
+                        t.commission_type,  t.commission_item, insurer_id,
                         commission_period, rate, order_id, commission_category
                         commission_period, rate, order_id, commission_category
                         from ag_po_order_commission t
                         from ag_po_order_commission t
                     ) orderCommission
                     ) orderCommission
@@ -65,6 +65,9 @@
                     <if test="endDate != null ">
                     <if test="endDate != null ">
                         and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
                         and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
                     </if>
                     </if>
+                    <if test="policyNo != null">
+                        and policyNo = #{policyNo}
+                    </if>
              ) o
              ) o
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
         left join ag_product_plan a on o.plan_id = a.id
         left join ag_product_plan a on o.plan_id = a.id
@@ -198,7 +201,7 @@
                 ) o
                 ) o
                 RIGHT JOIN
                 RIGHT JOIN
                 (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate, commission_check_id,
                 (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate, commission_check_id,
-                        t.commission_type,t.commission_item,
+                        t.commission_type,t.commission_item, insurer_id,
                         commission_period, order_id, commission_category
                         commission_period, order_id, commission_category
                         from ag_po_order_commission t
                         from ag_po_order_commission t
                     ) orderCommission
                     ) orderCommission
@@ -210,6 +213,9 @@
                     <if test="endDate != null ">
                     <if test="endDate != null ">
                         and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
                         and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
                     </if>
                     </if>
+                    <if test="policyNo != null">
+                        and policyNo = #{policyNo}
+                    </if>
             ) o
             ) o
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
         left join ag_acl_insurer i on o.insurer_id = i.id
         left join ag_acl_insurer i on o.insurer_id = i.id
@@ -294,7 +300,7 @@
         (case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName
         (case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName
         from
         from
         (SELECT t.id commissionId, policy_no, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,premium,t.insurer_id,
         (SELECT t.id commissionId, policy_no, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,premium,t.insurer_id,
-            t.commission_type,t.commission_item,
+            t.commission_type,t.commission_item, t.insurer_id,
             commission_period, rate, order_id, commission_category, t.created_at, b.product_id, b.plan_id, b.config_level
             commission_period, rate, order_id, commission_category, t.created_at, b.product_id, b.plan_id, b.config_level
             from ag_po_order_commission t left join ag_product_life_commission_base b on t.commission_base_id = b.id
             from ag_po_order_commission t left join ag_product_life_commission_base b on t.commission_base_id = b.id
             WHERE 1=1
             WHERE 1=1
@@ -304,6 +310,9 @@
             <if test="endDate != null ">
             <if test="endDate != null ">
                 and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
                 and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
             </if>
             </if>
+            <if test="policyNo != null">
+                and policy_no = #{policyNo}
+            </if>
         ) o
         ) o
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
         left join ag_product_plan a on o.plan_id = a.id
         left join ag_product_plan a on o.plan_id = a.id