@@ -388,9 +388,12 @@
WHEN 3 THEN
'审核完成'
WHEN 4 THEN
- '待提交' ELSE '-'
+ '待提交'
+ WHEN 5 THEN
+ '作废'
+ ELSE '-'
END AS approvalContent,
- IF(p.approved_status = 4 , p.create_user_id, p.approved_progress ) userId,
+ IF(p.approved_status = 4 or p.approved_status= 5, p.create_user_id, p.approved_progress ) userId,
p.create_user_name,
'' createTime
FROM