来佣后续1-线上来佣比对列表加来佣类型，发佣检核列表佣金类型加基本法佣金项目，筛选条件加分公司

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -10,6 +10,7 @@ import com.yd.dal.entity.agms.fortune.FortunePayToOrderInfo;
 import com.yd.dal.entity.commission.AgPoOrderCommission;
 import com.yd.dal.entity.commission.OrderCommissonCheck;
 import com.yd.dal.entity.customer.AclCustomerFortune;
+import com.yd.dal.entity.meta.MdDropOptions;
 import com.yd.dal.entity.order.PoOrder;
 import com.yd.dal.mapper.commission.AgPoOrderCommissionMapper;
 import com.yd.dal.mapper.lifecommission.LifeCommissionMapper;
@@ -61,6 +62,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             } else {
                 this.queryBaseCommission(requestVO, resp);
             }
+            // 设置佣金项目名称
+            this.setCommissionItemName(resp);
+
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         } catch (Exception e) {
             e.printStackTrace();
@@ -69,6 +73,23 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         return resp;
     }
 
+    private void setCommissionItemName(ComeCommissionListResponseVO resp) {
+        List<ComeCommissionVO> list = resp.getDataList();
+
+        MdDropOptions dropOption = null;
+        String masterCode = null;
+        for (ComeCommissionVO item : list) {
+            if ("1".equals(item.getCommissionType())) {
+                dropOption = systemConfigService.getDropOption("Base_Commission_Item", item.getCommissionItem());
+            } else {
+                dropOption = systemConfigService.getDropOption("Special_Commission_Type", item.getCommissionItem());
+            }
+            if (dropOption != null) {
+                item.setCommissionItemName(dropOption.getDropOptionName());
+            }
+        }
+    }
+
     private void querySpecialCommission(QueryComeCommissionListRequestVO requestVO, ComeCommissionListResponseVO resp) {
         PageInfo<ComeCommissionVO> page = requestVO.getPage();
 

yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/ComeCommissionVO.java

@@ -45,4 +45,13 @@ public class ComeCommissionVO {
     private String commissionStatus;
     private String commissionTime;
     private String commissionPeriod;
+
+    private String commissionType;//来佣类型(1:基础来佣;2:特殊激励来佣;3:公告佣)
+    private String commissionTypeName;
+
+    private String commissionItem;//佣金项目(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
+    private String commissionItemName;
+
+    private String insurerBrachId;
+    private String insurerBrachName;
 }

yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QueryComeCommissionListRequestVO.java

@@ -9,6 +9,7 @@ public class QueryComeCommissionListRequestVO {
     private String endDate;
     private String historyDate;
     private Long insurerId;
+    private Long insurerBranchId;
     private Long practitionerTypeId;
     private String commissionCheckStatus;
     private String commissionType;

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

@@ -21,6 +21,12 @@
             o.commissionCheckStatus commissionStatus,
             o.commission_time commissionTime,
             o.commission_period commissionPeriod,
+            o.commission_type commissionType,
+            o.commission_item commissionItem,
+
+            b.id insurerBrachId,
+            b.branch_name insurerBrachName,
+
             (case when o.cover_term in ('1','2','3') then o.coverageTerm  else e.coverageTerm END) coverageTerm,
             IFNULL(o.payTerm,e.payTerm) payTerm,
             f.name,
@@ -79,6 +85,7 @@
                     ) p3
                     on o.config_level = p3.config_level and o.plan_id = p3.plan_id
         left join ag_acl_insurer i on o.insurer_id = i.id
+        left join ag_acl_insurer_branch b on o.insurer_id = b.insurer_id
         left join (SELECT order_id, name, practitioner_type_id, f.customer_id
                         from (
                             select *
@@ -99,6 +106,9 @@
         <if test="insurerId != null">
             and o.insurer_id = #{insurerId}
         </if>
+        <if test="insurerBranchId != null">
+            and b.id = #{insurerBranchId,jdbcType=BIGINT}
+        </if>
         <if test="practitionerTypeId != null">
             and f.practitioner_type_id = #{practitionerTypeId}
         </if>
@@ -203,6 +213,8 @@
                     </if>
             ) o
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
+        left join ag_acl_insurer i on o.insurer_id = i.id
+        left join ag_acl_insurer_branch b on o.insurer_id = b.insurer_id
         left join (SELECT order_id, name, practitioner_type_id, f.customer_id
                     from (
                         select *
@@ -216,6 +228,9 @@
         <if test="insurerId != null">
             and o.insurer_id = #{insurerId}
         </if>
+        <if test="insurerBranchId != null">
+            and b.id = #{insurerBranchId,jdbcType=BIGINT}
+        </if>
         <if test="practitionerTypeId != null">
             and f.practitioner_type_id = #{practitionerTypeId}
         </if>
@@ -269,6 +284,12 @@
 
         o.commission_time commissionTime,
         o.commission_period commissionPeriod,
+        o.commission_type commissionType,
+        o.commission_item commissionItem,
+
+        b.id insurerBrachId,
+        b.branch_name insurerBrachName,
+
         null as coverageTerm,
         null as payTerm,
         (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
@@ -304,10 +325,14 @@
                     ) p3
         on o.config_level = p3.config_level and o.plan_id = p3.plan_id
         left join ag_acl_insurer i on o.insurer_id = i.id
+        LEFT JOIN ag_acl_insurer_branch b ON o.insurer_id = b.insurer_id
         where 1=1
         <if test="insurerId != null">
             and o.insurer_id = #{insurerId}
         </if>
+        <if test="insurerBranchId != null">
+            and b.id = #{insurerBranchId,jdbcType=BIGINT}
+        </if>
         <if test="commissionType != null">
             and o.commission_type = #{commissionType}
             <if test="commissionItem != null">