|
|
@@ -220,7 +220,7 @@
|
|
|
WHEN 'O' THEN
|
|
|
'提交'
|
|
|
WHEN 'N' THEN
|
|
|
- '未知状态'
|
|
|
+ '审核中'
|
|
|
WHEN 'S' THEN
|
|
|
'待审'
|
|
|
WHEN 'B' THEN
|
|
|
@@ -242,7 +242,7 @@
|
|
|
LEFT JOIN audit_items_users us ON us.pid = item.id
|
|
|
LEFT JOIN sys_user usr ON usr.user_id = item.audit_user_id
|
|
|
where
|
|
|
- us.audit_status = 'S'
|
|
|
+ 1=1
|
|
|
<if test="billNo != null and billNo != ''"> and item.bill_no = #{billNo}</if>
|
|
|
<if test="actId != null and actId != ''"> and item.act_id = #{actId}</if>
|
|
|
<if test="refno2 != null and refno2 != ''"> and item.refno2 = #{refno2}</if>
|
|
|
@@ -252,6 +252,7 @@
|
|
|
<if test="sendUserId != null and sendUserId != ''"> and item.send_user_id like concat('%', #{sendUserId}, '%')</if>
|
|
|
<if test="billTime != null and billTime != ''"> and item.bill_time = #{billTime}</if>
|
|
|
<if test="fidStatus != null and fidStatus != ''"> AND item.fid_status = #{fidStatus}</if>
|
|
|
+ <if test="auditStatus != null and auditStatus != ''"> AND item.audit_status = #{auditStatus} and us.audit_status = #{auditStatus}</if>
|
|
|
<if test="auditUserId != null and auditUserId != ''"> AND us.user_id = #{auditUserId}</if>
|
|
|
<if test='sendTime != null and sendTime[0] != null and sendTime[0]!= ""'>
|
|
|
and item.send_time >= #{sendTime[0]}
|
|
|
@@ -265,7 +266,6 @@
|
|
|
<if test='auditOpTime != null and auditOpTime[1] != null and auditOpTime[1]!= ""'>
|
|
|
and item.audit_op_time <= #{auditOpTime[1]}
|
|
|
</if>
|
|
|
- AND item.audit_status = 'S'
|
|
|
ORDER BY
|
|
|
item.send_time DESC
|
|
|
</select>
|
lazhaoqian