Skip to content

Y
yd-backend
Commit fb13ba76 by jianan
Options

来佣比对查询接口加经纪人类型入参

parent 01951ef6
Showing with 26 additions and 26 deletions
yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
......@@ -231,11 +231,8 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
if (orderCommissonCheck == null){
// 获取当前时间
Date curDate = new Date();
// 获取代表批次的年月
String yearmonth = CommonUtil.dateParseString(curDate, "yyyy-MM");
orderCommissonCheck = new OrderCommissonCheck();
orderCommissonCheck.setCheckYearmonth(yearmonth);
orderCommissonCheck.setCheckYearmonth(OrderCommissionCheckBatch);
orderCommissonCheck.setCreatedAt(curDate);
orderCommissonCheck.setCreatedBy(loginId);
orderCommissonCheck.setUpdatedAt(curDate);
......
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QueryComeCommissionListRequestVO.java
......@@ -8,6 +8,7 @@ public class QueryComeCommissionListRequestVO {
private String compareDate;
private String historyDate;
private Long insurerId;
private Long practitionerTypeId;
private String commissionCheckStatus;
private PageInfo<ComeCommissionVO> page;
}
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
......@@ -60,21 +60,22 @@
GROUP BY order_id
) e on e.order_id = o.id
where 1=1
<if test="insurerId != null">
and o.insurer_id = #{insurerId}
</if>
<if test="practitionerTypeId != null">
and f.practitioner_type_id = #{practitionerTypeId}
</if>
<if test="commissionCheckStatus != null">
and o.commission_check_status = #{commissionCheckStatus}
</if>
<choose>
<when test="historyDate != null ">
and c.check_yearmonth = #{historyDate}
</when>
<otherwise>
<if test="compareDate != null">
and date_format(o.order_date, '%Y-%m') &lt; #{compareDate}
</if>
<if test="insurerId != null">
and o.insurer_id = #{insurerId}
</if>
<if test="commissionCheckStatus != null">
and o.commission_check_status = #{commissionCheckStatus}
</if>
</otherwise>
<when test="compareDate != null ">
and date_format(o.order_date, '%Y-%m') &lt; #{compareDate}
</when>
</choose>
</select>
......@@ -130,21 +131,22 @@
) o
left join ag_po_order_commission_check c on o.commission_check_id = c.id
where 1=1
<if test="insurerId != null">
and o.insurer_id = #{insurerId}
</if>
<if test="practitionerTypeId != null">
and f.practitioner_type_id = #{practitionerTypeId}
</if>
<if test="commissionCheckStatus != null">
and o.commission_check_status = #{commissionCheckStatus}
</if>
<choose>
<when test="historyDate != null ">
and c.check_yearmonth = #{historyDate}
</when>
<otherwise>
<if test="compareDate != null">
and date_format(o.order_date, '%Y-%m') &lt; #{compareDate}
</if>
<if test="insurerId != null">
and o.insurer_id = #{insurerId}
</if>
<if test="commissionCheckStatus != null">
and o.commission_check_status = #{commissionCheckStatus}
</if>
</otherwise>
<when test="compareDate != null ">
and date_format(o.order_date, '%Y-%m') &lt; #{compareDate}
</when>
</choose>
</select>
......
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