|
|
@@ -166,17 +166,22 @@
|
|
|
2 AS method,
|
|
|
ot.`status`,
|
|
|
oc.type_flag,
|
|
|
- ot.id AS task_id
|
|
|
+ ot.id AS task_id,
|
|
|
+ oat.reason,
|
|
|
+ oat.updated_time
|
|
|
FROM onsite_task ot,
|
|
|
onsite_calendar oc,
|
|
|
benteler_plan bp,
|
|
|
+ onsite_approval_task oat,
|
|
|
us_user uu,
|
|
|
- onsite_task_his_blob othb
|
|
|
+ onsite_task_his_blob othb
|
|
|
WHERE othb.onsite_task_id = ot.id and ot.`status`=4
|
|
|
AND ot.onsite_calendar_id = oc.id
|
|
|
AND oc.benteler_plan_id = bp.id
|
|
|
AND oc.user_id = uu.id
|
|
|
AND bp.id = #{planId}
|
|
|
+ AND ot.id = oat.onsite_task_id
|
|
|
+ <!-- AND oat.`status` = 1 -->
|
|
|
<if test="taskId!=null">
|
|
|
AND ot.id=#{taskId}
|
|
|
</if>
|
