|
|
@@ -371,8 +371,8 @@
|
|
|
o.liquidation_status as liquidationStatus, ga.name as byName,
|
|
|
bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
|
|
|
from t_order_bonus b
|
|
|
- left join t_order_new o on o.order_no = b.order_no
|
|
|
- left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
|
|
|
+ left join t_order_task t on b.task_id = t.id
|
|
|
+ left join t_order_new o on o.order_no = t.order_no
|
|
|
left join admin a on a.id = t.task_receiver
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
left join admin ga on ga.id = b.grant_by
|
|
|
@@ -410,8 +410,8 @@
|
|
|
<select id="technicianBonusCount" parameterType="Map" resultType="java.lang.Integer">
|
|
|
select count(*)
|
|
|
from t_order_bonus b
|
|
|
- left join t_order_new o on o.order_no = b.order_no
|
|
|
- left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
|
|
|
+ left join t_order_task t on b.task_id = t.id
|
|
|
+ left join t_order_new o on o.order_no = t.order_no
|
|
|
left join admin a on a.id = t.task_receiver
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
where b.grant_type = 1
|
|
|
@@ -550,8 +550,8 @@
|
|
|
o.liquidation_status as liquidationStatus, ga.name as byName,
|
|
|
bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
|
|
|
from t_order_bonus b
|
|
|
- left join t_order_new o on o.order_no = b.order_no
|
|
|
- left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
|
|
|
+ left join t_order_task t on b.task_id = t.id
|
|
|
+ left join t_order_new o on o.order_no = t.order_no
|
|
|
left join admin a on a.id = t.task_receiver
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
left join admin ga on ga.id = b.grant_by
|
|
|
@@ -616,6 +616,9 @@
|
|
|
<select id="checkByOnoAndSub" parameterType="com.goafanti.common.model.TOrderBonus" resultType="java.lang.Integer">
|
|
|
select count(*) from t_order_bonus where order_no = #{orderNo,jdbcType=VARCHAR} and bonus_subject = #{bonusSubject,jdbcType=INTEGER}
|
|
|
and grant_target = #{grantTarget,jdbcType=VARCHAR} and grant_type = #{grantType,jdbcType=INTEGER}
|
|
|
+ <if test="taskId != null">
|
|
|
+ and task_id = #{taskId,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<!-- 判断当前订单中有没有未发放的数据 -->
|
|
|
<select id="checkNoPay" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="java.lang.Integer">
|