4and5-保单发佣明细报表6

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java

@@ -959,7 +959,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
         for (CommissionPayoutStatus item : commissionPayoutStatusList) {
         for (CommissionPayoutStatus item : commissionPayoutStatusList) {
             fortuneIdList.add(item.getFortuneId());
             fortuneIdList.add(item.getFortuneId());
         }
         }
-        System.out.println(fortuneIdList.toString());
+
         // 导出xlsx
         // 导出xlsx
         XSSFWorkbook wkb = new XSSFWorkbook();
         XSSFWorkbook wkb = new XSSFWorkbook();
         // 保单发佣清算明细报表Sheet页
         // 保单发佣清算明细报表Sheet页

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

@@ -512,13 +512,13 @@
             sum(case when drop_option_code ='S03' then f.referral_amount else null end) '68' /*S03-首年度辅导奖金*/,
             sum(case when drop_option_code ='S03' then f.referral_amount else null end) '68' /*S03-首年度辅导奖金*/,
 
 
             f.order_id,
             f.order_id,
-            f.practitioner_id
+            f.customer_id
 
 
         FROM ag_acl_customer_fortune f
         FROM ag_acl_customer_fortune f
         LEFT JOIN ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
         LEFT JOIN ag_acl_customer_fortune_payout_batch pb on pb.id = f.payout_batch_id
         LEFT JOIN ag_acl_life_insurance_practitioner l on l.order_id = f.order_id and l.practitioner_id = f.practitioner_id
         LEFT JOIN ag_acl_life_insurance_practitioner l on l.order_id = f.order_id and l.practitioner_id = f.practitioner_id
-        LEFT JOIN ag_acl_practitioner pra on pra.id = f.practitioner_id
-        LEFT JOIN ag_acl_practitioner_setting ps on ps.practitioner_id = f.practitioner_id
+        LEFT JOIN ag_acl_practitioner pra on pra.customer_id = f.customer_id
+        LEFT JOIN ag_acl_practitioner_setting ps on ps.practitioner_id = pra.id
         LEFT JOIN ag_po_order o on o.id = f.order_id
         LEFT JOIN ag_po_order o on o.id = f.order_id
         LEFT JOIN ag_acl_insurer i on i.id = o.insurer_id
         LEFT JOIN ag_acl_insurer i on i.id = o.insurer_id
         LEFT JOIN ag_product p on p.id = o.product_id
         LEFT JOIN ag_product p on p.id = o.product_id
@@ -527,7 +527,7 @@
         <foreach collection="list" item="item" open="(" separator="," close=")">
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item,jdbcType=BIGINT}
             #{item,jdbcType=BIGINT}
         </foreach>
         </foreach>
-        GROUP BY f.order_id, f.practitioner_id
+        GROUP BY f.order_id, f.customer_id
     </select>
     </select>
 
 
 </mapper>
 </mapper>