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-05-06 11:28:12 +08:00
parent 3146e06e70
commit e7f710811e
46 changed files with 3754 additions and 3589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/adminapi/lists/consult_basic/ConsultNewStartProjectLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultNewStartProject;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultNewStartProject;
use app\common\model\consult_basic\ConsultProject;
@ -63,6 +64,10 @@ class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSea
->select()->each(function ($data) {
$project = ConsultProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['project_manager'], $data['deputy_project_manager'], $data['engineer']])->column('name', 'id');
$data['project_manager_name'] = $admin[$data['project_manager']] ?? '';
$data['deputy_project_manager_name'] = $admin[$data['deputy_project_manager']] ?? '';
$data['engineer_name'] = $admin[$data['engineer']] ?? '';
})
->toArray();
}

8
app/adminapi/lists/consult_basic/ConsultProjectEvolveLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultProjectEvolve;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectEvolve;
/**
@ -58,7 +59,10 @@ class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearc
->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->select()->each(function ($data) {
$admin = Admin::field('name')->where('id', $data['resp_user'])->findOrEmpty();
$data['resp_user_name'] = $admin?->name;
})
->toArray();
}

5
app/adminapi/lists/consult_basic/ConsultProjectLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultProject;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProject;
/**
@ -66,6 +67,8 @@ class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInter
$data['supervision_department_name'] = $data->supervision_department_name_text;
$data['contract_name'] = $data->contract_name_text;
$data['company_name'] = $data->company_name_text;
$admin = Admin::field('name')->where('id', $data['consult_user'])->findOrEmpty();
$data['consult_user_name'] = $admin?->name;
})
->toArray();

8
app/adminapi/lists/consult_basic/ConsultProjectPreparationLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultProjectPreparation;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectPreparation;
/**
@ -58,7 +59,10 @@ class ConsultProjectPreparationLists extends BaseAdminDataLists implements Lists
->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->select()->each(function ($data) {
$admin = Admin::field('name')->where('id', $data['resp_user'])->findOrEmpty();
$data['resp_user_name'] = $admin?->name;
})
->toArray();
}

3
app/adminapi/lists/financial/FinancialCollectionPlanLists.php
View File

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialCollectionPlan;
use app\common\model\marketing\MarketingContract;
@ -72,6 +73,8 @@
$data['business_nature'] = $contract?->business_nature_text;
$data['signed_amount'] = $contract?->signed_amount;
$data['signed_date'] = $contract?->create_time;
$admin = Admin::field('name')->where('id', $data['collection_user'])->findOrEmpty();
$data['collection_user_name'] = $admin?->name;
})
->toArray();
}

3
app/adminapi/lists/financial/FinancialInvoiceLists.php
View File

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
use app\common\model\marketing\MarketingContract;
@ -66,6 +67,8 @@
->select()->each(function ($data) {
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['apply_contact'])->findOrEmpty();
$data['apply_contact_name'] = $admin?->name;
$data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name'];

6
app/adminapi/lists/manage_communication/ManageAcceptDocLists.php
View File

@ -16,9 +16,10 @@ namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageAcceptDoc;
use app\common\lists\ListsSearchInterface;
/**
@ -70,6 +71,9 @@ class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInte
->select()->each(function ($data) {
$project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['accept_user'], $data['read_user']])->column('name', 'id');
$data['accept_user_name'] = $admin[$data['accept_user']] ?? '';
$data['read_user_name'] = $admin[$data['read_user']] ?? '';
})
->toArray();
}

5
app/adminapi/lists/manage_communication/ManageInfoReportLists.php
View File

@ -16,9 +16,10 @@ namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageInfoReport;
use app\common\lists\ListsSearchInterface;
/**
@ -65,6 +66,8 @@ class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInt
$data['project_name'] = $project['project_name'];
$data['severity_text'] = $data->severity_text;
$data['info_cate_text'] = $data->info_cate_text;
$admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty();
$data['giver_name'] = $admin?->name;
})
->toArray();
}

6
app/adminapi/lists/manage_communication/ManageSendDocLists.php
View File

@ -16,9 +16,10 @@ namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageSendDoc;
use app\common\lists\ListsSearchInterface;
/**
@ -70,6 +71,9 @@ class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterf
->select()->each(function ($data) {
$project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['send_user'], $data['accept_user']])->column('name', 'id');
$data['send_user_name'] = $admin[$data['send_user']] ?? '';
$data['accept_user_name'] = $admin[$data['accept_user']] ?? '';
})
->toArray();
}

6
app/adminapi/lists/marketing/MarketingBranchFilingLists.php
View File

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\marketing\MarketingBranchFiling;
@ -59,6 +60,11 @@
->order(['id' => 'desc'])
->select()->each(function ($data) {
$data['filing_type_text'] = $data->filing_type;
$admin = Admin::where('id', 'in', [$data['fddbr'], $data['jbr'], $data['fzr'], $data['jsfzr']])->column('name', 'id');
$data['fddbr_name'] = $admin[$data['fddbr']] ?? '';
$data['jbr_name'] = $admin[$data['jbr']] ?? '';
$data['fzr_name'] = $admin[$data['fzr']] ?? '';
$data['jsfzr_name'] = $admin[$data['jsfzr']] ?? '';
})
->toArray();
}

3
app/adminapi/lists/marketing/MarketingCustomLists.php
View File

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept;
use app\common\model\GeoCity;
use app\common\model\GeoProvince;
@ -74,6 +75,8 @@
$data['total_contract_num'] = MarketingContract::where('part_a', $data['id'])->where('status', 1)->count();
$data['total_contract_amount'] = MarketingContract::where('part_a', $data['id'])->where('status', 1)->sum('signed_amount');
$data['is_deal'] = $data['total_contract_num'] <= 0 ? '否' : '是';
$admin = Admin::field('name')->where('id', $data['invoice_contact'])->findOrEmpty();
$data['invoice_contact_name'] = $admin?->name;
})
->toArray();
}

3
app/adminapi/lists/marketing/MarketingProjectFilingDetailLists.php
View File

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingProjectFiling;
use app\common\model\marketing\MarketingProjectFilingDetail;
@ -71,6 +72,8 @@
$data['filing_role_text'] = $data->filing_role_text;
$data['status'] = (string)$data['status'];
$data['status_text'] = $data->status_text;
$admin = Admin::field('name')->where('id', $data['filing_user'])->findOrEmpty();
$data['filing_user_name'] = $admin?->name;
})
->toArray();
}

6
app/adminapi/lists/supervision_connect/SupervisionCompanyCheckLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_connect;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_connect\SupervisionCompanyCheck;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionCompanyCheck;
use app\common\model\supervision_project\SupervisionProject;
@ -63,6 +64,9 @@ class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSe
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['user'], $data['reply_user']])->column('name', 'id');
$data['user_name'] = $admin[$data['user']] ?? '';
$data['reply_user_name'] = $admin[$data['reply_user']] ?? '';
})
->toArray();
}

5
app/adminapi/lists/supervision_connect/SupervisionProjectInfoReportLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_connect;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use app\common\model\supervision_project\SupervisionProject;
@ -65,6 +66,8 @@ class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements Li
$data['project_manager'] = $project['project_manager'];
$data['severity_text'] = $data->severity_text;
$data['info_cate_text'] = $data->info_cate_text;
$admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty();
$data['giver_name'] = $admin?->name;
})
->toArray();
}

5
app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringCaseLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
@ -64,9 +65,11 @@ class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implem
->select()->each(function ($data) {
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['assessor'])->findOrEmpty();
$data['dangerous_engineering_monitoring_title'] = $project['project_name'];
$data['project_name'] = $project['project_name'];
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
$data['assessor_name'] = $admin?->name;
})
->toArray();
}

5
app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringConstructionLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
@ -64,11 +65,13 @@ class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataList
->select()->each(function ($data) {
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,position')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['notice_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['type'] = $dangerous_engineering_monitoring->type_text;
$data['position'] = $dangerous_engineering_monitoring['position'];
$data['is_notice_text'] = $data->is_notice_text;
$data['dangerous_engineering_monitoring_title'] = $project['project_name'];
$data['notice_user_name'] = $admin?->name;
})
->toArray();
}

5
app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringEliminateLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
@ -64,10 +65,12 @@ class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists i
->select()->each(function ($data) {
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,position')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['eliminate_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['position'] = $dangerous_engineering_monitoring['position'];
$data['is_notice_text'] = $data->is_notice_text;
$data['dangerous_engineering_monitoring_title'] = $project['project_name'];
$data['eliminate_user_name'] = $admin?->name;
})
->toArray();
}

6
app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php
View File

@ -16,11 +16,12 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
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,9 +66,12 @@ class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists
->order(['id' => 'desc'])
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['supervisor'], $data['responsible_person']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['type_text'] = $data->type_text;
$data['supervisor_name'] = $admin[$data['supervisor']] ?? '';
$data['responsible_person_name'] = $admin[$data['responsible_person']] ?? '';
//实际施工时间
$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'] : '';

6
app/adminapi/lists/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use app\common\model\supervision_project\SupervisionProject;
@ -62,8 +63,11 @@ class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists im
->order(['id' => 'desc'])
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['check_user_name'] = $admin[$data['check_user']] ?? '';
$data['responsible_person_name'] = $admin[$data['responsible_person']] ?? '';
})
->toArray();
}

6
app/adminapi/lists/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use app\common\model\supervision_project\SupervisionProject;
@ -61,8 +62,11 @@ class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists impl
->order(['id' => 'desc'])
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['check_user_name'] = $admin[$data['check_user']] ?? '';
$data['responsible_person_name'] = $admin[$data['responsible_person']] ?? '';
})
->toArray();
}

5
app/adminapi/lists/supervision_dangerous/SupervisionLargeMechanicalEquipmentLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
@ -63,11 +64,13 @@ class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implem
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['first_auditor'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['approval_type_text'] = $data->approval_type_text;
$data['first_audit_opinion_text'] = $data->first_audit_opinion_text;
$data['final_audit_opinion_text'] = $data->final_audit_opinion_text;
$data['first_auditor_name'] = $admin?->name;
})
->toArray();
}

5
app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php
View File

@ -16,8 +16,9 @@ namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
use app\common\model\supervision_project\SupervisionProject;
@ -61,7 +62,9 @@ class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements Li
->order(['id' => 'desc'])
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['check_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['check_user_name'] = $admin?->name;
})
->toArray();
}

8
app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php
View File

@ -16,9 +16,10 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMeetingMinutes;
use app\common\lists\ListsSearchInterface;
/**
@ -61,6 +62,11 @@ class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements Lists
->order(['id' => 'desc'])
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['emcee'], $data['recorder']])->column('name', 'id');
$attendees = Admin::where('id', 'in', $data['attendees'])->column('name');
$data['emcee_name'] = $admin[$data['emcee']] ?? '';
$data['recorder_name'] = $admin[$data['recorder']] ?? '';
$data['attendees_name'] = implode(',', $attendees);
$data['project_name'] = $project['project_name'];
})
->toArray();

7
app/adminapi/logic/consult_basic/ConsultNewStartProjectLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultNewStartProject;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultNewStartProject;
use app\common\model\consult_basic\ConsultProject;
use app\common\model\consult_basic\ConsultProjectEvolve;
use app\common\model\consult_basic\ConsultProjectPreparation;
@ -219,6 +220,10 @@ class ConsultNewStartProjectLogic extends BaseLogic
$data = ConsultNewStartProject::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = ConsultProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['project_manager'], $data['deputy_project_manager'], $data['engineer']])->column('name', 'id');
$data['project_manager_name'] = $admin[$data['project_manager']] ?? '';
$data['deputy_project_manager_name'] = $admin[$data['deputy_project_manager']] ?? '';
$data['engineer_name'] = $admin[$data['engineer']] ?? '';
return $data->toArray();
}
}

8
app/adminapi/logic/consult_basic/ConsultProjectEvolveLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultProjectEvolve;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectEvolve;
use think\facade\Db;
@ -105,6 +106,9 @@ class ConsultProjectEvolveLogic extends BaseLogic
*/
public static function detail($params): array
{
return ConsultProjectEvolve::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray();
$data = ConsultProjectEvolve::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$admin = Admin::field('name')->where('id', $data['resp_user'])->findOrEmpty();
$data['resp_user_name'] = $admin?->name;
return $data->toArray();
}
}

15
app/adminapi/logic/consult_basic/ConsultProjectLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultProject;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProject;
use app\common\model\consult_build\ConsultAccept;
use app\common\model\consult_build\ConsultSceneExecute;
use app\common\model\consult_build\ConsultSceneOrg;
@ -266,11 +267,13 @@ class ConsultProjectLogic extends BaseLogic
$data['company_name'] = $data->company_name_text;
$data['project_manager_name'] = $data->project_manager_name_text;
$data['contract_name'] = $data->contract_name_text;
$data['nature'] = (Int)$data->nature;
$data['build_area'] = (Int)$data->build_area;
$data['project_department'] = (Int)$data->project_department;
$data['supervision_department'] = (Int)$data->supervision_department;
$data['implementation_department'] = (Int)$data->implementation_department;
$data['nature'] = (int)$data->nature;
$data['build_area'] = (int)$data->build_area;
$data['project_department'] = (int)$data->project_department;
$data['supervision_department'] = (int)$data->supervision_department;
$data['implementation_department'] = (int)$data->implementation_department;
$admin = Admin::field('name')->where('id', $data['consult_user'])->findOrEmpty();
$data['consult_user_name'] = $admin?->name;
return $data->toArray();
}

8
app/adminapi/logic/consult_basic/ConsultProjectPreparationLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultProjectPreparation;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectPreparation;
use think\facade\Db;
@ -105,6 +106,9 @@ class ConsultProjectPreparationLogic extends BaseLogic
*/
public static function detail($params): array
{
return ConsultProjectPreparation::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray();
$data = ConsultProjectPreparation::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$admin = Admin::field('name')->where('id', $data['resp_user'])->findOrEmpty();
$data['resp_user_name'] = $admin?->name;
return $data->toArray();
}
}

