Skip to content

Y
yd-backend
Commit c28439ea by jianan
Options

寿险佣金基本信息维护43-在来佣比对页面查询特殊来佣修改来佣类型的查询条件

parent 2c85ea4d
Showing with 31 additions and 8 deletions
yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
...@@ -50,9 +50,13 @@ public class LifeCommissionServiceImpl implements LifeCommissionService { ...@@ -50,9 +50,13 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
@Override @Override
public ComeCommissionListResponseVO queryComeCommissionList(QueryComeCommissionListRequestVO requestVO) { public ComeCommissionListResponseVO queryComeCommissionList(QueryComeCommissionListRequestVO requestVO) {
ComeCommissionListResponseVO resp = new ComeCommissionListResponseVO(); ComeCommissionListResponseVO resp = new ComeCommissionListResponseVO();
String commissionCategory = requestVO.getCommissionCategory(); String commissionType = requestVO.getCommissionType();
try { try {
if ("2".equals(commissionCategory)) { if (StringUtils.isBlank(commissionType)) {
resp.setCommonResult(new CommonResult(false, "佣金类型不能为空"));
return resp;
}
if ("2".equals(commissionType)) {
this.querySpecialCommission(requestVO, resp); this.querySpecialCommission(requestVO, resp);
} else { } else {
this.queryBaseCommission(requestVO, resp); this.queryBaseCommission(requestVO, resp);
......
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QueryComeCommissionListRequestVO.java
...@@ -11,6 +11,7 @@ public class QueryComeCommissionListRequestVO { ...@@ -11,6 +11,7 @@ public class QueryComeCommissionListRequestVO {
private Long insurerId; private Long insurerId;
private Long practitionerTypeId; private Long practitionerTypeId;
private String commissionCheckStatus; private String commissionCheckStatus;
private String commissionCategory; private String commissionType;
private String commissionItem;
private PageInfo<ComeCommissionVO> page; private PageInfo<ComeCommissionVO> page;
} }
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
amount commissionAmount, amount commissionAmount,
rate commissionRate, rate commissionRate,
commission_category, commission_category,
commission_type,
commission_item,
commission_period commission_period
from from
(SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status, (SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status,
...@@ -46,6 +48,7 @@ ...@@ -46,6 +48,7 @@
) o ) o
LEFT JOIN LEFT JOIN
(SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id, (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,
t.commission_type, t.commission_item,
commission_period, rate, order_id, commission_category commission_period, rate, order_id, commission_category
from ag_po_order_commission t from ag_po_order_commission t
) orderCommission ) orderCommission
...@@ -102,8 +105,11 @@ ...@@ -102,8 +105,11 @@
<if test="commissionCheckStatus != null"> <if test="commissionCheckStatus != null">
and o.commissionCheckStatus = #{commissionCheckStatus} and o.commissionCheckStatus = #{commissionCheckStatus}
</if> </if>
<if test="commissionCategory != null"> <if test="commissionType != null">
and o.commission_category = #{commissionCategory} and o.commission_type = #{commissionType}
<if test="commissionItem != null">
and o.commission_item = #{commissionItem}
</if>
</if> </if>
<choose> <choose>
<when test="historyDate != null "> <when test="historyDate != null ">
...@@ -169,6 +175,8 @@ ...@@ -169,6 +175,8 @@
amount commissionAmount, amount commissionAmount,
rate commissionRate, rate commissionRate,
commission_category, commission_category,
commission_type,
commission_item,
commission_period commission_period
from from
(SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id, (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id,
...@@ -181,6 +189,7 @@ ...@@ -181,6 +189,7 @@
) o ) o
LEFT JOIN LEFT JOIN
(SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate, commission_check_id, (SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate, commission_check_id,
t.commission_type,t.commission_item,
commission_period, order_id, commission_category commission_period, order_id, commission_category
from ag_po_order_commission t from ag_po_order_commission t
) orderCommission ) orderCommission
...@@ -213,8 +222,11 @@ ...@@ -213,8 +222,11 @@
<if test="commissionCheckStatus != null"> <if test="commissionCheckStatus != null">
and o.commissionCheckStatus = #{commissionCheckStatus} and o.commissionCheckStatus = #{commissionCheckStatus}
</if> </if>
<if test="commissionCategory != null"> <if test="commissionType != null">
and o.commission_category = #{commissionCategory} and o.commission_type = #{commissionType}
<if test="commissionItem != null">
and o.commission_item = #{commissionItem}
</if>
</if> </if>
<choose> <choose>
<when test="historyDate != null "> <when test="historyDate != null ">
...@@ -263,6 +275,7 @@ ...@@ -263,6 +275,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 policy_no, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,premium,t.insurer_id, (SELECT policy_no, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,premium,t.insurer_id,
t.commission_type,t.commission_item,
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
...@@ -295,7 +308,12 @@ ...@@ -295,7 +308,12 @@
<if test="insurerId != null"> <if test="insurerId != null">
and o.insurer_id = #{insurerId} and o.insurer_id = #{insurerId}
</if> </if>
<if test="commissionType != null">
and o.commission_type = #{commissionType}
<if test="commissionItem != null">
and o.commission_item = #{commissionItem}
</if>
</if>
<if test="commissionCheckStatus != null"> <if test="commissionCheckStatus != null">
and o.commission_status = #{commissionCheckStatus} and o.commission_status = #{commissionCheckStatus}
</if> </if>
......
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