|
@@ -213,8 +213,8 @@
|
|
maintenance_record mr
|
|
maintenance_record mr
|
|
LEFT JOIN lift li ON mr.lift_id = li.id
|
|
LEFT JOIN lift li ON mr.lift_id = li.id
|
|
LEFT JOIN user_info ui ON mr.worker_id1 = ui.user_id
|
|
LEFT JOIN user_info ui ON mr.worker_id1 = ui.user_id
|
|
- LEFT JOIN project pr ON mr.project_id = pr.id
|
|
|
|
- LEFT JOIN evaluation ev ON mr.id = ev.record_id
|
|
|
|
|
|
+ LEFT JOIN project pr ON mr.project_id = pr.id AND mr.mt_company_id = pr.mt_company_id
|
|
|
|
+ LEFT JOIN evaluation ev ON mr.id = ev.record_id AND ev.source = 1
|
|
LEFT JOIN maintenance_company mc ON mr.mt_company_id = mc.id
|
|
LEFT JOIN maintenance_company mc ON mr.mt_company_id = mc.id
|
|
<where>
|
|
<where>
|
|
<if test="cond.id != null and cond.id > 0">
|
|
<if test="cond.id != null and cond.id > 0">
|