发佣检核6-来佣比对加commissionId

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

@@ -39,6 +39,7 @@ public class ComeCommissionVO {
     private String name;
     private String name;
     private String practitionerTypeId;
     private String practitionerTypeId;
 
 
+    private Long commissionId;
     private String commissionNo;
     private String commissionNo;
     private String amount;
     private String amount;
     private String commissionYear;
     private String commissionYear;

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

@@ -16,6 +16,7 @@
             o.commissionCheckStatus,
             o.commissionCheckStatus,
             o.order_date orderDate,
             o.order_date orderDate,
             o.commission_no commissionNo,
             o.commission_no commissionNo,
+            o.commissionId,
             o.amount ,
             o.amount ,
             date_format(o.commissionYear, '%Y-%m-%d') commissionYear,
             date_format(o.commissionYear, '%Y-%m-%d') commissionYear,
             o.commissionCheckStatus commissionStatus,
             o.commissionCheckStatus commissionStatus,
@@ -31,7 +32,7 @@
             (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
             (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
             (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 (SELECT o.*,
         from (SELECT o.*,
-                    policyNo, commission_no, amount, commission_time, rate, commission_check_id,
+                    policyNo, commission_no, amount, commission_time, rate, commission_check_id, commissionId,
                     commission_year commissionYear,
                     commission_year commissionYear,
                     commission_status commissionCheckStatus,
                     commission_status commissionCheckStatus,
                     amount commissionAmount,
                     amount commissionAmount,
@@ -50,7 +51,7 @@
                         and (t.plan_id not in (424,453,464) or t.plan_id is null)
                         and (t.plan_id not in (424,453,464) or t.plan_id is null)
                     ) o
                     ) o
                 LEFT JOIN
                 LEFT JOIN
-                    (SELECT 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,
                         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
@@ -276,6 +277,7 @@
 
 
         o.created_at orderDate,
         o.created_at orderDate,
         o.commission_no commissionNo,
         o.commission_no commissionNo,
+        o.commissionId,
 
 
         date_format(o.commission_year, '%Y-%m-%d') commissionYear,
         date_format(o.commission_year, '%Y-%m-%d') commissionYear,
 
 
@@ -292,7 +294,7 @@
         (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
         (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
         (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 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,
             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