|
|
@@ -370,6 +370,7 @@
|
|
|
accept_time as acceptTime, review_time as reviewTime, licence_time as licenceTime,
|
|
|
o.liquidation_status as liquidationStatus, ga.name as byName,
|
|
|
bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
|
|
|
+ , b.create_time as startTime1
|
|
|
from t_order_bonus b
|
|
|
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
|
|
|
@@ -402,6 +403,11 @@
|
|
|
<bind name="e" value="b.endTime +'-31'"/>
|
|
|
and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
|
|
|
+ <bind name="a1" value="b.startTime1 +' 00:00:00'"/>
|
|
|
+ <bind name="e1" value="b.endTime1 +' 23:59:59'"/>
|
|
|
+ and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
order by b.grant_status ,b.create_time
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
@@ -441,6 +447,11 @@
|
|
|
<bind name="e" value="b.endTime +'-31'"/>
|
|
|
and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
|
|
|
+ <bind name="a1" value="b.startTime1 +' 00:00:00'"/>
|
|
|
+ <bind name="e1" value="b.endTime1 +' 23:59:59'"/>
|
|
|
+ and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<!-- 财务专员统计营销员奖金 -->
|
|
|
<select id="saleBonusList" parameterType="Map" resultType="com.goafanti.order.bo.TOrderBonusBo">
|
|
|
@@ -449,7 +460,7 @@
|
|
|
o.first_amount as firstAmount, o.settlement_amount as settlementAmount, o.refund_amount as refundAmount,
|
|
|
o.order_status as orderStatus, o.project_status as projectStatus, b.bonus_subject as bonusSubject,
|
|
|
o.proof_count as proofCount, b.grant_status as grantStatus, a.name as salesName, o.proof_status as proofStatus,
|
|
|
- ad.name as byName, b.grant_target as grantTarget
|
|
|
+ ad.name as byName, b.grant_target as grantTarget, b.create_time as startTime1
|
|
|
from t_order_bonus b
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin a on o.salesman_id = a.id
|
|
|
@@ -478,6 +489,11 @@
|
|
|
<bind name="e" value="b.endTime +'-31'"/>
|
|
|
and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
|
|
|
+ <bind name="a1" value="b.startTime1 +' 00:00:00'"/>
|
|
|
+ <bind name="e1" value="b.endTime1 +' 23:59:59'"/>
|
|
|
+ and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
order by b.grant_status , b.create_time desc
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
@@ -512,6 +528,11 @@
|
|
|
<bind name="e" value="b.endTime +'-31'"/>
|
|
|
and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test='b.startTime1 != null and b.startTime1 != "" and b.endTime1 != null and b.endTime1 != ""'>
|
|
|
+ <bind name="a1" value="b.startTime1 +' 00:00:00'"/>
|
|
|
+ <bind name="e1" value="b.endTime1 +' 23:59:59'"/>
|
|
|
+ and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<!-- 获得技术员有奖金数据的部门 -->
|
|
|
<select id="getDeptBySome" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="com.goafanti.order.bo.TOrderBonusBo">
|
|
|
@@ -541,6 +562,11 @@
|
|
|
<bind name="e" value="endTime +'-31'"/>
|
|
|
and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test='startTime1 != null and startTime1 != "" and endTime1 != null and endTime1 != ""'>
|
|
|
+ <bind name="a1" value="startTime1 +' 00:00:00'"/>
|
|
|
+ <bind name="e1" value="endTime1 +' 23:59:59'"/>
|
|
|
+ and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<!-- 获得及技术员奖金数据 -->
|
|
|
<select id="getBonusData" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="com.goafanti.order.bo.TOrderBonusBo">
|
|
|
@@ -549,6 +575,7 @@
|
|
|
accept_time as acceptTime, review_time as reviewTime, licence_time as licenceTime,
|
|
|
o.liquidation_status as liquidationStatus, ga.name as byName,
|
|
|
bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
|
|
|
+ ,b.create_time as startTime1
|
|
|
from t_order_bonus b
|
|
|
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
|
|
|
@@ -578,6 +605,11 @@
|
|
|
<bind name="e" value="endTime +'-31'"/>
|
|
|
and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test='startTime1 != null and startTime1 != "" and endTime1 != null and endTime1 != ""'>
|
|
|
+ <bind name="a1" value="startTime1 +' 00:00:00'"/>
|
|
|
+ <bind name="e1" value="endTime1 +' 23:59:59'"/>
|
|
|
+ and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
order by b.grant_status ,b.create_time desc
|
|
|
</select>
|
|
|
<!-- 查看营销员的奖金数据 -->
|
|
|
@@ -587,7 +619,7 @@
|
|
|
o.first_amount as firstAmount, o.settlement_amount as settlementAmount, o.refund_amount as refundAmount,
|
|
|
o.order_status as orderStatus, o.project_status as projectStatus, b.bonus_subject as bonusSubject,
|
|
|
o.proof_count as proofCount, b.grant_status as grantStatus, a.name as salesName
|
|
|
-
|
|
|
+ ,b.create_time as startTime1
|
|
|
from t_order_bonus b
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin a on o.salesman_id = a.id
|
|
|
@@ -611,6 +643,11 @@
|
|
|
<bind name="e" value="endTime +'-31'"/>
|
|
|
and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test='startTime1 != null and startTime1 != "" and endTime1 != null and endTime1 != ""'>
|
|
|
+ <bind name="a1" value="startTime1 +' 00:00:00'"/>
|
|
|
+ <bind name="e1" value="endTime1 +' 23:59:59'"/>
|
|
|
+ and b.create_time between #{a1,jdbcType=VARCHAR} and #{e1,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<!-- 根据订单编号和科目和奖金发放人检查这个奖金是否存在 -->
|
|
|
<select id="checkByOnoAndSub" parameterType="com.goafanti.common.model.TOrderBonus" resultType="java.lang.Integer">
|