|
|
@@ -31,7 +31,7 @@
|
|
|
LEFT JOIN t_f_custom_flow_entity tfcfe ON tfcfe.CODE = tbsi.sop_no
|
|
|
LEFT JOIN t_f_flow_approve tffa ON tffa.flow_id = tfcfe.flow_id
|
|
|
<where>
|
|
|
-
|
|
|
+ and tffa.status != 'END'
|
|
|
<if test="serviceId != null and serviceId != ''">
|
|
|
and tbsi.service_id= #{serviceId}
|
|
|
</if>
|
|
|
@@ -92,6 +92,7 @@
|
|
|
LEFT JOIN t_b_user_archives ua ON ua.mobile_number = u.mobile_number
|
|
|
LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
|
|
|
<where>
|
|
|
+ and tffa.status != 'END'
|
|
|
<if test="serviceId != null and serviceId != ''">
|
|
|
and tbsi.service_id = #{serviceId}
|
|
|
</if>
|
|
|
@@ -117,7 +118,7 @@
|
|
|
FROM
|
|
|
t_b_ding d
|
|
|
<where>
|
|
|
-
|
|
|
+ and (d.sign_in_time is not null or d.sign_out_time is not null)
|
|
|
<if test="serviceId != null and serviceId != ''">
|
|
|
and d.service_id= #{serviceId}
|
|
|
</if>
|
shudonghui