Skip to content

Y
yd-backend
Commit 76e36033 by jianan
Options

【线上来佣比对】 

3.查询列表增加保险公司的“分公司”
【发佣检核】
1.增加筛选字段：佣金类型 ， 选项增加“全部”，可多选
parent cfc5f20a
Showing with 45 additions and 2 deletions
yd-api/src/main/java/com/yd/api/agms/vo/fortune/CommissionPayoutStatusQueryRequestVO.java
...@@ -3,11 +3,17 @@ package com.yd.api.agms.vo.fortune; ...@@ -3,11 +3,17 @@ package com.yd.api.agms.vo.fortune;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yd.dal.entity.agms.fortune.CommissionPayoutStatus; import com.yd.dal.entity.agms.fortune.CommissionPayoutStatus;
import java.util.List;
/** /**
* @author xxy * @author xxy
*/ */
public class CommissionPayoutStatusQueryRequestVO { public class CommissionPayoutStatusQueryRequestVO {
/** /**
* 发佣检核-佣金类型
*/
private List<String> commissionTypeDropOptionCodeList;
/**
* 保单号 * 保单号
*/ */
private String policyNo; private String policyNo;
...@@ -198,5 +204,13 @@ public class CommissionPayoutStatusQueryRequestVO { ...@@ -198,5 +204,13 @@ public class CommissionPayoutStatusQueryRequestVO {
public void setPolicyNo(String policyNo) { public void setPolicyNo(String policyNo) {
this.policyNo = policyNo; this.policyNo = policyNo;
} }
public List<String> getCommissionTypeDropOptionCodeList() {
return commissionTypeDropOptionCodeList;
}
public void setCommissionTypeDropOptionCodeList(List<String> commissionTypeDropOptionCodeList) {
this.commissionTypeDropOptionCodeList = commissionTypeDropOptionCodeList;
}
} }
yd-api/src/main/java/com/yd/dal/entity/agms/fortune/CommissionPayoutStatusQueryInfo.java
...@@ -9,6 +9,10 @@ import java.util.List; ...@@ -9,6 +9,10 @@ import java.util.List;
*/ */
public class CommissionPayoutStatusQueryInfo { public class CommissionPayoutStatusQueryInfo {
/** /**
* 发佣检核-佣金类型
*/
private List<String> commissionTypeDropOptionCodeList;
/**
* 保单号 * 保单号
*/ */
private String policyNo; private String policyNo;
...@@ -172,4 +176,12 @@ public class CommissionPayoutStatusQueryInfo { ...@@ -172,4 +176,12 @@ public class CommissionPayoutStatusQueryInfo {
public void setPolicyNo(String policyNo) { public void setPolicyNo(String policyNo) {
this.policyNo = policyNo; this.policyNo = policyNo;
} }
public List<String> getCommissionTypeDropOptionCodeList() {
return commissionTypeDropOptionCodeList;
}
public void setCommissionTypeDropOptionCodeList(List<String> commissionTypeDropOptionCodeList) {
this.commissionTypeDropOptionCodeList = commissionTypeDropOptionCodeList;
}
} }
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
...@@ -124,6 +124,12 @@ ...@@ -124,6 +124,12 @@
#{subordinateSystemId} #{subordinateSystemId}
</foreach> </foreach>
</if> </if>
<if test="item.commissionTypeDropOptionCodeList != null and item.commissionTypeDropOptionCodeList.size() > 0">
and t.drop_option_code in
<foreach collection="item.commissionTypeDropOptionCodeList" index="index" item="dropOptionCode" open="(" separator="," close=")">
#{dropOptionCode}
</foreach>
</if>
<if test="item.practitionerId != null"> <if test="item.practitionerId != null">
and pra.id = #{item.practitionerId,jdbcType=BIGINT} and pra.id = #{item.practitionerId,jdbcType=BIGINT}
</if> </if>
...@@ -190,6 +196,12 @@ ...@@ -190,6 +196,12 @@
#{subordinateSystemId} #{subordinateSystemId}
</foreach> </foreach>
</if> </if>
<if test="item.commissionTypeDropOptionCodeList != null and item.commissionTypeDropOptionCodeList.size() > 0">
and t.drop_option_code in
<foreach collection="item.commissionTypeDropOptionCodeList" index="index" item="dropOptionCode" open="(" separator="," close=")">
#{dropOptionCode}
</foreach>
</if>
<if test="item.practitionerId != null"> <if test="item.practitionerId != null">
and pra.id = #{item.practitionerId,jdbcType=BIGINT} and pra.id = #{item.practitionerId,jdbcType=BIGINT}
</if> </if>
......
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
o.commission_type commissionType, o.commission_type commissionType,
o.commission_item commissionItem, o.commission_item commissionItem,
b.branch_name insurerBranchName,
(case when o.cover_term in ('1','2','3') then o.coverageTerm else e.coverageTerm END) coverageTerm, (case when o.cover_term in ('1','2','3') then o.coverageTerm else e.coverageTerm END) coverageTerm,
IFNULL(o.payTerm,e.payTerm) payTerm, IFNULL(o.payTerm,e.payTerm) payTerm,
f.name, f.name,
...@@ -72,6 +74,7 @@ ...@@ -72,6 +74,7 @@
left join ag_po_order_commission_check c on o.commission_check_id = c.id left join ag_po_order_commission_check c on o.commission_check_id = c.id
left join ag_product_plan a on o.plan_id = a.id left join ag_product_plan a on o.plan_id = a.id
left join ag_product p on o.product_id = p.id left join ag_product p on o.product_id = p.id
left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id
left join (select plcl.config_level, plcl.product_id, plc.name cName2, pc.name pName2 left join (select plcl.config_level, plcl.product_id, plc.name cName2, pc.name pName2
from ag_plan_category_list plcl from ag_plan_category_list plcl
left join ag_plan_category plc on plcl.plan_category_id = plc.id left join ag_plan_category plc on plcl.plan_category_id = plc.id
...@@ -278,6 +281,7 @@ ...@@ -278,6 +281,7 @@
o.policy_no policyNo, o.policy_no policyNo,
o.premium orderPrice, o.premium orderPrice,
ib.branch_name insurerBranchName,
o.commission_status commissionCheckStatus, o.commission_status commissionCheckStatus,
o.amount commissionAmount, o.amount commissionAmount,
...@@ -300,7 +304,7 @@ ...@@ -300,7 +304,7 @@
(case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName (case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName
from from
(SELECT t.id commissionId, policy_no, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,premium,t.insurer_id, (SELECT t.id commissionId, policy_no, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,premium,t.insurer_id,
t.commission_type,t.commission_item, t.commission_type,t.commission_item,t.insurer_branch_id,
commission_period, rate, order_id, commission_category, t.created_at, b.product_id, b.plan_id, b.config_level commission_period, rate, order_id, commission_category, t.created_at, b.product_id, b.plan_id, b.config_level
from ag_po_order_commission t left join ag_product_life_commission_base b on t.commission_base_id = b.id from ag_po_order_commission t left join ag_product_life_commission_base b on t.commission_base_id = b.id
WHERE 1=1 WHERE 1=1
...@@ -317,6 +321,7 @@ ...@@ -317,6 +321,7 @@
left join ag_po_order_commission_check c on o.commission_check_id = c.id left join ag_po_order_commission_check c on o.commission_check_id = c.id
left join ag_product_plan a on o.plan_id = a.id left join ag_product_plan a on o.plan_id = a.id
left join ag_product p on o.product_id = p.id left join ag_product p on o.product_id = p.id
left join ag_acl_insurer_branch ib on o.insurer_branch_id = ib.id
left join (select plcl.config_level, plcl.product_id, plc.name cName2, pc.name pName2 left join (select plcl.config_level, plcl.product_id, plc.name cName2, pc.name pName2
from ag_plan_category_list plcl from ag_plan_category_list plcl
left join ag_plan_category plc on plcl.plan_category_id = plc.id left join ag_plan_category plc on plcl.plan_category_id = plc.id
...@@ -337,7 +342,7 @@ ...@@ -337,7 +342,7 @@
and o.insurer_id = #{insurerId} and o.insurer_id = #{insurerId}
</if> </if>
<if test="insurerBranchId != null"> <if test="insurerBranchId != null">
and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT} and o.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
</if> </if>
<if test="commissionType != null"> <if test="commissionType != null">
and o.commission_type = #{commissionType} and o.commission_type = #{commissionType}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment