update

app/adminapi/controller/supervision_project/SupervisionParticipatingUnitsController.php

@@ -104,5 +104,8 @@ class SupervisionParticipatingUnitsController extends BaseAdminController
         return $this->data($result);
     }
 	
-
+	public function datas()
+	{
+		return $this->data(SupervisionParticipatingUnitsLogic::datas());
+	}
 }

app/adminapi/controller/supervision_project/SupervisionProjectController.php

@@ -104,5 +104,8 @@ class SupervisionProjectController extends BaseAdminController
         return $this->data($result);
     }
 	
-
+	public function datas()
+	{
+		return $this->data(SupervisionProjectLogic::datas());
+	}
 }

app/adminapi/lists/supervision_qualification_review/SupervisionConstructionManagementPersonnelLists.php

@@ -57,7 +57,13 @@ class SupervisionConstructionManagementPersonnelLists extends BaseAdminDataLists
      */
     public function lists(): array
     {
-        return SupervisionConstructionManagementPersonnel::withoutField('update_time,delete_time')->where($this->searchWhere)
+		$params = $this->request->get();
+		$where = [];
+		if(!empty($params['company_id'])){
+			$unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+			$where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+		}
+        return SupervisionConstructionManagementPersonnel::withoutField('update_time,delete_time')->where($this->searchWhere)->where($where)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
@@ -79,7 +85,13 @@ class SupervisionConstructionManagementPersonnelLists extends BaseAdminDataLists
      */
     public function count(): int
     {
-        return SupervisionConstructionManagementPersonnel::where($this->searchWhere)->count();
+	    $params = $this->request->get();
+	    $where = [];
+	    if(!empty($params['company_id'])){
+		    $unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+		    $where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+	    }
+        return SupervisionConstructionManagementPersonnel::where($this->searchWhere)->where($where)->count();
     }
 
 }

app/adminapi/lists/supervision_qualification_review/SupervisionLargeEquipmentLists.php

@@ -58,7 +58,13 @@ class SupervisionLargeEquipmentLists extends BaseAdminDataLists implements Lists
      */
     public function lists(): array
     {
-        return SupervisionLargeEquipment::withoutField('update_time,delete_time')->where($this->searchWhere)
+	    $params = $this->request->get();
+	    $where = [];
+	    if(!empty($params['company_id'])){
+		    $unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+		    $where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+	    }
+        return SupervisionLargeEquipment::withoutField('update_time,delete_time')->where($this->searchWhere)->where($where)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
@@ -80,7 +86,13 @@ class SupervisionLargeEquipmentLists extends BaseAdminDataLists implements Lists
      */
     public function count(): int
     {
-        return SupervisionLargeEquipment::where($this->searchWhere)->count();
+	    $params = $this->request->get();
+	    $where = [];
+	    if(!empty($params['company_id'])){
+		    $unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+		    $where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+	    }
+        return SupervisionLargeEquipment::where($this->searchWhere)->where($where)->count();
     }
 
 }

app/adminapi/lists/supervision_qualification_review/SupervisionSafetyManagementPersonnelLists.php

@@ -57,7 +57,13 @@ class SupervisionSafetyManagementPersonnelLists extends BaseAdminDataLists imple
      */
     public function lists(): array
     {
-        return SupervisionSafetyManagementPersonnel::withoutField('update_time,delete_time')->where($this->searchWhere)
+	    $params = $this->request->get();
+	    $where = [];
+	    if(!empty($params['company_id'])){
+		    $unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+		    $where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+	    }
+        return SupervisionSafetyManagementPersonnel::withoutField('update_time,delete_time')->where($this->searchWhere)->where($where)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
@@ -79,7 +85,13 @@ class SupervisionSafetyManagementPersonnelLists extends BaseAdminDataLists imple
      */
     public function count(): int
     {
-        return SupervisionSafetyManagementPersonnel::where($this->searchWhere)->count();
+	    $params = $this->request->get();
+	    $where = [];
+	    if(!empty($params['company_id'])){
+		    $unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+		    $where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+	    }
+        return SupervisionSafetyManagementPersonnel::where($this->searchWhere)->where($where)->count();
     }
 
 }

app/adminapi/lists/supervision_qualification_review/SupervisionSpecialOperationPersonnelLists.php

@@ -57,7 +57,13 @@ class SupervisionSpecialOperationPersonnelLists extends BaseAdminDataLists imple
      */
     public function lists(): array
     {
-        return SupervisionSpecialOperationPersonnel::withoutField('update_time,delete_time')->where($this->searchWhere)
+	    $params = $this->request->get();
+	    $where = [];
+	    if(!empty($params['company_id'])){
+		    $unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+		    $where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+	    }
+        return SupervisionSpecialOperationPersonnel::withoutField('update_time,delete_time')->where($this->searchWhere)->where($where)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
@@ -78,7 +84,13 @@ class SupervisionSpecialOperationPersonnelLists extends BaseAdminDataLists imple
      */
     public function count(): int
     {
-        return SupervisionSpecialOperationPersonnel::where($this->searchWhere)->count();
+	    $params = $this->request->get();
+	    $where = [];
+	    if(!empty($params['company_id'])){
+		    $unit_qualification_ids = SupervisionParticipatingUnitsQualifications::where('company_id',$params['company_id'])->column('id');
+		    $where[] = ['unit_qualification_id','in',$unit_qualification_ids];
+	    }
+        return SupervisionSpecialOperationPersonnel::where($this->searchWhere)->where($where)->count();
     }
 
 }

app/adminapi/logic/supervision_project/SupervisionParticipatingUnitsLogic.php

@@ -156,4 +156,15 @@ class SupervisionParticipatingUnitsLogic extends BaseLogic
 		$data['unit_type_text'] = $data->unit_type_text;
         return $data->toArray();
     }
+	
+	public static function datas()
+	{
+		$datas = SupervisionParticipatingUnits::field(['id', 'unit_name'])
+			->order(['id' => 'desc'])
+			->select()->each(function($data){
+				$data['projectinfo'] = 'ID：' . $data['id'] . ' / 名称：' . $data['unit_name'];
+			})
+			->toArray();
+		return $datas;
+	}
 }

app/adminapi/logic/supervision_project/SupervisionProjectLogic.php

@@ -163,4 +163,15 @@ class SupervisionProjectLogic extends BaseLogic
 		$data['engineering_status_text'] = $data->engineering_status_text;
         return $data->toArray();
     }
+	
+	public static function datas()
+	{
+		$datas = SupervisionProject::field(['id', 'project_name'])
+			->order(['id' => 'desc'])
+			->select()->each(function($data){
+				$data['projectinfo'] = 'ID：' . $data['id'] . ' / 名称：' . $data['project_name'];
+			})
+			->toArray();
+		return $datas;
+	}
 }