|
|
@@ -70,6 +70,11 @@
|
|
|
bp.created_time,
|
|
|
bp.pause_flag,
|
|
|
bp.plan_type,
|
|
|
+ ps.approval_level,
|
|
|
+ ps.reason,
|
|
|
+ ps.updated_time,
|
|
|
+ ps.approval_person,
|
|
|
+ ps.`status`,
|
|
|
ps.plan_status
|
|
|
FROM
|
|
|
benteler_plan bp,
|
|
|
@@ -77,6 +82,9 @@
|
|
|
SELECT a.id,
|
|
|
a.benteler_plan_id,
|
|
|
a.approval_level,
|
|
|
+ a.reason,
|
|
|
+ a.updated_time,
|
|
|
+ uu.username AS approval_person,
|
|
|
a.`status`,
|
|
|
CASE
|
|
|
WHEN a.approval_level = 2 AND a.`status` = 0 THEN 1
|
|
|
@@ -99,9 +107,11 @@
|
|
|
|
|
|
GROUP BY
|
|
|
bp.id
|
|
|
- ) b
|
|
|
+ ) b,
|
|
|
+ us_user uu
|
|
|
WHERE a.benteler_plan_id = b.benteler_plan_id
|
|
|
AND a.approval_level = b.approval_level
|
|
|
+ AND a.approval_user_id = uu.id
|
|
|
) ps
|
|
|
WHERE
|
|
|
bp.id = ps.benteler_plan_id
|
wuzhenyue