【AGMS】-【线上来佣比对】，增加筛选条件，

1.来佣项目类型： 首年佣金， 续年佣金

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

@@ -11,5 +11,6 @@ public class QueryComeCommissionListRequestVO {
     private Long insurerId;
     private Long insurerId;
     private Long practitionerTypeId;
     private Long practitionerTypeId;
     private String commissionCheckStatus;
     private String commissionCheckStatus;
+    private String commissionCategory;
     private PageInfo<ComeCommissionVO> page;
     private PageInfo<ComeCommissionVO> page;
 }
 }

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

@@ -33,6 +33,7 @@
                     commission_status commissionCheckStatus,
                     commission_status commissionCheckStatus,
                     amount commissionAmount,
                     amount commissionAmount,
                     rate commissionRate,
                     rate commissionRate,
+                    commission_category,
                     commission_period
                     commission_period
                 from
                 from
                     (SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status,
                     (SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status,
@@ -45,7 +46,7 @@
                     ) o
                     ) o
                 LEFT JOIN
                 LEFT JOIN
                     (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,
                     (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,
-                        commission_period, rate, order_id
+                        commission_period, rate, order_id, commission_category
                         from ag_po_order_commission t
                         from ag_po_order_commission t
                     ) orderCommission
                     ) orderCommission
                 ON o.id = orderCommission.order_id
                 ON o.id = orderCommission.order_id
@@ -101,6 +102,9 @@
         <if test="commissionCheckStatus != null">
         <if test="commissionCheckStatus != null">
             and o.commissionCheckStatus = #{commissionCheckStatus}
             and o.commissionCheckStatus = #{commissionCheckStatus}
         </if>
         </if>
+        <if test="commissionCategory != null">
+            and o.commission_category = #{commissionCategory}
+        </if>
         <choose>
         <choose>
             <when test="historyDate != null ">
             <when test="historyDate != null ">
                 and c.check_yearmonth = #{historyDate}
                 and c.check_yearmonth = #{historyDate}
@@ -164,6 +168,7 @@
                     commission_status commissionCheckStatus,
                     commission_status commissionCheckStatus,
                     amount commissionAmount,
                     amount commissionAmount,
                     rate commissionRate,
                     rate commissionRate,
+                    commission_category,
                     commission_period
                     commission_period
                 from
                 from
                 (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id,
                 (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id,
@@ -176,7 +181,7 @@
                 ) o
                 ) o
                 LEFT JOIN
                 LEFT 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,
-                        commission_period, order_id
+                        commission_period, order_id, commission_category
                         from ag_po_order_commission t
                         from ag_po_order_commission t
                     ) orderCommission
                     ) orderCommission
                 ON o.id = orderCommission.order_id
                 ON o.id = orderCommission.order_id
@@ -208,6 +213,9 @@
         <if test="commissionCheckStatus != null">
         <if test="commissionCheckStatus != null">
             and o.commissionCheckStatus = #{commissionCheckStatus}
             and o.commissionCheckStatus = #{commissionCheckStatus}
         </if>
         </if>
+        <if test="commissionCategory != null">
+            and o.commission_category = #{commissionCategory}
+        </if>
         <choose>
         <choose>
             <when test="historyDate != null ">
             <when test="historyDate != null ">
                 and c.check_yearmonth = #{historyDate}
                 and c.check_yearmonth = #{historyDate}