202201:薪资单:calculation_amount 匹配佣奖率的金额3

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

@@ -393,16 +393,16 @@
 
 
 
 
         from ag_acl_customer_fortune f
         from ag_acl_customer_fortune f
-                 left join ag_po_order o on o.id = f.order_id
-                 left join ag_product_plan pp on pp.id = o.plan_id
-                 left join ag_product p on p.id = o.product_id
-                 left join ag_acl_insurer i on o.insurer_id = i.id
-                 left join ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
-                 left join ag_acl_practitioner pra  on pra.customer_id = f.customer_id and f.sale_practitioner_id=pra.id
-                 left join ag_acl_life_insurance_practitioner lifepra on f.sale_practitioner_id=lifepra.practitioner_id and lifepra.order_id=o.id
-                 inner join ag_acl_practitioner_setting setting on f.practitioner_id = setting.practitioner_id
-                 left join ag_md_drop_options op
-                 left join ag_md_drop_master mas on mas.id = op.drop_master_id on op.drop_option_code = f.commission_payout_status
+            left join ag_po_order o on o.id = f.order_id
+            left join ag_product_plan pp on pp.id = o.plan_id
+            left join ag_product p on p.id = o.product_id
+            left join ag_acl_insurer i on o.insurer_id = i.id
+            left join ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
+            left join ag_acl_practitioner pra  on pra.customer_id = f.customer_id
+            left join ag_acl_life_insurance_practitioner lifepra on pra.id=lifepra.practitioner_id and lifepra.order_id=o.id
+            inner join ag_acl_practitioner_setting setting on pra.id = setting.practitioner_id
+            left join ag_md_drop_options op
+            left join ag_md_drop_master mas on mas.id = op.drop_master_id on op.drop_option_code = f.commission_payout_status
 
 
         where (o.status = 3 or o.status = 4 or o.status is null)
         where (o.status = 3 or o.status = 4 or o.status is null)
           AND mas.drop_code like 'Commission_Payout_Status'
           AND mas.drop_code like 'Commission_Payout_Status'
@@ -412,7 +412,7 @@
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
         </if>
         </if>
         <if test="item.practitionerId != null">
         <if test="item.practitionerId != null">
-            and f.practitioner_id = #{item.practitionerId,jdbcType=BIGINT}
+            and pra.id = #{item.practitionerId,jdbcType=BIGINT}
         </if>
         </if>
 
 
     </select>
     </select>