【电子报聘】报聘经纪人所属体系规则优化6

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

@@ -323,9 +323,9 @@
             and b.approve_status = #{approveStatus}
             and b.approve_status = #{approveStatus}
         </if>
         </if>
         and m.md_drop_option_id
         and m.md_drop_option_id
-                in (select id
+                in (select md.id
                     from ag_md_drop_options md
                     from ag_md_drop_options md
-                    left join ag_md_drop_master ms on ms.id = m.drop_master_id
+                    left join ag_md_drop_master ms on ms.id = md.drop_master_id
                     where 1=1
                     where 1=1
                     and ms.scenario_code = 'practitioner_level'
                     and ms.scenario_code = 'practitioner_level'
                     and md.drop_option_code in ('S2','S3')
                     and md.drop_option_code in ('S2','S3')

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

@@ -198,7 +198,7 @@
                     o.ydBranchId,
                     o.ydBranchId,
 
 
                     o.cover_term_type coverageTerm,
                     o.cover_term_type coverageTerm,
-                    CONCAT(o.payment_term, (case o.payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm
+                    CONCAT(o.payment_term, (case o.payment_term_unit when 'Y' then '年' when 'M' then '月' else '年' END)) payTerm
                     from ag_po_order_commission oc
                     from ag_po_order_commission oc
                     left join
                     left join
                         (SELECT id,  order_price, product_id,
                         (SELECT id,  order_price, product_id,
@@ -206,7 +206,7 @@
                                 payment_term, payment_term_unit,broker_customer_id,
                                 payment_term, payment_term_unit,broker_customer_id,
                                 cover_term_type
                                 cover_term_type
                         from ag_po_order t
                         from ag_po_order t
-                        where t.status in (3,4) and t.policy_no is not null
+                        where t.status=3 and t.payment_status=3 and t.policy_no is not null
                         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 ON o.id = oc.order_id
                         ) o ON o.id = oc.order_id
                     left join ag_product_life_commission_base b on oc.commission_base_id = b.id
                     left join ag_product_life_commission_base b on oc.commission_base_id = b.id