佣金项目-代码显示(基本法配置、订单明细、发佣检核、关账)

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

@@ -73,10 +73,9 @@
        pra.name practitionerName,
        dept.name insurerBranchDeptName,
        sub.name subordinateSystemName,
-<!--        t.practitioner_level practitionerLevel, -->
        op1.drop_option_name practitionerLevel,
        t.commission_amount commissionAmount,
-       t.commission_type commissionType,
+       CONCAT(t.drop_option_code,'-',t.commission_type) commissionType,
        t.referral_rate referralRate,
        t.referral_amount referralAmount,
        t.predict_month_period predictMonthPeriod,
@@ -89,7 +88,7 @@
         LEFT JOIN ag_po_order_commission oc ON oc.order_id = t.order_id  AND oc.id = t.commission_id
         LEFT JOIN ag_po_order_commission_check c on oc.commission_check_id = c.id
         LEFT JOIN ag_acl_insurer i ON i.id = o.insurer_id
-        LEFT JOIN ag_acl_practitioner pra ON pra.customer_id = t.customer_id <!-- ON pra.id = oc.practitioner_id -->
+        LEFT JOIN ag_acl_practitioner pra ON pra.customer_id = t.customer_id
         LEFT JOIN ag_acl_insurer_branch_dept dept ON pra.dept_id = dept.id
         LEFT JOIN ag_acl_practitioner_subordinate_system sub ON sub.id = pra.subordinate_system_id
         LEFT JOIN ag_acl_practitioner_setting setting ON setting.practitioner_id = pra.id
@@ -158,10 +157,9 @@
             pra.name practitionerName,
             dept.name insurerBranchDeptName,
             sub.name subordinateSystemName,
-    <!-- 	    t.practitioner_level practitionerLevel, -->
             op1.drop_option_name practitionerLevel,
             t.commission_amount commissionAmount,
-            t.commission_type commissionType,
+            CONCAT(t.drop_option_code,'-',t.commission_type) commissionType,
             t.referral_rate referralRate,
             t.referral_amount referralAmount,
             t.predict_month_period predictMonthPeriod,
@@ -224,7 +222,7 @@
         select i.name                                  insurerName,
                o.policy_no                             policyNo,
                o.order_price                           orderPrice,
-               f.commission_type                       commissionType,
+               CONCAT(f.drop_option_code,'-',f.commission_type) commissionType,
                f.referral_rate                         referralRate,
                f.referral_amount                       referralAmount,
                if(o.config_level = 2, p.name, pp.name) productName,