From ebfc854254b193f7a9729f473bde2a3e788bbd2f Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Mon, 4 Mar 2024 16:48:31 +0800
Subject: [PATCH] update

---
 ...pervisionDangerousEngineeringMonitoringLists.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php
index 09d15fcb6..2428624e0 100644
--- a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php
+++ b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php
@@ -16,6 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
 
 
 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\lists\ListsSearchInterface;
 use app\common\model\supervision_project\SupervisionProject;
@@ -65,6 +68,16 @@ class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists
 		        $data['project_name'] = $project['project_name'];
 		        $data['partial_project_text'] = $data->partial_project_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();
     }