来佣比对查询, 已审核的数据2

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

@@ -50,7 +50,7 @@
                         o.cover_term_type coverageTerm,
                         CONCAT(o.payment_term, (case o.payment_term_unit when 'Y' then '年' when 'M' then '月' else '年' END)) payTerm
                         from ag_po_order_commission oc
-                        left join
+                        inner join
                         (SELECT id,  order_price, product_id,
                                 plan_id, insurer_id, order_date,  config_level, cover_term, insurer_branch_id ydBranchId,
                                 payment_term, payment_term_unit,broker_customer_id,
@@ -60,6 +60,8 @@
                                 and (t.plan_id not in (424,453,464) or t.plan_id is null)
                         ) o ON o.id = oc.order_id
                         left join ag_product_life_commission_base b on oc.commission_base_id = b.id
+                        union all
+                        <include refid="manualCommission"/>
                 ) t
         left join ag_acl_insurer_branch ib on t.insurer_branch_id = ib.id
         left join ag_acl_insurer i ON t.insurer_id = i.id
@@ -120,6 +122,40 @@
         order by t.orderDate desc
     </select>
 
+    <sql id="manualCommission">
+        SELECT '' as orderId,
+               b.plan_id plan_id,
+               b.product_id product_id,
+               b.config_level config_level,
+               oc.insurer_id insurer_id,
+               oc.insurer_branch_id,
+               oc.commission_check_id,
+
+               oc.policy_no policyNo,
+               '' as  orderPrice,
+               oc.rate commissionRate,
+               oc.amount commissionAmount,
+               oc.commission_status commissionCheckStatus,
+               '' as  orderDate,
+               oc.commission_no commissionNo,
+               oc.id commissionId,
+
+               date_format(oc.commission_year, '%Y-%m-%d') commissionYear,
+               oc.commission_status commissionStatus,
+               oc.commission_time commissionTime,
+               oc.commission_period commissionPeriod,
+               oc.commission_type commissionType,
+               oc.commission_item commissionItem,
+               oc.practitioner_id practitionerId,
+               '' as ydBranchId,
+               '' as broker_customer_id,
+
+               '' as coverageTerm,
+               '' as payTerm
+        from ag_po_order_commission oc
+        left join ag_product_life_commission_base b on oc.commission_base_id = b.id
+        where oc.order_id is null
+    </sql>
 
     <insert id="insertOrderCommissionCheck" parameterType="com.yd.dal.entity.commission.OrderCommissonCheck"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
@@ -200,7 +236,7 @@
                     o.cover_term_type coverageTerm,
                     CONCAT(o.payment_term, (case o.payment_term_unit when 'Y' then '年' when 'M' then '月' else '年' END)) payTerm
                     from ag_po_order_commission oc
-                    left join
+                    inner join
                         (SELECT id,  order_price, product_id,
                                 plan_id, insurer_id, order_date,  config_level, cover_term, insurer_branch_id ydBranchId,
                                 payment_term, payment_term_unit,broker_customer_id,
@@ -210,6 +246,8 @@
                         and (t.plan_id not in (424,453,464) or t.plan_id is null)
                         ) o ON o.id = oc.order_id
                     left join ag_product_life_commission_base b on oc.commission_base_id = b.id
+                    union all
+                    <include refid="manualCommission"/>
             ) t
         left join ag_acl_insurer_branch ib on t.insurer_branch_id = ib.id
         left join ag_acl_insurer i ON t.insurer_id = i.id