commision_id关联查询调整(解决当期来佣有多项,并且每项的检核日前不同时会导致发佣查询多条)

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

@@ -98,8 +98,11 @@
         LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id
         LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id
         LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level
         LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level
         LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id
         LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id
-        LEFT JOIN  (SELECT poc.order_id,poc.commission_period,c.* FROM ag_po_order_commission poc,ag_po_order_commission_check c
+        LEFT JOIN  (SELECT distinct poc.order_id,poc.commission_period,c.* FROM ag_po_order_commission poc,ag_po_order_commission_check c
         WHERE poc.commission_check_id=c.id AND poc.commission_status='2' AND poc.commission_type='1'
         WHERE poc.commission_check_id=c.id AND poc.commission_status='2' AND poc.commission_type='1'
+	        <if test="item.commissionPayoutYearmonth == null">
+	           GROUP BY poc.order_id,poc.commission_period
+	        </if>
         ) c ON  c.order_id=t.order_id AND c.commission_period=t.commission_period
         ) c ON  c.order_id=t.order_id AND c.commission_period=t.commission_period
         WHERE t.settlement_type = '1'
         WHERE t.settlement_type = '1'
         AND mas.drop_code = 'Fortune_Payout_Status'
         AND mas.drop_code = 'Fortune_Payout_Status'