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

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic;
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\consult_basic\ConsultProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 项目咨询--新开工项目管理列表
* Class ConsultNewStartProjectLists
* @package app\adminapi\listsconsult_basic
*/
class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSearchInterface
{
class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -60,9 +61,13 @@ class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSea
->field(['id', 'project_id', 'address', 'service_scope', 'area', 'invest', 'basic_type', 'duration'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = ConsultProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
}
@ -79,4 +84,4 @@ class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSea
return ConsultNewStartProject::where($this->searchWhere)->count();
}
}
}

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

@ -12,21 +12,22 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic;
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\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectEvolve;
/**
/**
* 项目咨询--项目组工作开展情况列表
* Class ConsultProjectEvolveLists
* @package app\adminapi\listsconsult_basic
*/
class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearchInterface
{
class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -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();
}
@ -74,4 +78,4 @@ class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearc
return ConsultProjectEvolve::where($this->searchWhere)->count();
}
}
}

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

@ -12,21 +12,22 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic;
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\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProject;
/**
/**
* 基本信息列表
* Class ConsultProjectLists
* @package app\adminapi\listsconsult_basic
*/
class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInterface
{
class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -58,7 +59,7 @@ class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInter
->field(['id', 'project_name', 'project_code', 'company', 'total_investment', 'contract', 'engineering_status', 'consult_type', 'supervision_department', 'implementation_department', 'project_manager'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
->select()->each(function ($data) {
$data['engineering_status_text'] = $data->engineering_status_text;
$data['consult_type_text'] = $data->consult_type_text;
$data['project_manager_name'] = $data->project_manager_name_text;
@ -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();
@ -83,4 +86,4 @@ class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInter
return ConsultProject::where($this->searchWhere)->count();
}
}
}

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

@ -12,21 +12,22 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic;
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\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectPreparation;
/**
/**
* 项目咨询--项目组后勤准备工作列表
* Class ConsultProjectPreparationLists
* @package app\adminapi\listsconsult_basic
*/
class ConsultProjectPreparationLists extends BaseAdminDataLists implements ListsSearchInterface
{
class ConsultProjectPreparationLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -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();
}
@ -74,4 +78,4 @@ class ConsultProjectPreparationLists extends BaseAdminDataLists implements Lists
return ConsultProjectPreparation::where($this->searchWhere)->count();
}
}
}

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'];

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\manage_communication;
namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageAcceptDoc;
use app\common\lists\ListsSearchInterface;
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;
/**
/**
* 项目管理--收文管理列表
* Class ManageAcceptDocLists
* @package app\adminapi\listsmanage_communication
*/
class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInterface
{
class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -58,18 +59,21 @@ class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInte
{
$params = $this->request->get();
$condition = [];
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){
if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){
$condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]];
if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) {
$condition[] = ['send_date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]];
}
}
return ManageAcceptDoc::where($this->searchWhere)->where($condition)
->field(['id', 'project_id', 'abstract', 'send_company', 'send_date', 'accept_user', 'accept_date'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
}
@ -85,12 +89,12 @@ class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInte
{
$params = $this->request->get();
$condition = [];
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){
if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){
$condition[] = ['date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]];
if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) {
$condition[] = ['date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]];
}
}
return ManageAcceptDoc::where($this->searchWhere)->where($condition)->count();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\manage_communication;
namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageInfoReport;
use app\common\lists\ListsSearchInterface;
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;
/**
/**
* 项目管理--项目信息上报列表
* Class ManageInfoReportLists
* @package app\adminapi\listsmanage_communication
*/
class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface
{
class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -60,11 +61,13 @@ class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInt
->field(['id', 'project_id', 'abstract', 'happen_date', 'severity', 'info_cate', 'giver'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$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();
}
@ -81,4 +84,4 @@ class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInt
return ManageInfoReport::where($this->searchWhere)->count();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\manage_communication;
namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageSendDoc;
use app\common\lists\ListsSearchInterface;
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;
/**
/**
* 项目管理--发文管理列表
* Class ManageSendDocLists
* @package app\adminapi\listsmanage_communication
*/
class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterface
{
class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -58,18 +59,21 @@ class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterf
{
$params = $this->request->get();
$condition = [];
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){
if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){
$condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]];
if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) {
$condition[] = ['send_date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]];
}
}
return ManageSendDoc::where($this->searchWhere)->where($condition)
->field(['id', 'project_id', 'code', 'abstract', 'send_date', 'send_company', 'send_user', 'accept_user', 'remark'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
}
@ -85,12 +89,12 @@ class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterf
{
$params = $this->request->get();
$condition = [];
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){
if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){
$condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]];
if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) {
$condition[] = ['send_date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]];
}
}
return ManageSendDoc::where($this->searchWhere)->where($condition)->count();
}
}
}

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

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_connect;
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\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 工程监理--公司检查列表
* Class SupervisionCompanyCheckLists
* @package app\adminapi\listssupervision_connect
*/
class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -60,9 +61,12 @@ class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSe
->field(['id', 'project_id', 'name', 'date', 'user', 'problem_name', 'problem_type', 'problem_desc', 'reply_user', 'reply_date', 'reply_content', 'review_opinions'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
}
@ -79,4 +83,4 @@ class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSe
return SupervisionCompanyCheck::where($this->searchWhere)->count();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_connect;
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\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 工程监理--项目重大信息上报列表
* Class SupervisionProjectInfoReportLists
* @package app\adminapi\listssupervision_connect
*/
class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -59,12 +60,14 @@ class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements Li
return SupervisionProjectInfoReport::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name,project_manager')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$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();
}
@ -81,4 +84,4 @@ class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements Li
return SupervisionProjectInfoReport::where($this->searchWhere)->count();
}
}
}

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

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
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\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
/**
/**
* 工程监理--危大方案提交列表列表
* Class SupervisionDangerousEngineeringCaseLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -61,12 +62,14 @@ class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implem
->field(['id', 'dangerous_engineering_monitoring_id', 'case_name', 'assessor'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->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();
->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();
}
@ -83,4 +86,4 @@ class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implem
return SupervisionDangerousEngineeringCase::where($this->searchWhere)->count();
}
}
}

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

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 工程监理--危大工程施工列表列表
* Class SupervisionDangerousEngineeringConstructionLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -61,14 +62,16 @@ class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataList
->field(['id', 'dangerous_engineering_monitoring_id', 'actual_construction_date', 'is_notice', 'notice_user'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->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();
->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();
}
@ -85,4 +88,4 @@ class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataList
return SupervisionDangerousEngineeringConstruction::where($this->searchWhere)->count();
}
}
}

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

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 工程监理--危大工程消除列表列表
* Class SupervisionDangerousEngineeringEliminateLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -61,13 +62,15 @@ class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists i
->field(['id', 'dangerous_engineering_monitoring_id', 'eliminate_date', 'eliminate_user', 'is_notice'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->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();
->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();
}
@ -84,4 +87,4 @@ class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists i
return SupervisionDangerousEngineeringEliminate::where($this->searchWhere)->count();
}
}
}

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

@ -12,25 +12,26 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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;
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\model\supervision_project\SupervisionProject;
/**
/**
* 工程监理--危大工程监控列表
* Class SupervisionDangerousEngineeringMonitoringLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -63,19 +64,22 @@ class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists
->field(['id', 'project_id', 'type', 'partial_project', 'planned_construction_time', 'position'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
$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();
$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();
$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'] : '';
})
@ -94,4 +98,4 @@ class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists
return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)->count();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 工程监理--超规模危险性较大工程安全监控列表
* Class SupervisionExcessRiskSecurityMonitoringLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -60,10 +61,13 @@ class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists im
->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time', 'actual_construction_time', 'problems_rectification'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
}
@ -80,4 +84,4 @@ class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists im
return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)->count();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 工程监理--危险性较大的工程安全监控列表
* Class SupervisionHighRiskSecurityMonitoringLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -59,10 +60,13 @@ class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists impl
->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
}
@ -79,4 +83,4 @@ class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists impl
return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)->count();
}
}
}

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

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 大型机械设备及仪器台账列表
* Class SupervisionLargeMechanicalEquipmentLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -60,14 +61,16 @@ class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implem
return SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->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();
->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();
}
@ -84,4 +87,4 @@ class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implem
return SupervisionLargeMechanicalEquipment::where($this->searchWhere)->count();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous;
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\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
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;
/**
/**
* 工程监理--现场安全警示标志列表
* Class SupervisionSafetyWarningSignLists
* @package app\adminapi\listssupervision_dangerous
*/
class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -59,9 +60,11 @@ class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements Li
return SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
}
@ -78,4 +81,4 @@ class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements Li
return SupervisionSafetyWarningSign::where($this->searchWhere)->count();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMeetingMinutes;
use app\common\lists\ListsSearchInterface;
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;
/**
/**
* 工程监理--会议纪要列表
* Class SupervisionMeetingMinutesLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -59,8 +60,13 @@ class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements Lists
return SupervisionMeetingMinutes::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->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();
@ -78,4 +84,4 @@ class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements Lists
return SupervisionMeetingMinutes::where($this->searchWhere)->count();
}
}
}

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

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\consult_basic;
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultNewStartProject;
use app\common\logic\BaseLogic;
use app\common\model\consult_basic\ConsultProject;
use app\common\model\consult_basic\ConsultProjectEvolve;
use app\common\model\consult_basic\ConsultProjectPreparation;
use think\facade\Db;
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;
use think\facade\Db;
/**
/**
* 项目咨询--新开工项目管理逻辑
* Class ConsultNewStartProjectLogic
* @package app\adminapi\logic\consult_basic
*/
class ConsultNewStartProjectLogic extends BaseLogic
{
class ConsultNewStartProjectLogic extends BaseLogic
{
/**
@ -69,8 +70,8 @@ class ConsultNewStartProjectLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['evolve'])) {
foreach($params['evolve'] as $v) {
if (!empty($params['evolve'])) {
foreach ($params['evolve'] as $v) {
ConsultProjectEvolve::create([
'new_start_project_id' => $res->id,
'name' => $v['name'],
@ -79,8 +80,8 @@ class ConsultNewStartProjectLogic extends BaseLogic
]);
}
}
if(!empty($params['preparation'])) {
foreach($params['preparation'] as $v) {
if (!empty($params['preparation'])) {
foreach ($params['preparation'] as $v) {
ConsultProjectPreparation::create([
'new_start_project_id' => $res->id,
'name' => $v['name'],
@ -136,16 +137,16 @@ class ConsultNewStartProjectLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['evolve'])) {
foreach($params['evolve'] as $v) {
if(!empty($v['id'])){
ConsultProjectEvolve::where('id',$v['id'])->update([
if (!empty($params['evolve'])) {
foreach ($params['evolve'] as $v) {
if (!empty($v['id'])) {
ConsultProjectEvolve::where('id', $v['id'])->update([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
}else{
} else {
ConsultProjectEvolve::create([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
@ -155,16 +156,16 @@ class ConsultNewStartProjectLogic extends BaseLogic
}
}
}
if(!empty($params['preparation'])) {
foreach($params['preparation'] as $v) {
if(!empty($v['id'])){
ConsultProjectPreparation::where('id',$v['id'])->update([
if (!empty($params['preparation'])) {
foreach ($params['preparation'] as $v) {
if (!empty($v['id'])) {
ConsultProjectPreparation::where('id', $v['id'])->update([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
}else{
} else {
ConsultProjectPreparation::create([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
@ -193,13 +194,13 @@ class ConsultNewStartProjectLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$evolve = ConsultProjectEvolve::where('new_start_project_id','in',$params['id'])->findOrEmpty();
if(!$evolve->isEmpty()){
$evolve = ConsultProjectEvolve::where('new_start_project_id', 'in', $params['id'])->findOrEmpty();
if (!$evolve->isEmpty()) {
self::setError('此数据下存在项目组工作开展情况数据,须先删除项目组工作开展情况数据');
return false;
}
$preparation = ConsultProjectPreparation::where('new_start_project_id','in',$params['id'])->findOrEmpty();
if(!$preparation->isEmpty()){
$preparation = ConsultProjectPreparation::where('new_start_project_id', 'in', $params['id'])->findOrEmpty();
if (!$preparation->isEmpty()) {
self::setError('此数据下存在项目组后勤准备工作数据,须先删除项目组后勤准备工作数据');
return false;
}
@ -217,8 +218,12 @@ class ConsultNewStartProjectLogic extends BaseLogic
public static function detail($params): array
{
$data = ConsultNewStartProject::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = ConsultProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$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();
}
}
}

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

@ -12,21 +12,22 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\consult_basic;
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultProjectEvolve;
use app\common\logic\BaseLogic;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectEvolve;
use think\facade\Db;
/**
/**
* 项目咨询--项目组工作开展情况逻辑
* Class ConsultProjectEvolveLogic
* @package app\adminapi\logic\consult_basic
*/
class ConsultProjectEvolveLogic extends BaseLogic
{
class ConsultProjectEvolveLogic extends BaseLogic
{
/**
@ -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();
}
}
}

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

@ -12,35 +12,36 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\consult_basic;
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultProject;
use app\common\logic\BaseLogic;
use app\common\model\consult_build\ConsultAccept;
use app\common\model\consult_build\ConsultSceneExecute;
use app\common\model\consult_build\ConsultSceneOrg;
use app\common\model\consult_build\ConsultScenePrepare;
use app\common\model\consult_strategy\ConsultContract;
use app\common\model\consult_strategy\ConsultCost;
use app\common\model\consult_strategy\ConsultDeclare;
use app\common\model\consult_strategy\ConsultDesign;
use app\common\model\consult_strategy\ConsultProcure;
use app\common\model\consult_target\ConsultControl;
use app\common\model\consult_target\ConsultDecision;
use app\common\model\consult_target\ConsultDemand;
use app\common\model\consult_target\ConsultReceive;
use app\common\model\marketing\MarketingContract;
use think\facade\Db;
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;
use app\common\model\consult_build\ConsultScenePrepare;
use app\common\model\consult_strategy\ConsultContract;
use app\common\model\consult_strategy\ConsultCost;
use app\common\model\consult_strategy\ConsultDeclare;
use app\common\model\consult_strategy\ConsultDesign;
use app\common\model\consult_strategy\ConsultProcure;
use app\common\model\consult_target\ConsultControl;
use app\common\model\consult_target\ConsultDecision;
use app\common\model\consult_target\ConsultDemand;
use app\common\model\consult_target\ConsultReceive;
use app\common\model\marketing\MarketingContract;
use think\facade\Db;
/**
/**
* 基本信息逻辑
* Class ConsultProjectLogic
* @package app\adminapi\logic\consult_basic
*/
class ConsultProjectLogic extends BaseLogic
{
class ConsultProjectLogic extends BaseLogic
{
/**
@ -165,80 +166,80 @@ class ConsultProjectLogic extends BaseLogic
public static function delete(array $params): bool
{
//决策管理信息
$decision = ConsultDecision::where('project_id','in',$params['id'])->findOrEmpty();
if($decision->isEmpty()){
$decision = ConsultDecision::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($decision->isEmpty()) {
self::setError('此数据关联了决策管理信息,需删除决策管理信息');
return false;
}
//需求研究及管理
$demand = ConsultDemand::where('project_id','in',$params['id'])->findOrEmpty();
if($demand->isEmpty()){
$demand = ConsultDemand::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($demand->isEmpty()) {
self::setError('此数据关联了需求研究管理信息,需删除需求研究管理信息');
return false;
}
//总控管理
$control = ConsultControl::where('project_id','in',$params['id'])->findOrEmpty();
if($control->isEmpty()){
$control = ConsultControl::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($control->isEmpty()) {
self::setError('此数据关联了总控管理信息,需删除总控管理信息');
return false;
}
//接收管理
$receive = ConsultReceive::where('project_id','in',$params['id'])->findOrEmpty();
if($receive->isEmpty()){
$receive = ConsultReceive::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($receive->isEmpty()) {
self::setError('此数据关联了接收管理信息,需删除接收管理信息');
return false;
}
//报建管理
$declare = ConsultDeclare::where('project_id','in',$params['id'])->findOrEmpty();
if($declare->isEmpty()){
$declare = ConsultDeclare::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($declare->isEmpty()) {
self::setError('此数据关联了报建管理信息,需删除报建管理信息');
return false;
}
//招采管理
$procure = ConsultProcure::where('project_id','in',$params['id'])->findOrEmpty();
if($procure->isEmpty()){
$procure = ConsultProcure::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($procure->isEmpty()) {
self::setError('此数据关联了招采管理信息,需删除招采管理信息');
return false;
}
//合同管理
$contract = ConsultContract::where('project_id','in',$params['id'])->findOrEmpty();
if($contract->isEmpty()){
$contract = ConsultContract::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($contract->isEmpty()) {
self::setError('此数据关联了合同管理信息,需删除合同管理信息');
return false;
}
//造价管理
$cost = ConsultCost::where('project_id','in',$params['id'])->findOrEmpty();
if($cost->isEmpty()){
$cost = ConsultCost::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($cost->isEmpty()) {
self::setError('此数据关联了造价管理信息,需删除造价管理信息');
return false;
}
//设计管理
$design = ConsultDesign::where('project_id','in',$params['id'])->findOrEmpty();
if($design->isEmpty()){
$design = ConsultDesign::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($design->isEmpty()) {
self::setError('此数据关联了设计管理信息,需删除设计管理信息');
return false;
}
//现场准备
$scene_prepare = ConsultScenePrepare::where('project_id','in',$params['id'])->findOrEmpty();
if($scene_prepare->isEmpty()){
$scene_prepare = ConsultScenePrepare::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($scene_prepare->isEmpty()) {
self::setError('此数据关联了现场准备信息,需删除现场准备信息');
return false;
}
//现场组织建设
$scene_org = ConsultSceneOrg::where('project_id','in',$params['id'])->findOrEmpty();
if($scene_org->isEmpty()){
$scene_org = ConsultSceneOrg::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($scene_org->isEmpty()) {
self::setError('此数据关联了现场组织建设信息,需删除现场组织建设信息');
return false;
}
//现场实施管理
$scene_execute = ConsultSceneExecute::where('project_id','in',$params['id'])->findOrEmpty();
if($scene_execute->isEmpty()){
$scene_execute = ConsultSceneExecute::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($scene_execute->isEmpty()) {
self::setError('此数据关联了现场实施管理信息,需删除现场实施管理信息');
return false;
}
//验收管理
$accept = ConsultAccept::where('project_id','in',$params['id'])->findOrEmpty();
if($accept->isEmpty()){
$accept = ConsultAccept::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($accept->isEmpty()) {
self::setError('此数据关联了验收管理信息,需删除验收管理信息');
return false;
}
@ -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();
}
@ -278,10 +281,10 @@ class ConsultProjectLogic extends BaseLogic
{
$datas = ConsultProject::field(['id', 'project_name'])
->order(['id' => 'desc'])
->select()->each(function($data){
->select()->each(function ($data) {
$data['projectinfo'] = 'ID：' . $data['id'] . ' / 名称：' . $data['project_name'];
})
->toArray();
return $datas;
}
}
}

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

@ -12,21 +12,22 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\consult_basic;
namespace app\adminapi\logic\consult_basic;
use app\common\model\consult_basic\ConsultProjectPreparation;
use app\common\logic\BaseLogic;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProjectPreparation;
use think\facade\Db;
/**
/**
* 项目咨询--项目组后勤准备工作逻辑
* Class ConsultProjectPreparationLogic
* @package app\adminapi\logic\consult_basic
*/
class ConsultProjectPreparationLogic extends BaseLogic
{
class ConsultProjectPreparationLogic extends BaseLogic
{
/**
@ -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();
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\manage_communication;
namespace app\adminapi\logic\manage_communication;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageAcceptDoc;
use app\common\logic\BaseLogic;
use think\facade\Db;
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 think\facade\Db;
/**
/**
* 项目管理--收文管理逻辑
* Class ManageAcceptDocLogic
* @package app\adminapi\logic\manage_communication
*/
class ManageAcceptDocLogic extends BaseLogic
{
class ManageAcceptDocLogic extends BaseLogic
{
/**
@ -120,8 +121,11 @@ class ManageAcceptDocLogic extends BaseLogic
public static function detail($params): array
{
$data = ManageAcceptDoc::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$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();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\manage_communication;
namespace app\adminapi\logic\manage_communication;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageInfoReport;
use app\common\logic\BaseLogic;
use think\facade\Db;
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 think\facade\Db;
/**
/**
* 项目管理--项目信息上报逻辑
* Class ManageInfoReportLogic
* @package app\adminapi\logic\manage_communication
*/
class ManageInfoReportLogic extends BaseLogic
{
class ManageInfoReportLogic extends BaseLogic
{
/**
@ -122,9 +123,11 @@ class ManageInfoReportLogic extends BaseLogic
public static function detail($params): array
{
$data = ManageInfoReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$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();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\manage_communication;
namespace app\adminapi\logic\manage_communication;
use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageSendDoc;
use app\common\logic\BaseLogic;
use think\facade\Db;
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 think\facade\Db;
/**
/**
* 项目管理--发文管理逻辑
* Class ManageSendDocLogic
* @package app\adminapi\logic\manage_communication
*/
class ManageSendDocLogic extends BaseLogic
{
class ManageSendDocLogic extends BaseLogic
{
/**
@ -118,8 +119,11 @@ class ManageSendDocLogic extends BaseLogic
public static function detail($params): array
{
$data = ManageSendDoc::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$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();
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_connect;
namespace app\adminapi\logic\supervision_connect;
use app\common\model\supervision_connect\SupervisionCompanyCheck;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--公司检查逻辑
* Class SupervisionCompanyCheckLogic
* @package app\adminapi\logic\supervision_connect
*/
class SupervisionCompanyCheckLogic extends BaseLogic
{
class SupervisionCompanyCheckLogic extends BaseLogic
{
/**
@ -142,8 +143,11 @@ class SupervisionCompanyCheckLogic extends BaseLogic
public static function detail($params): array
{
$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();
$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();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_connect;
namespace app\adminapi\logic\supervision_connect;
use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--项目重大信息上报逻辑
* Class SupervisionProjectInfoReportLogic
* @package app\adminapi\logic\supervision_connect
*/
class SupervisionProjectInfoReportLogic extends BaseLogic
{
class SupervisionProjectInfoReportLogic extends BaseLogic
{
/**
@ -122,11 +123,13 @@ class SupervisionProjectInfoReportLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionProjectInfoReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name,project_manager')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$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();
}
}
}

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

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\logic\BaseLogic;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--危大方案提交列表逻辑
* Class SupervisionDangerousEngineeringCaseLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
{
class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
{
/**
@ -117,12 +118,14 @@ class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
public static function detail($params): array
{
$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();
$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();
}
}
}

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

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\logic\BaseLogic;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--危大工程施工列表逻辑
* Class SupervisionDangerousEngineeringConstructionLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic
{
class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic
{
/**
@ -109,8 +110,9 @@ class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic
public static function detail($params): array
{
$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();
$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();
}
}
}

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

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\logic\BaseLogic;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--危大工程消除列表逻辑
* Class SupervisionDangerousEngineeringEliminateLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic
{
class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic
{
/**
@ -111,8 +112,9 @@ class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic
public static function detail($params): array
{
$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();
$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();
}
}
}

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

@ -12,26 +12,27 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
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;
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\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use think\facade\Db;
/**
/**
* 工程监理--危大工程监控逻辑
* Class SupervisionDangerousEngineeringMonitoringLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
{
class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
{
/**
@ -108,18 +109,18 @@ class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$case = SupervisionDangerousEngineeringCase::where('dangerous_engineering_monitoring_id','in',$params['id'])->findOrEmpty();
if(!$case->isEmpty()){
$case = SupervisionDangerousEngineeringCase::where('dangerous_engineering_monitoring_id', 'in', $params['id'])->findOrEmpty();
if (!$case->isEmpty()) {
self::setError('当前数据下存在危大方案提交信息,须先删除危大方案提交信息');
return false;
}
$eliminate = SupervisionDangerousEngineeringEliminate::where('dangerous_engineering_monitoring_id','in',$params['id'])->findOrEmpty();
if(!$eliminate->isEmpty()){
$eliminate = SupervisionDangerousEngineeringEliminate::where('dangerous_engineering_monitoring_id', 'in', $params['id'])->findOrEmpty();
if (!$eliminate->isEmpty()) {
self::setError('当前数据下存在危大工程消除信息,须先删除危大工程消除信息');
return false;
}
$construction = SupervisionDangerousEngineeringConstruction::where('dangerous_engineering_monitoring_id','in',$params['id'])->findOrEmpty();
if(!$construction->isEmpty()){
$construction = SupervisionDangerousEngineeringConstruction::where('dangerous_engineering_monitoring_id', 'in', $params['id'])->findOrEmpty();
if (!$construction->isEmpty()) {
self::setError('当前数据下存在危大工程施工信息,须先删除危大工程施工信息');
return false;
}
@ -137,12 +138,15 @@ class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
public static function detail($params): array
{
$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();
$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();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--超规模危险性较大工程安全监控逻辑
* Class SupervisionExcessRiskSecurityMonitoringLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
{
class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
{
/**
@ -140,7 +141,8 @@ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionExcessRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$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();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--危险性较大的工程安全监控逻辑
* Class SupervisionHighRiskSecurityMonitoringLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
{
class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
{
/**
@ -138,7 +139,8 @@ class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionHighRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$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();
}
}
}

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

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
use app\common\logic\BaseLogic;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecord;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
use think\facade\Db;
/**
/**
* 大型机械设备及仪器台账逻辑
* Class SupervisionLargeMechanicalEquipmentLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
{
class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
{
/**
@ -62,8 +63,8 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null
]);
if(!empty($params['maintenance_record'])){
foreach($params['maintenance_record'] as $v){
if (!empty($params['maintenance_record'])) {
foreach ($params['maintenance_record'] as $v) {
SupervisionLargeMechanicalEquipmentMaintenanceRecord::create([
'large_mechanical_equipment_id' => $res->id,
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
@ -114,10 +115,10 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'update_time' => time()
]);
if(!empty($params['maintenance_record'])){
foreach($params['maintenance_record'] as $v){
if(!empty($v['id'])){
SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('id',$v['id'])->update([
if (!empty($params['maintenance_record'])) {
foreach ($params['maintenance_record'] as $v) {
if (!empty($v['id'])) {
SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('id', $v['id'])->update([
'large_mechanical_equipment_id' => $params['id'],
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
'month_warranty_file' => $v['month_warranty_file'],
@ -126,7 +127,7 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
'accessory_two_validity' => !empty($v['accessory_two_validity']) ? strtotime($v['accessory_two_validity']) : 0,
'update_time' => time()
]);
}else{
} else {
SupervisionLargeMechanicalEquipmentMaintenanceRecord::create([
'large_mechanical_equipment_id' => $params['id'],
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
@ -157,8 +158,8 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$maintenance_record = SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('large_mechanical_equipment_id','in',$params['id'])->findOrEmpty();
if(!$maintenance_record->isEmpty()){
$maintenance_record = SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('large_mechanical_equipment_id', 'in', $params['id'])->findOrEmpty();
if (!$maintenance_record->isEmpty()) {
self::setError('当前数据下存在机械维修保养记录,请先删除机械维修保养记录数据');
return false;
}
@ -176,13 +177,15 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
public static function detail($params): array
{
$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();
$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();
}
}
}

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

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_dangerous;
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
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;
/**
/**
* 工程监理--现场安全警示标志逻辑
* Class SupervisionSafetyWarningSignLogic
* @package app\adminapi\logic\supervision_dangerous
*/
class SupervisionSafetyWarningSignLogic extends BaseLogic
{
class SupervisionSafetyWarningSignLogic extends BaseLogic
{
/**
@ -114,8 +115,10 @@ class SupervisionSafetyWarningSignLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$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();
}
}