3
app/adminapi/logic/financial/FinancialCollectionPlanLogic.php
View File

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialCollectionPlan;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
@ -123,6 +124,8 @@
$data['signed_amount'] = $contract?->signed_amount;
$data['signed_date'] = $contract?->create_time;
$data['part_a_name'] = $custom?->name;
$admin = Admin::field('name')->where('id', $data['collection_user'])->findOrEmpty();
$data['collection_user_name'] = $admin?->name;
//开票金额
$data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['contract_id'])->sum('apply_amount');
//到账金额

3
app/adminapi/logic/financial/FinancialInvoiceLogic.php
View File

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund;
use app\common\model\marketing\MarketingContract;
@ -146,6 +147,8 @@
$data['sign_time'] = $contract['create_time'];
$data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['contract_id'])->sum('apply_amount');
$data['total_refund_amount'] = FinancialRefund::where('contract_id', $data['contract_id'])->sum('amount');
$admin = Admin::field('name')->where('id', $data['apply_contact'])->findOrEmpty();
$data['apply_contact_name'] = $admin?->name;
return $data->toArray();
}

6
app/adminapi/logic/manage_communication/ManageAcceptDocLogic.php
View File

@ -15,9 +15,10 @@
namespace app\adminapi\logic\manage_communication;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageAcceptDoc;
use app\common\logic\BaseLogic;
use think\facade\Db;
@ -122,6 +123,9 @@ class ManageAcceptDocLogic extends BaseLogic
$data = ManageAcceptDoc::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['accept_user'], $data['read_user']])->column('name', 'id');
$data['accept_user_name'] = $admin[$data['accept_user']] ?? '';
$data['read_user_name'] = $admin[$data['read_user']] ?? '';
return $data->toArray();
}
}

