【线上来佣比对】

查询列表增加保险公司的“分公司”2

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

@@ -35,6 +35,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 (SELECT o.*,
         from (SELECT o.*,
                     IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
                     IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
+                    orderCommission.insurer_branch_id insurerBranchId,
                     policyNo, commission_no, amount, commission_time, rate, commission_check_id, commissionId,
                     policyNo, commission_no, amount, commission_time, rate, commission_check_id, commissionId,
                     commission_year commissionYear,
                     commission_year commissionYear,
                     commission_status commissionCheckStatus,
                     commission_status commissionCheckStatus,
@@ -56,7 +57,7 @@
                 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, insurer_id,
                         t.commission_type,  t.commission_item, insurer_id,
-                        commission_period, rate, order_id, commission_category
+                        commission_period, rate, order_id, commission_category,t.insurer_branch_id
                         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
@@ -74,7 +75,7 @@
         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
         left join ag_product p on o.product_id = p.id
         left join ag_product p on o.product_id = p.id
-        left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id
+        left join ag_acl_insurer_branch b on o.insurerBranchId = b.id
         left join (select plcl.config_level, plcl.product_id, plc.name cName2, pc.name pName2
         left join (select plcl.config_level, plcl.product_id, plc.name cName2, pc.name pName2
                         from ag_plan_category_list plcl
                         from ag_plan_category_list plcl
                         left join ag_plan_category plc on plcl.plan_category_id = plc.id
                         left join ag_plan_category plc on plcl.plan_category_id = plc.id
@@ -111,7 +112,7 @@
             and o.insurerId = #{insurerId}
             and o.insurerId = #{insurerId}
         </if>
         </if>
         <if test="insurerBranchId != null">
         <if test="insurerBranchId != null">
-            and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
+            and o.insurerBranchId = #{insurerBranchId,jdbcType=BIGINT}
         </if>
         </if>
         <if test="practitionerTypeId != null">
         <if test="practitionerTypeId != null">
             and f.practitioner_type_id = #{practitionerTypeId}
             and f.practitioner_type_id = #{practitionerTypeId}
@@ -185,6 +186,7 @@
 
 
              (SELECT o.*,
              (SELECT o.*,
                     IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
                     IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
+                    orderCommission.insurer_branch_id insurerBranchId,
                     policyNo, commission_no, amount, commission_time, rate, commission_check_id,
                     policyNo, commission_no, amount, commission_time, rate, commission_check_id,
                     commission_year commissionYear,
                     commission_year commissionYear,
                     commission_status commissionCheckStatus,
                     commission_status commissionCheckStatus,
@@ -206,7 +208,7 @@
                 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, insurer_id,
                         t.commission_type,t.commission_item, insurer_id,
-                        commission_period, order_id, commission_category
+                        commission_period, order_id, commission_category,insurer_branch_id
                         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
@@ -239,7 +241,7 @@
             and o.insurerId = #{insurerId}
             and o.insurerId = #{insurerId}
         </if>
         </if>
         <if test="insurerBranchId != null">
         <if test="insurerBranchId != null">
-            and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
+            and o.insurerBranchId = #{insurerBranchId,jdbcType=BIGINT}
         </if>
         </if>
         <if test="practitionerTypeId != null">
         <if test="practitionerTypeId != null">
             and f.practitioner_type_id = #{practitionerTypeId}
             and f.practitioner_type_id = #{practitionerTypeId}