mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-18 16:47:58 +08:00
parent d7b8781723
commit e5071dde0e
8 changed files with 88 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/adminapi/controller/supervision_project/SupervisionParticipatingUnitsController.php
View File

@ -103,6 +103,9 @@ class SupervisionParticipatingUnitsController extends BaseAdminController
$result = SupervisionParticipatingUnitsLogic::detail($params);
return $this->data($result);
}
public function datas()
{
return $this->data(SupervisionParticipatingUnitsLogic::datas());
}
}

7
app/adminapi/controller/supervision_project/SupervisionProjectController.php
View File

@ -103,6 +103,9 @@ class SupervisionProjectController extends BaseAdminController
$result = SupervisionProjectLogic::detail($params);
return $this->data($result);
}
public function datas()
{
return $this->data(SupervisionProjectLogic::datas());
}
}

16
app/adminapi/lists/supervision_qualification_review/SupervisionConstructionManagementPersonnelLists.php
View File

@ -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();
}
}

16
app/adminapi/lists/supervision_qualification_review/SupervisionLargeEquipmentLists.php
View File

@ -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();
}
}

16
app/adminapi/lists/supervision_qualification_review/SupervisionSafetyManagementPersonnelLists.php
View File

@ -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();
}
}

16
app/adminapi/lists/supervision_qualification_review/SupervisionSpecialOperationPersonnelLists.php
View File

@ -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();
}
}

11
app/adminapi/logic/supervision_project/SupervisionParticipatingUnitsLogic.php
View File

@ -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;
}
}

11
app/adminapi/logic/supervision_project/SupervisionProjectLogic.php
View File

@ -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;
}
}