5
app/adminapi/logic/manage_communication/ManageInfoReportLogic.php
View File

@ -15,9 +15,10 @@
namespace app\adminapi\logic\manage_communication;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageInfoReport;
use app\common\logic\BaseLogic;
use think\facade\Db;
@ -125,6 +126,8 @@ class ManageInfoReportLogic extends BaseLogic
$project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['severity_text'] = $data->severity_text;
$admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty();
$data['giver_name'] = $admin?->name;
return $data->toArray();
}
}

6
app/adminapi/logic/manage_communication/ManageSendDocLogic.php
View File

@ -15,9 +15,10 @@
namespace app\adminapi\logic\manage_communication;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageSendDoc;
use app\common\logic\BaseLogic;
use think\facade\Db;
@ -120,6 +121,9 @@ class ManageSendDocLogic extends BaseLogic
$data = ManageSendDoc::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['send_user'], $data['accept_user']])->column('name', 'id');
$data['send_user_name'] = $admin[$data['send_user']] ?? '';
$data['accept_user_name'] = $admin[$data['accept_user']] ?? '';
return $data->toArray();
}
}

6
app/adminapi/logic/marketing/MarketingBranchFilingLogic.php
View File

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\marketing\MarketingBranchFiling;
use think\facade\Db;
@ -150,6 +151,11 @@
{
$data = MarketingBranchFiling::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$data['filing_type_text'] = $data->filing_type;
$admin = Admin::where('id', 'in', [$data['fddbr'], $data['jbr'], $data['fzr'], $data['jsfzr']])->column('name', 'id');
$data['fddbr_name'] = $admin[$data['fddbr']] ?? '';
$data['jbr_name'] = $admin[$data['jbr']] ?? '';
$data['fzr_name'] = $admin[$data['fzr']] ?? '';
$data['jsfzr_name'] = $admin[$data['jsfzr']] ?? '';
return $data->toArray();
}
}

