发佣检核22-来佣比对手工记录根据公司查询

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

@@ -32,6 +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.*,
+                    IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
                     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,
@@ -101,7 +102,7 @@
                     ) e on e.order_id = o.id
                     ) e on e.order_id = o.id
         where 1=1
         where 1=1
         <if test="insurerId != null">
         <if test="insurerId != null">
-            and o.insurer_id = #{insurerId}
+            and o.insurerId = #{insurerId}
         </if>
         </if>
         <if test="insurerBranchId != null">
         <if test="insurerBranchId != null">
             and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
             and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
@@ -176,6 +177,7 @@
     <sql id="queryLifecommissionList">
     <sql id="queryLifecommissionList">
 
 
              (SELECT o.*,
              (SELECT o.*,
+                    IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
                     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,
@@ -224,7 +226,7 @@
             ) f on f.order_id = o.id
             ) f on f.order_id = o.id
         where 1=1
         where 1=1
         <if test="insurerId != null">
         <if test="insurerId != null">
-            and o.insurer_id = #{insurerId}
+            and o.insurerId = #{insurerId}
         </if>
         </if>
         <if test="insurerBranchId != null">
         <if test="insurerBranchId != null">
             and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
             and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}