Skip to content

Y
yd-backend
Commit 611e01a6 by hongzhong
Options

Merge remote-tracking branch 'origin/dev_20210330' into dev_20210330

parents 3edb7631 da933ee4
Showing with 144 additions and 92 deletions
yd-api/src/main/java/com/yd/api/agms/vo/fortune/CommissionPayoutStatusQueryRequestVO.java
...@@ -8,6 +8,10 @@ import com.yd.dal.entity.agms.fortune.CommissionPayoutStatus; ...@@ -8,6 +8,10 @@ import com.yd.dal.entity.agms.fortune.CommissionPayoutStatus;
*/ */
public class CommissionPayoutStatusQueryRequestVO { public class CommissionPayoutStatusQueryRequestVO {
/** /**
* 保单号
*/
private String policyNo;
/**
* 保险公司 * 保险公司
*/ */
private Long insurerId; private Long insurerId;
...@@ -50,7 +54,6 @@ public class CommissionPayoutStatusQueryRequestVO { ...@@ -50,7 +54,6 @@ public class CommissionPayoutStatusQueryRequestVO {
* 预计发佣年月 * 预计发佣年月
*/ */
private String predictMonthPeriod; private String predictMonthPeriod;
/** /**
* 系统标志，区分公司营业部和体系，1，分公司，2营业部，3，S1分部,4,S2体系,5,S3纵队 * 系统标志，区分公司营业部和体系，1，分公司，2营业部，3，S1分部,4,S2体系,5,S3纵队
*/ */
...@@ -187,5 +190,13 @@ public class CommissionPayoutStatusQueryRequestVO { ...@@ -187,5 +190,13 @@ public class CommissionPayoutStatusQueryRequestVO {
public void setPredictMonthPeriod(String predictMonthPeriod) { public void setPredictMonthPeriod(String predictMonthPeriod) {
this.predictMonthPeriod = predictMonthPeriod; this.predictMonthPeriod = predictMonthPeriod;
} }
public String getPolicyNo() {
return policyNo;
}
public void setPolicyNo(String policyNo) {
this.policyNo = policyNo;
}
} }
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QueryComeCommissionListRequestVO.java
...@@ -8,6 +8,7 @@ public class QueryComeCommissionListRequestVO { ...@@ -8,6 +8,7 @@ public class QueryComeCommissionListRequestVO {
private String startDate; private String startDate;
private String endDate; private String endDate;
private String historyDate; private String historyDate;
private String policyNo;
private Long insurerId; private Long insurerId;
private Long insurerBranchId; private Long insurerBranchId;
private Long practitionerTypeId; private Long practitionerTypeId;
......
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -392,14 +392,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -392,14 +392,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
List<PayScaleInfo> resultList = new ArrayList<>(); List<PayScaleInfo> resultList = new ArrayList<>();
//如果是预览薪资单，则跳过权限校验 //如果是预览薪资单，则跳过权限校验
if(!"AGMS".equals(requestVO.getPreFlag())){ // if(!"AGMS".equals(requestVO.getPreFlag())){
//等保调整 // //等保调整
List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null); // List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null);
if(null == findByObjSortable ){ // if(null == findByObjSortable ){
responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028"))); // responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
return responseVO; // return responseVO;
} // }
} // }
try { try {
if ("0".equals(isHistory)) { if ("0".equals(isHistory)) {
// 查询本年 // 查询本年
...@@ -422,9 +422,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -422,9 +422,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
} }
private List<PayScaleInfo> queryNew(PayScaleQueryRequestVO requestVO) throws Exception { private List<PayScaleInfo> queryNew(PayScaleQueryRequestVO requestVO) throws Exception {
Long practitionerId = requestVO.getPractitionerId();
Integer isActive = requestVO.getIsActive();
String isHistory = requestVO.getIsHistory();
// 1.先查本地新基本法的薪资 // 1.先查本地新基本法的薪资
List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(requestVO.getPractitionerId(), 1,requestVO.getIsActive()); List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(practitionerId, 1, isActive, isHistory);
List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list,requestVO.getPreFlag()); List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list,requestVO.getPreFlag());
// 2.再查N22 // 2.再查N22
......
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 String policyNo;
/**
* 保险公司 * 保险公司
*/ */
private Long insurerId; private Long insurerId;
...@@ -160,4 +164,12 @@ public class CommissionPayoutStatusQueryInfo { ...@@ -160,4 +164,12 @@ public class CommissionPayoutStatusQueryInfo {
public void setPredictMonthPeriod(String predictMonthPeriod) { public void setPredictMonthPeriod(String predictMonthPeriod) {
this.predictMonthPeriod = predictMonthPeriod; this.predictMonthPeriod = predictMonthPeriod;
} }
public String getPolicyNo() {
return policyNo;
}
public void setPolicyNo(String policyNo) {
this.policyNo = policyNo;
}
} }
yd-api/src/main/java/com/yd/dal/mapper/practitioner/AgAclLifePractitionerSalaryMapper.java
...@@ -20,7 +20,8 @@ public interface AgAclLifePractitionerSalaryMapper { ...@@ -20,7 +20,8 @@ public interface AgAclLifePractitionerSalaryMapper {
List<AgAclLifePractitionerSalary> queryListByPractitionerId(@Param("practitionerId") Long practitionerId,@Param("isActive") Integer isActive); List<AgAclLifePractitionerSalary> queryListByPractitionerId(@Param("practitionerId") Long practitionerId,@Param("isActive") Integer isActive);
List<AgAclLifePractitionerSalary> queryListByPractitionerIdAndIsbasic(@Param("practitionerId") Long practitionerId, @Param("isBasic") Integer isBasic,@Param("isActive") Integer isActive); List<AgAclLifePractitionerSalary> queryListByPractitionerIdAndIsbasic(@Param("practitionerId") Long practitionerId, @Param("isBasic") Integer isBasic,
@Param("isActive") Integer isActive, @Param("isHistory") String isHistory);
List<AgAclLifePractitionerSalary> queryByRecord(AgAclLifePractitionerSalary lifePractitionerSalary); List<AgAclLifePractitionerSalary> queryByRecord(AgAclLifePractitionerSalary lifePractitionerSalary);
} }
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
t.predict_month_period predictMonthPeriod, t.predict_month_period predictMonthPeriod,
op.drop_option_name commissionPayoutStatus, op.drop_option_name commissionPayoutStatus,
pb.payout_yearmonth monthPeriod pb.payout_yearmonth monthPeriod
FROM ag_acl_customer_fortune t FROM ag_acl_customer_fortune t
LEFT JOIN ag_po_order o ON o.id = t.order_id LEFT JOIN ag_po_order o ON o.id = t.order_id
LEFT JOIN ag_product p ON p.id = o.product_id LEFT JOIN ag_product p ON p.id = o.product_id
LEFT JOIN ag_product_plan pp ON pp.id = o.plan_id LEFT JOIN ag_product_plan pp ON pp.id = o.plan_id
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 oc ON oc.order_id = t.order_id AND oc.id = t.commission_id
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
LEFT JOIN ag_acl_practitioner_setting setting ON setting.practitioner_id = pra.id LEFT JOIN ag_acl_practitioner_setting setting ON setting.practitioner_id = pra.id
LEFT JOIN ag_acl_customer_fortune_payout_batch pb ON pb.id = t.payout_batch_id LEFT JOIN ag_acl_customer_fortune_payout_batch pb ON pb.id = t.payout_batch_id
LEFT JOIN ag_md_drop_options op ON op.drop_option_code = t.status LEFT JOIN ag_md_drop_options op ON op.drop_option_code = t.status
LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id
LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level
LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id
WHERE t.settlement_type = '1' WHERE t.settlement_type = '1'
...@@ -103,6 +103,9 @@ ...@@ -103,6 +103,9 @@
AND mas1.scenario_code = 'practitioner_level' AND mas1.scenario_code = 'practitioner_level'
AND oc.commission_status = '2' AND oc.commission_status = '2'
and setting.practitioner_type_id = 28 and setting.practitioner_type_id = 28
<if test="item.policyNo != null">
and o.policy_no like concat(concat('%',#{item.policyNo,jdbcType=VARCHAR}),'%')
</if>
<if test="item.insurerId != null"> <if test="item.insurerId != null">
AND i.id = #{item.insurerId,jdbcType=BIGINT} AND i.id = #{item.insurerId,jdbcType=BIGINT}
</if> </if>
...@@ -139,68 +142,70 @@ ...@@ -139,68 +142,70 @@
<if test="item.payoutYearmonth != null"> <if test="item.payoutYearmonth != null">
and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR} and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
</if> </if>
UNION ALL <if test="item.policyNo == null">
SELECT '' orderId,t.id fortuneId,'' commissionPayoutYearmonth,'' insurerName,'' productName, UNION ALL
'' policyNo, SELECT '' orderId,t.id fortuneId,'' commissionPayoutYearmonth,'' insurerName,'' productName,
'' paymentTermUnit, '' policyNo,
'' coverTermType, '' paymentTermUnit,
'0.00' orderPrice, '' coverTermType,
pra.name practitionerName, '0.00' orderPrice,
dept.name insurerBranchDeptName, pra.name practitionerName,
sub.name subordinateSystemName, dept.name insurerBranchDeptName,
<!-- t.practitioner_level practitionerLevel, --> sub.name subordinateSystemName,
op1.drop_option_name practitionerLevel, <!-- t.practitioner_level practitionerLevel, -->
t.commission_amount commissionAmount, op1.drop_option_name practitionerLevel,
t.commission_type commissionType, t.commission_amount commissionAmount,
t.referral_rate referralRate, t.commission_type commissionType,
t.referral_amount referralAmount, t.referral_rate referralRate,
t.predict_month_period predictMonthPeriod, t.referral_amount referralAmount,
op.drop_option_name commissionPayoutStatus, t.predict_month_period predictMonthPeriod,
pb.payout_yearmonth monthPeriod op.drop_option_name commissionPayoutStatus,
FROM ag_acl_customer_fortune t pb.payout_yearmonth monthPeriod
LEFT JOIN ag_acl_practitioner pra ON pra.id = t.practitioner_id FROM ag_acl_customer_fortune t
LEFT JOIN ag_acl_insurer_branch_dept dept ON pra.dept_id = dept.id LEFT JOIN ag_acl_practitioner pra ON pra.id = t.practitioner_id
LEFT JOIN ag_acl_practitioner_subordinate_system sub ON sub.id = pra.subordinate_system_id LEFT JOIN ag_acl_insurer_branch_dept dept ON pra.dept_id = dept.id
LEFT JOIN ag_acl_practitioner_setting setting ON setting.practitioner_id = pra.id LEFT JOIN ag_acl_practitioner_subordinate_system sub ON sub.id = pra.subordinate_system_id
LEFT JOIN ag_acl_customer_fortune_payout_batch pb ON pb.id = t.payout_batch_id LEFT JOIN ag_acl_practitioner_setting setting ON setting.practitioner_id = pra.id
LEFT JOIN ag_md_drop_options op ON op.drop_option_code = t.status LEFT JOIN ag_acl_customer_fortune_payout_batch pb ON pb.id = t.payout_batch_id
LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id LEFT JOIN ag_md_drop_options op ON op.drop_option_code = t.status
LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id
LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level
WHERE t.settlement_type = '2' LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id
AND mas.drop_code = 'Fortune_Payout_Status' WHERE t.settlement_type = '2'
AND mas1.scenario_code = 'practitioner_level' AND mas.drop_code = 'Fortune_Payout_Status'
and setting.practitioner_type_id = 28 AND mas1.scenario_code = 'practitioner_level'
<if test="item.insurerBranchId != null"> and setting.practitioner_type_id = 28
and pra.insurer_branch_id = #{item.insurerBranchId,jdbcType=BIGINT} <if test="item.insurerBranchId != null">
</if> and pra.insurer_branch_id = #{item.insurerBranchId,jdbcType=BIGINT}
<if test="item.insurerBranchDeptId != null"> </if>
and dept.id = #{item.insurerBranchDeptId,jdbcType=BIGINT} <if test="item.insurerBranchDeptId != null">
</if> and dept.id = #{item.insurerBranchDeptId,jdbcType=BIGINT}
<!-- <if test="item.subordinateSystemId != null"> </if>
and sub.id = #{item.subordinateSystemId,jdbcType=BIGINT} <!-- <if test="item.subordinateSystemId != null">
</if>--> and sub.id = #{item.subordinateSystemId,jdbcType=BIGINT}
<if test="item.subsystemIdList != null and item.subsystemIdList.size() > 0"> </if>-->
and sub.id in <if test="item.subsystemIdList != null and item.subsystemIdList.size() > 0">
<foreach collection="item.subsystemIdList" index="index" item="subordinateSystemId" open="(" separator="," close=")"> and sub.id in
#{subordinateSystemId} <foreach collection="item.subsystemIdList" index="index" item="subordinateSystemId" open="(" separator="," close=")">
</foreach> #{subordinateSystemId}
</if> </foreach>
<if test="item.practitionerId != null"> </if>
and pra.id = #{item.practitionerId,jdbcType=BIGINT} <if test="item.practitionerId != null">
</if> and pra.id = #{item.practitionerId,jdbcType=BIGINT}
<if test="item.commissionPayoutStatus != null"> </if>
and t.status = #{item.commissionPayoutStatus,jdbcType=BIGINT} <if test="item.commissionPayoutStatus != null">
</if> and t.status = #{item.commissionPayoutStatus,jdbcType=BIGINT}
<!-- <if test="item.commissionPayoutYearmonth != null"> --> </if>
<!-- and c.check_yearmonth = #{item.commissionPayoutYearmonth,jdbcType=VARCHAR} --> <!-- <if test="item.commissionPayoutYearmonth != null"> -->
<!-- </if> --> <!-- and c.check_yearmonth = #{item.commissionPayoutYearmonth,jdbcType=VARCHAR} -->
<if test="item.predictMonthPeriod != null"> <!-- </if> -->
and DATE_FORMAT(t.predict_month_period, '%Y-%m') = #{item.predictMonthPeriod,jdbcType=VARCHAR} <if test="item.predictMonthPeriod != null">
</if> and DATE_FORMAT(t.predict_month_period, '%Y-%m') = #{item.predictMonthPeriod,jdbcType=VARCHAR}
<if test="item.payoutYearmonth != null"> </if>
and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR} <if test="item.payoutYearmonth != null">
</if> and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
</if>
</if>
</select> </select>
<select id="fortunePayToOrder" resultType="com.yd.dal.entity.agms.fortune.FortunePayToOrderInfo"> <select id="fortunePayToOrder" resultType="com.yd.dal.entity.agms.fortune.FortunePayToOrderInfo">
...@@ -352,11 +357,11 @@ ...@@ -352,11 +357,11 @@
i.name insurerName, i.name insurerName,
p.name productName, p.name productName,
pp.name planName, pp.name planName,
o.effective_start_date effectiveStartDate, if(o.effective_start_date is not null,left(o.effective_start_date,10),o.effective_start_date) effectiveStartDate,
o.policy_no policyNo, o.policy_no policyNo,
f.order_price orderPrice, if(f.order_price is null,0,f.order_price) orderPrice,
f.fyc_amount fycAmount, if(f.fyc_amount is null,0,f.fyc_amount) fycAmount,
f.grade_commission_rate gradeCommissionRate, if(f.grade_commission_rate is null,0,f.grade_commission_rate) gradeCommissionRate,
(select s.name from ag_acl_practitioner_subordinate_system s where s.id = pra.subordinate_system_id) subordinateSystemName, (select s.name from ag_acl_practitioner_subordinate_system s where s.id = pra.subordinate_system_id) subordinateSystemName,
pra.name practitionerName, pra.name practitionerName,
if(f.commission_rate is null,0,f.commission_rate) commissionRate, if(f.commission_rate is null,0,f.commission_rate) commissionRate,
...@@ -365,7 +370,7 @@ ...@@ -365,7 +370,7 @@
f.drop_option_code dropOptionCode, f.drop_option_code dropOptionCode,
f.remark remark, f.remark remark,
f.commission_type commissionType, f.commission_type commissionType,
f.referral_amount referralAmount, if(f.referral_amount is null,0,f.referral_amount) referralAmount,
f.calculation_formula calculationFormula, f.calculation_formula calculationFormula,
f.withdrawed_id withdrawId, f.withdrawed_id withdrawId,
if(f.calculation_rate is null,0,f.calculation_rate) calculationRate if(f.calculation_rate is null,0,f.calculation_rate) calculationRate
......
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
(case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName, (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
(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 (SELECT o.*, from (SELECT o.*,
IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
policyNo, commission_no, amount, commission_time, rate, commission_check_id, commissionId, policyNo, commission_no, amount, commission_time, rate, commission_check_id, commissionId,
commission_year commissionYear, commission_year commissionYear,
commission_status commissionCheckStatus, commission_status commissionCheckStatus,
...@@ -50,9 +51,9 @@ ...@@ -50,9 +51,9 @@
where t.status in (3,4) and policy_no is not null where t.status in (3,4) and policy_no is not null
and (t.plan_id not in (424,453,464) or t.plan_id is null) and (t.plan_id not in (424,453,464) or t.plan_id is null)
) o ) o
LEFT JOIN RIGHT JOIN
(SELECT id commissionId, policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id, (SELECT id commissionId, policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,
t.commission_type, t.commission_item, t.commission_type, t.commission_item, insurer_id,
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
...@@ -64,6 +65,9 @@ ...@@ -64,6 +65,9 @@
<if test="endDate != null "> <if test="endDate != null ">
and date_format(commission_year, '%Y-%m') &lt;= #{endDate} and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
</if> </if>
<if test="policyNo != null">
and policyNo like concat(concat('%',#{policyNo,jdbcType=VARCHAR}),'%')
</if>
) o ) o
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
...@@ -82,7 +86,7 @@ ...@@ -82,7 +86,7 @@
where plcl.config_level = 3 where plcl.config_level = 3
) p3 ) p3
on o.config_level = p3.config_level and o.plan_id = p3.plan_id 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 i on o.insurerId = i.id
left join (SELECT order_id, name, practitioner_type_id, f.customer_id left join (SELECT order_id, name, practitioner_type_id, f.customer_id
from ( from (
select * select *
...@@ -101,7 +105,7 @@ ...@@ -101,7 +105,7 @@
) e on e.order_id = o.id ) e on e.order_id = o.id
where 1=1 where 1=1
<if test="insurerId != null"> <if test="insurerId != null">
and o.insurer_id = #{insurerId} and o.insurerId = #{insurerId}
</if> </if>
<if test="insurerBranchId != null"> <if test="insurerBranchId != null">
and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT} and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
...@@ -176,6 +180,7 @@ ...@@ -176,6 +180,7 @@
<sql id="queryLifecommissionList"> <sql id="queryLifecommissionList">
(SELECT o.*, (SELECT o.*,
IFNULL(o.insurer_id,orderCommission.insurer_id) insurerId,
policyNo, commission_no, amount, commission_time, rate, commission_check_id, policyNo, commission_no, amount, commission_time, rate, commission_check_id,
commission_year commissionYear, commission_year commissionYear,
commission_status commissionCheckStatus, commission_status commissionCheckStatus,
...@@ -194,9 +199,9 @@ ...@@ -194,9 +199,9 @@
where t.status in (3,4) and policy_no is not null where t.status in (3,4) and policy_no is not null
and (t.plan_id not in (424,453,464) or t.plan_id is null) and (t.plan_id not in (424,453,464) or t.plan_id is null)
) o ) o
LEFT JOIN RIGHT 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, t.commission_type,t.commission_item, insurer_id,
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
...@@ -208,9 +213,12 @@ ...@@ -208,9 +213,12 @@
<if test="endDate != null "> <if test="endDate != null ">
and date_format(commission_year, '%Y-%m') &lt;= #{endDate} and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
</if> </if>
<if test="policyNo != null">
and policyNo like concat(concat('%',#{policyNo,jdbcType=VARCHAR}),'%')
</if>
) o ) o
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_acl_insurer i on o.insurer_id = i.id left join ag_acl_insurer i on o.insurerId = i.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 (SELECT order_id, name, practitioner_type_id, f.customer_id left join (SELECT order_id, name, practitioner_type_id, f.customer_id
...@@ -224,7 +232,7 @@ ...@@ -224,7 +232,7 @@
) f on f.order_id = o.id ) f on f.order_id = o.id
where 1=1 where 1=1
<if test="insurerId != null"> <if test="insurerId != null">
and o.insurer_id = #{insurerId} and o.insurerId = #{insurerId}
</if> </if>
<if test="insurerBranchId != null"> <if test="insurerBranchId != null">
and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT} and p.insurer_branch_id = #{insurerBranchId,jdbcType=BIGINT}
...@@ -302,6 +310,9 @@ ...@@ -302,6 +310,9 @@
<if test="endDate != null "> <if test="endDate != null ">
and date_format(commission_year, '%Y-%m') &lt;= #{endDate} and date_format(commission_year, '%Y-%m') &lt;= #{endDate}
</if> </if>
<if test="policyNo != null">
and policy_no like concat(concat('%',#{policyNo,jdbcType=VARCHAR}),'%')
</if>
) o ) o
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
......
yd-api/src/main/resources/mapper/practitioner/AgAclLifePractitionerSalaryMapper.xml
...@@ -134,14 +134,22 @@ ...@@ -134,14 +134,22 @@
</select> </select>
<select id="queryListByPractitionerIdAndIsbasic" resultMap="BaseResultMap"> <select id="queryListByPractitionerIdAndIsbasic" resultMap="BaseResultMap">
select <include refid="Base_Column_List" /> select
from ag_acl_life_practitioner_salary <include refid="Base_Column_List"/>
from ag_acl_life_practitioner_salary
where practitioner_id = #{practitionerId,jdbcType=BIGINT} where practitioner_id = #{practitionerId,jdbcType=BIGINT}
and is_basic = #{isBasic,jdbcType=BIGINT} and is_basic = #{isBasic,jdbcType=BIGINT}
<if test="isActive != null "> <if test="isActive != null ">
and is_active = #{isActive,jdbcType=BIGINT} and is_active = #{isActive,jdbcType=BIGINT}
</if> </if>
<if test="isHistory != null and 0==isHistory">
and left(`year_month`, 4) = left(NOW(), 4)
</if>
<if test="isHistory != null and 1==isHistory">
and left(`year_month`, 4) &lt; left(NOW(), 4)
</if>
</select> </select>
<select id="queryByRecord" resultMap="BaseResultMap"> <select id="queryByRecord" resultMap="BaseResultMap">
......
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