3
app/adminapi/logic/marketing/MarketingCustomLogic.php
View File

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept;
use app\common\model\GeoCity;
use app\common\model\GeoProvince;
@ -214,6 +215,8 @@
$data['city_name'] = !$city->isEmpty() ? $city['city_name'] : '';
$data['important_level_text'] = $data->important_level_text;
$data['category_text'] = $data->category_text;
$admin = Admin::field('name')->where('id', $data['invoice_contact'])->findOrEmpty();
$data['invoice_contact_name'] = $admin?->name;
return $data->toArray();
}

3
app/adminapi/logic/marketing/MarketingProjectFilingDetailLogic.php
View File

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingProjectFiling;
use app\common\model\marketing\MarketingProjectFilingDetail;
@ -120,6 +121,8 @@
$data['filing_role_text'] = $data->filing_role_text;
$data['status'] = (string)$data['status'];
$data['status_text'] = $data->status_text;
$admin = Admin::field('name')->where('id', $data['filing_user'])->findOrEmpty();
$data['filing_user_name'] = $admin?->name;
return $data->toArray();
}
}

6
app/adminapi/logic/supervision_connect/SupervisionCompanyCheckLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_connect;
use app\common\model\supervision_connect\SupervisionCompanyCheck;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionCompanyCheck;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -144,6 +145,9 @@ class SupervisionCompanyCheckLogic extends BaseLogic
$data = SupervisionCompanyCheck::field('id,project_id,name,date,user,problem_name,problem_type,problem_desc,annex')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$admin = Admin::where('id', 'in', [$data['user'], $data['reply_user']])->column('name', 'id');
$data['user_name'] = $admin[$data['user']] ?? '';
$data['reply_user_name'] = $admin[$data['reply_user']] ?? '';
return $data->toArray();
}
}

5
app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_connect;
use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -127,6 +128,8 @@ class SupervisionProjectInfoReportLogic extends BaseLogic
$data['project_manager'] = $project['project_manager'];
$data['severity_text'] = $data->severity_text;
$data['info_cate_text'] = $data->info_cate_text;
$admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty();
$data['giver_name'] = $admin?->name;
return $data->toArray();
}
}

