|
|
@@ -197,25 +197,25 @@
|
|
|
and tffa.status in ('AUDITING','REJECT','FINISH')
|
|
|
<!--and aht.ASSIGNEE_ = #{dpr.requestUserId}-->
|
|
|
<if test="serviceId != null and serviceId != ''">
|
|
|
- and t.serviceId = #{serviceId}
|
|
|
+ and tbs.id = #{serviceId}
|
|
|
</if>
|
|
|
<if test="name != null and name != ''">
|
|
|
- and t.createRealName like concat('%', #{name}, '%')
|
|
|
+ and su.real_name like concat('%', #{name}, '%')
|
|
|
</if>
|
|
|
<if test="supplierId != null and supplierId != ''">
|
|
|
- and t.supplierId = #{supplierId}
|
|
|
+ and ss.id = #{supplierId}
|
|
|
</if>
|
|
|
<if test="dingExceptionApprove != null and dingExceptionApprove != ''">
|
|
|
- and t.dingExceptionApprove = #{dingExceptionApprove}
|
|
|
+ and tbda.approve = #{dingExceptionApprove}
|
|
|
</if>
|
|
|
<if test="customName != null and customName != ''">
|
|
|
- and t.customName like concat('%', #{customName}, '%')
|
|
|
+ and sc.name like concat('%', #{customName}, '%')
|
|
|
</if>
|
|
|
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
|
|
- and (t.applyTime <![CDATA[ >= ]]> #{startTime} and t.applyTime <![CDATA[ <= ]]> #{endTime})
|
|
|
+ and (tbda.apply_time <![CDATA[ >= ]]> #{startTime} and tbda.apply_time <![CDATA[ <= ]]> #{endTime})
|
|
|
</if>
|
|
|
<if test="applyStartTime != null and applyStartTime != '' and applyEndTime != null and applyEndTime != ''">
|
|
|
- and (t.createTime <![CDATA[ >= ]]> #{applyStartTime} and t.createTime <![CDATA[ <= ]]> #{applyEndTime})
|
|
|
+ and (tbda.create_time <![CDATA[ >= ]]> #{applyStartTime} and tbda.create_time <![CDATA[ <= ]]> #{applyEndTime})
|
|
|
</if>
|
|
|
<if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
|
|
|
<choose>
|
wangliang