update
This commit is contained in:
parent
033ae9f67a
commit
ebfc854254
@ -16,6 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
|
|||||||
|
|
||||||
|
|
||||||
use app\adminapi\lists\BaseAdminDataLists;
|
use app\adminapi\lists\BaseAdminDataLists;
|
||||||
|
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
|
||||||
|
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
|
||||||
|
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
|
||||||
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
|
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
|
||||||
use app\common\lists\ListsSearchInterface;
|
use app\common\lists\ListsSearchInterface;
|
||||||
use app\common\model\supervision_project\SupervisionProject;
|
use app\common\model\supervision_project\SupervisionProject;
|
||||||
@ -65,6 +68,16 @@ class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists
|
|||||||
$data['project_name'] = $project['project_name'];
|
$data['project_name'] = $project['project_name'];
|
||||||
$data['partial_project_text'] = $data->partial_project_text;
|
$data['partial_project_text'] = $data->partial_project_text;
|
||||||
$data['type_text'] = $data->type_text;
|
$data['type_text'] = $data->type_text;
|
||||||
|
//实际施工时间
|
||||||
|
$construction = SupervisionDangerousEngineeringConstruction::field('actual_construction_date')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty();
|
||||||
|
$data['actual_construction_date'] = !$construction->isEmpty() ? $construction['actual_construction_date'] : '';
|
||||||
|
//相关方案
|
||||||
|
$case = SupervisionDangerousEngineeringCase::field('case_name')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty();
|
||||||
|
$data['case_name'] = !$case->isEmpty() ? $case['case_name'] : '';
|
||||||
|
//消除日期
|
||||||
|
$eliminate = SupervisionDangerousEngineeringEliminate::field('eliminate_date,eliminate_user')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty();
|
||||||
|
$data['eliminate_date'] = !$eliminate->isEmpty() ? $eliminate['eliminate_date'] : '';
|
||||||
|
$data['eliminate_user'] = !$eliminate->isEmpty() ? $eliminate['eliminate_user'] : '';
|
||||||
})
|
})
|
||||||
->toArray();
|
->toArray();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user