5
app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -119,10 +120,12 @@ class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
$data = SupervisionDangerousEngineeringCase::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['assessor'])->findOrEmpty();
$data['dangerous_engineering_monitoring_title'] = $project['project_name'];
$data['project_name'] = $project['project_name'];
$data['type'] = $dangerous_engineering_monitoring->type_text;
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
$data['assessor_name'] = $admin?->name;
return $data->toArray();
}
}

5
app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringConstructionLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -111,6 +112,7 @@ class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic
$data = SupervisionDangerousEngineeringConstruction::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project,planned_construction_time,position,project_characteristics,supervisor,responsible_person')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['notice_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['type'] = $dangerous_engineering_monitoring->type_text;
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
@ -120,6 +122,7 @@ class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic
$data['supervisor'] = $dangerous_engineering_monitoring['supervisor'];
$data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person'];
$data['is_notice_text'] = $data->is_notice_text;
$data['notice_user_name'] = $admin?->name;
return $data->toArray();
}
}

5
app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringEliminateLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -113,6 +114,7 @@ class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic
$data = SupervisionDangerousEngineeringEliminate::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project,planned_construction_time,position,project_characteristics,supervisor,responsible_person')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['eliminate_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['type'] = $dangerous_engineering_monitoring->type_text;
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
@ -122,6 +124,7 @@ class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic
$data['supervisor'] = $dangerous_engineering_monitoring['supervisor'];
$data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person'];
$data['is_notice_text'] = $data->is_notice_text;
$data['eliminate_user_name'] = $admin?->name;
return $data->toArray();
}
}

6
app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php
View File

@ -15,11 +15,12 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
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\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use think\facade\Db;
@ -139,10 +140,13 @@ class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
$data = SupervisionDangerousEngineeringMonitoring::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$node = SupervisionCheckItem::field('node_name')->where('id', $data['check_item_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['supervisor'], $data['responsible_person']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['node_name'] = $node['node_name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['type_text'] = $data->type_text;
$data['supervisor_name'] = $admin[$data['supervisor']] ?? '';
$data['responsible_person_name'] = $admin[$data['responsible_person']] ?? '';
return $data->toArray();
}
}

6
app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -141,6 +142,7 @@ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
{
$data = SupervisionExcessRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['is_discuss_text'] = $data->is_discuss_text;
@ -150,6 +152,8 @@ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
$data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text;
$data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text;
$data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text;
$data['check_user_name'] = $admin[$data['check_user']] ?? '';
$data['responsible_person_name'] = $admin[$data['responsible_person']] ?? '';
return $data->toArray();
}
}

6
app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -139,6 +140,7 @@ class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
{
$data = SupervisionHighRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['is_report_text'] = $data->is_report_text;
@ -147,6 +149,8 @@ class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
$data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text;
$data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text;
$data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text;
$data['check_user_name'] = $admin[$data['check_user']] ?? '';
$data['responsible_person_name'] = $admin[$data['responsible_person']] ?? '';
return $data->toArray();
}
}

5
app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecord;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
@ -178,11 +179,13 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
$data = SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['first_auditor'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['approval_type_text'] = $data->approval_type_text;
$data['first_audit_opinion_text'] = $data->first_audit_opinion_text;
$data['final_audit_opinion_text'] = $data->final_audit_opinion_text;
$data['first_auditor_name'] = $admin?->name;
return $data->toArray();
}
}

5
app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php
View File

@ -15,8 +15,9 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
@ -115,7 +116,9 @@ class SupervisionSafetyWarningSignLogic extends BaseLogic
{
$data = SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['check_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['check_user_name'] = $admin?->name;
return $data->toArray();
}
}

1
app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php
View File

@ -131,6 +131,7 @@
$data['project_name'] = $project['project_name'];
$data['emcee_name'] = $admin[$data['emcee']] ?? '';
$data['recorder_name'] = $admin[$data['recorder']] ?? '';
$data['attendees_name'] = implode(',', $attendees);
return $data->toArray();
}
}