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

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

@ -11,72 +11,77 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic; namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultNewStartProject; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProject; use app\common\model\consult_basic\ConsultNewStartProject;
use app\common\model\consult_basic\ConsultProject;
/**
* 项目咨询--新开工项目管理列表 /**
* Class ConsultNewStartProjectLists * 项目咨询--新开工项目管理列表
* @package app\adminapi\listsconsult_basic * Class ConsultNewStartProjectLists
*/ * @package app\adminapi\listsconsult_basic
class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id'], return [
'%like%' => ['address', 'service_scope', 'basic_type', 'duration'], '=' => ['project_id'],
]; '%like%' => ['address', 'service_scope', 'basic_type', 'duration'],
} ];
}
/**
* @notes 获取项目咨询--新开工项目管理列表 /**
* @return array * @notes 获取项目咨询--新开工项目管理列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public function lists(): array */
{ public function lists(): array
return ConsultNewStartProject::where($this->searchWhere) {
->field(['id', 'project_id', 'address', 'service_scope', 'area', 'invest', 'basic_type', 'duration']) return ConsultNewStartProject::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'address', 'service_scope', 'area', 'invest', 'basic_type', 'duration'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = ConsultProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = ConsultProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
}) $data['project_name'] = $project['project_name'];
->toArray(); $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']] ?? '';
/** })
* @notes 获取项目咨询--新开工项目管理数量 ->toArray();
* @return int }
* @author likeadmin
* @date 2024/03/11 10:27
*/ /**
public function count(): int * @notes 获取项目咨询--新开工项目管理数量
{ * @return int
return ConsultNewStartProject::where($this->searchWhere)->count(); * @author likeadmin
} * @date 2024/03/11 10:27
*/
} public function count(): int
{
return ConsultNewStartProject::where($this->searchWhere)->count();
}
}

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

@ -11,67 +11,71 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic; namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultProjectEvolve; use app\common\lists\ListsSearchInterface;
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
*/ * @package app\adminapi\listsconsult_basic
class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['new_start_project_id'], return [
]; '=' => ['new_start_project_id'],
} ];
}
/**
* @notes 获取项目咨询--项目组工作开展情况列表 /**
* @return array * @notes 获取项目咨询--项目组工作开展情况列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public function lists(): array */
{ public function lists(): array
return ConsultProjectEvolve::where($this->searchWhere) {
->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user']) return ConsultProjectEvolve::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select() ->order(['id' => 'desc'])
->toArray(); ->select()->each(function ($data) {
} $admin = Admin::field('name')->where('id', $data['resp_user'])->findOrEmpty();
$data['resp_user_name'] = $admin?->name;
})
/** ->toArray();
* @notes 获取项目咨询--项目组工作开展情况数量 }
* @return int
* @author likeadmin
* @date 2024/03/11 10:27 /**
*/ * @notes 获取项目咨询--项目组工作开展情况数量
public function count(): int * @return int
{ * @author likeadmin
return ConsultProjectEvolve::where($this->searchWhere)->count(); * @date 2024/03/11 10:27
} */
public function count(): int
} {
return ConsultProjectEvolve::where($this->searchWhere)->count();
}
}

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

@ -11,76 +11,79 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic; namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultProject; use app\common\lists\ListsSearchInterface;
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
*/ * @package app\adminapi\listsconsult_basic
class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/11 09:25 * @author likeadmin
*/ * @date 2024/03/11 09:25
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'%like%' => ['project_name', 'project_code', 'company', 'contract'], return [
]; '%like%' => ['project_name', 'project_code', 'company', 'contract'],
} ];
}
/**
* @notes 获取基本信息列表 /**
* @return array * @notes 获取基本信息列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/11 09:25 * @author likeadmin
*/ * @date 2024/03/11 09:25
public function lists(): array */
{ public function lists(): array
return ConsultProject::where($this->searchWhere) {
->field(['id', 'project_name', 'project_code', 'company', 'total_investment', 'contract', 'engineering_status', 'consult_type', 'supervision_department', 'implementation_department', 'project_manager']) return ConsultProject::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_name', 'project_code', 'company', 'total_investment', 'contract', 'engineering_status', 'consult_type', 'supervision_department', 'implementation_department', 'project_manager'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$data['engineering_status_text'] = $data->engineering_status_text; ->select()->each(function ($data) {
$data['consult_type_text'] = $data->consult_type_text; $data['engineering_status_text'] = $data->engineering_status_text;
$data['project_manager_name'] = $data->project_manager_name_text; $data['consult_type_text'] = $data->consult_type_text;
$data['implementation_department_name'] = $data->implementation_department_name_text; $data['project_manager_name'] = $data->project_manager_name_text;
$data['supervision_department_name'] = $data->supervision_department_name_text; $data['implementation_department_name'] = $data->implementation_department_name_text;
$data['contract_name'] = $data->contract_name_text; $data['supervision_department_name'] = $data->supervision_department_name_text;
$data['company_name'] = $data->company_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();
->toArray(); $data['consult_user_name'] = $admin?->name;
}
})
->toArray();
/** }
* @notes 获取基本信息数量
* @return int
* @author likeadmin /**
* @date 2024/03/11 09:25 * @notes 获取基本信息数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/11 09:25
return ConsultProject::where($this->searchWhere)->count(); */
} public function count(): int
{
} return ConsultProject::where($this->searchWhere)->count();
}
}

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

@ -11,67 +11,71 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\consult_basic; namespace app\adminapi\lists\consult_basic;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\consult_basic\ConsultProjectPreparation; use app\common\lists\ListsSearchInterface;
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
*/ * @package app\adminapi\listsconsult_basic
class ConsultProjectPreparationLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class ConsultProjectPreparationLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['new_start_project_id'], return [
]; '=' => ['new_start_project_id'],
} ];
}
/**
* @notes 获取项目咨询--项目组后勤准备工作列表 /**
* @return array * @notes 获取项目咨询--项目组后勤准备工作列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public function lists(): array */
{ public function lists(): array
return ConsultProjectPreparation::where($this->searchWhere) {
->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user']) return ConsultProjectPreparation::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select() ->order(['id' => 'desc'])
->toArray(); ->select()->each(function ($data) {
} $admin = Admin::field('name')->where('id', $data['resp_user'])->findOrEmpty();
$data['resp_user_name'] = $admin?->name;
})
/** ->toArray();
* @notes 获取项目咨询--项目组后勤准备工作数量 }
* @return int
* @author likeadmin
* @date 2024/03/11 10:27 /**
*/ * @notes 获取项目咨询--项目组后勤准备工作数量
public function count(): int * @return int
{ * @author likeadmin
return ConsultProjectPreparation::where($this->searchWhere)->count(); * @date 2024/03/11 10:27
} */
public function count(): int
} {
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\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialCollectionPlan; use app\common\model\financial\FinancialCollectionPlan;
use app\common\model\marketing\MarketingContract; use app\common\model\marketing\MarketingContract;
@ -72,6 +73,8 @@
$data['business_nature'] = $contract?->business_nature_text; $data['business_nature'] = $contract?->business_nature_text;
$data['signed_amount'] = $contract?->signed_amount; $data['signed_amount'] = $contract?->signed_amount;
$data['signed_date'] = $contract?->create_time; $data['signed_date'] = $contract?->create_time;
$admin = Admin::field('name')->where('id', $data['collection_user'])->findOrEmpty();
$data['collection_user_name'] = $admin?->name;
}) })
->toArray(); ->toArray();
} }

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

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialRefund;
use app\common\model\marketing\MarketingContract; use app\common\model\marketing\MarketingContract;
@ -66,6 +67,8 @@
->select()->each(function ($data) { ->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(); $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(); $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_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];

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

@ -11,86 +11,90 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\manage_communication; namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\manage_basic\ManageProject; use app\common\lists\ListsSearchInterface;
use app\common\model\manage_communication\ManageAcceptDoc; use app\common\model\auth\Admin;
use app\common\lists\ListsSearchInterface; use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageAcceptDoc;
/**
* 项目管理--收文管理列表 /**
* Class ManageAcceptDocLists * 项目管理--收文管理列表
* @package app\adminapi\listsmanage_communication * Class ManageAcceptDocLists
*/ * @package app\adminapi\listsmanage_communication
class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/07 16:46 * @author likeadmin
*/ * @date 2024/03/07 16:46
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id'], return [
'%like%' => ['send_company', 'accept_user'], '=' => ['project_id'],
]; '%like%' => ['send_company', 'accept_user'],
} ];
}
/**
* @notes 获取项目管理--收文管理列表 /**
* @return array * @notes 获取项目管理--收文管理列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/07 16:46 * @author likeadmin
*/ * @date 2024/03/07 16:46
public function lists(): array */
{ public function lists(): array
$params = $this->request->get(); {
$condition = []; $params = $this->request->get();
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ $condition = [];
if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){ if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
$condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]]; 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']) return ManageAcceptDoc::where($this->searchWhere)->where($condition)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'abstract', 'send_company', 'send_date', 'accept_user', 'accept_date'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
}) $data['project_name'] = $project['project_name'];
->toArray(); $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();
* @notes 获取项目管理--收文管理数量 }
* @return int
* @author likeadmin
* @date 2024/03/07 16:46 /**
*/ * @notes 获取项目管理--收文管理数量
public function count(): int * @return int
{ * @author likeadmin
$params = $this->request->get(); * @date 2024/03/07 16:46
$condition = []; */
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ public function count(): int
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')]]; $params = $this->request->get();
} $condition = [];
} if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
return ManageAcceptDoc::where($this->searchWhere)->where($condition)->count(); 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();
}
}

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

@ -11,74 +11,77 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\manage_communication; namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\manage_basic\ManageProject; use app\common\lists\ListsSearchInterface;
use app\common\model\manage_communication\ManageInfoReport; use app\common\model\auth\Admin;
use app\common\lists\ListsSearchInterface; use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageInfoReport;
/**
* 项目管理--项目信息上报列表 /**
* Class ManageInfoReportLists * 项目管理--项目信息上报列表
* @package app\adminapi\listsmanage_communication * Class ManageInfoReportLists
*/ * @package app\adminapi\listsmanage_communication
class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/08 13:33 * @author likeadmin
*/ * @date 2024/03/08 13:33
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id', 'severity'], return [
'%like%' => ['giver'], '=' => ['project_id', 'severity'],
]; '%like%' => ['giver'],
} ];
}
/**
* @notes 获取项目管理--项目信息上报列表 /**
* @return array * @notes 获取项目管理--项目信息上报列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/08 13:33 * @author likeadmin
*/ * @date 2024/03/08 13:33
public function lists(): array */
{ public function lists(): array
return ManageInfoReport::where($this->searchWhere) {
->field(['id', 'project_id', 'abstract', 'happen_date', 'severity', 'info_cate', 'giver']) return ManageInfoReport::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'abstract', 'happen_date', 'severity', 'info_cate', 'giver'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['severity_text'] = $data->severity_text; $data['project_name'] = $project['project_name'];
$data['info_cate_text'] = $data->info_cate_text; $data['severity_text'] = $data->severity_text;
}) $data['info_cate_text'] = $data->info_cate_text;
->toArray(); $admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty();
} $data['giver_name'] = $admin?->name;
})
->toArray();
/** }
* @notes 获取项目管理--项目信息上报数量
* @return int
* @author likeadmin /**
* @date 2024/03/08 13:33 * @notes 获取项目管理--项目信息上报数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/08 13:33
return ManageInfoReport::where($this->searchWhere)->count(); */
} public function count(): int
{
} return ManageInfoReport::where($this->searchWhere)->count();
}
}

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

@ -11,86 +11,90 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\manage_communication; namespace app\adminapi\lists\manage_communication;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\manage_basic\ManageProject; use app\common\lists\ListsSearchInterface;
use app\common\model\manage_communication\ManageSendDoc; use app\common\model\auth\Admin;
use app\common\lists\ListsSearchInterface; use app\common\model\manage_basic\ManageProject;
use app\common\model\manage_communication\ManageSendDoc;
/**
* 项目管理--发文管理列表 /**
* Class ManageSendDocLists * 项目管理--发文管理列表
* @package app\adminapi\listsmanage_communication * Class ManageSendDocLists
*/ * @package app\adminapi\listsmanage_communication
class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/07 17:15 * @author likeadmin
*/ * @date 2024/03/07 17:15
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id'], return [
'%like%' => ['code', 'send_user', 'accept_user'], '=' => ['project_id'],
]; '%like%' => ['code', 'send_user', 'accept_user'],
} ];
}
/**
* @notes 获取项目管理--发文管理列表 /**
* @return array * @notes 获取项目管理--发文管理列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/07 17:15 * @author likeadmin
*/ * @date 2024/03/07 17:15
public function lists(): array */
{ public function lists(): array
$params = $this->request->get(); {
$condition = []; $params = $this->request->get();
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ $condition = [];
if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){ if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
$condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]]; 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']) return ManageSendDoc::where($this->searchWhere)->where($condition)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'code', 'abstract', 'send_date', 'send_company', 'send_user', 'accept_user', 'remark'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
}) $data['project_name'] = $project['project_name'];
->toArray(); $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();
* @notes 获取项目管理--发文管理数量 }
* @return int
* @author likeadmin
* @date 2024/03/07 17:15 /**
*/ * @notes 获取项目管理--发文管理数量
public function count(): int * @return int
{ * @author likeadmin
$params = $this->request->get(); * @date 2024/03/07 17:15
$condition = []; */
if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ public function count(): int
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')]]; $params = $this->request->get();
} $condition = [];
} if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') {
return ManageSendDoc::where($this->searchWhere)->where($condition)->count(); 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\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\marketing\MarketingBranchFiling; use app\common\model\marketing\MarketingBranchFiling;
@ -59,6 +60,11 @@
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($data) { ->select()->each(function ($data) {
$data['filing_type_text'] = $data->filing_type; $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(); ->toArray();
} }

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

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept; use app\common\model\dept\Dept;
use app\common\model\GeoCity; use app\common\model\GeoCity;
use app\common\model\GeoProvince; 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_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['total_contract_amount'] = MarketingContract::where('part_a', $data['id'])->where('status', 1)->sum('signed_amount');
$data['is_deal'] = $data['total_contract_num'] <= 0 ? '否' : '是'; $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(); ->toArray();
} }

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

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

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

@ -11,72 +11,76 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_connect; namespace app\adminapi\lists\supervision_connect;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_connect\SupervisionCompanyCheck; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_connect\SupervisionCompanyCheck;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--公司检查列表 /**
* Class SupervisionCompanyCheckLists * 工程监理--公司检查列表
* @package app\adminapi\listssupervision_connect * Class SupervisionCompanyCheckLists
*/ * @package app\adminapi\listssupervision_connect
class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/05 11:57 * @author likeadmin
*/ * @date 2024/03/05 11:57
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id'], return [
'%like%' => ['name', 'user', 'problem_name'], '=' => ['project_id'],
]; '%like%' => ['name', 'user', 'problem_name'],
} ];
}
/**
* @notes 获取工程监理--公司检查列表 /**
* @return array * @notes 获取工程监理--公司检查列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/05 11:57 * @author likeadmin
*/ * @date 2024/03/05 11:57
public function lists(): array */
{ public function lists(): array
return SupervisionCompanyCheck::where($this->searchWhere) {
->field(['id', 'project_id', 'name', 'date', 'user', 'problem_name', 'problem_type', 'problem_desc', 'reply_user', 'reply_date', 'reply_content', 'review_opinions']) return SupervisionCompanyCheck::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'name', 'date', 'user', 'problem_name', 'problem_type', 'problem_desc', 'reply_user', 'reply_date', 'reply_content', 'review_opinions'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
}) $data['project_name'] = $project['project_name'];
->toArray(); $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();
* @notes 获取工程监理--公司检查数量 }
* @return int
* @author likeadmin
* @date 2024/03/05 11:57 /**
*/ * @notes 获取工程监理--公司检查数量
public function count(): int * @return int
{ * @author likeadmin
return SupervisionCompanyCheck::where($this->searchWhere)->count(); * @date 2024/03/05 11:57
} */
public function count(): int
} {
return SupervisionCompanyCheck::where($this->searchWhere)->count();
}
}

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

@ -11,74 +11,77 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_connect; namespace app\adminapi\lists\supervision_connect;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_connect\SupervisionProjectInfoReport; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--项目重大信息上报列表 /**
* Class SupervisionProjectInfoReportLists * 工程监理--项目重大信息上报列表
* @package app\adminapi\listssupervision_connect * Class SupervisionProjectInfoReportLists
*/ * @package app\adminapi\listssupervision_connect
class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/05 10:53 * @author likeadmin
*/ * @date 2024/03/05 10:53
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id', 'severity'], return [
'%like%' => ['abstract', 'giver'], '=' => ['project_id', 'severity'],
]; '%like%' => ['abstract', 'giver'],
} ];
}
/**
* @notes 获取工程监理--项目重大信息上报列表 /**
* @return array * @notes 获取工程监理--项目重大信息上报列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/05 10:53 * @author likeadmin
*/ * @date 2024/03/05 10:53
public function lists(): array */
{ public function lists(): array
return SupervisionProjectInfoReport::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere) {
->limit($this->limitOffset, $this->limitLength) return SupervisionProjectInfoReport::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name,project_manager')->where('id', $data['project_id'])->findOrEmpty();
$data['project_manager'] = $project['project_manager']; $data['project_name'] = $project['project_name'];
$data['severity_text'] = $data->severity_text; $data['project_manager'] = $project['project_manager'];
$data['info_cate_text'] = $data->info_cate_text; $data['severity_text'] = $data->severity_text;
}) $data['info_cate_text'] = $data->info_cate_text;
->toArray(); $admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty();
} $data['giver_name'] = $admin?->name;
})
->toArray();
/** }
* @notes 获取工程监理--项目重大信息上报数量
* @return int
* @author likeadmin /**
* @date 2024/03/05 10:53 * @notes 获取工程监理--项目重大信息上报数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/05 10:53
return SupervisionProjectInfoReport::where($this->searchWhere)->count(); */
} public function count(): int
{
} return SupervisionProjectInfoReport::where($this->searchWhere)->count();
}
}

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

@ -11,76 +11,79 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--危大方案提交列表列表 /**
* Class SupervisionDangerousEngineeringCaseLists * 工程监理--危大方案提交列表列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionDangerousEngineeringCaseLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/04 14:00 * @author likeadmin
*/ * @date 2024/03/04 14:00
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['dangerous_engineering_monitoring_id'], return [
'%like%' => ['case_name', 'assessor'], '=' => ['dangerous_engineering_monitoring_id'],
]; '%like%' => ['case_name', 'assessor'],
} ];
}
/**
* @notes 获取工程监理--危大方案提交列表列表 /**
* @return array * @notes 获取工程监理--危大方案提交列表列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/04 14:00 * @author likeadmin
*/ * @date 2024/03/04 14:00
public function lists(): array */
{ public function lists(): array
return SupervisionDangerousEngineeringCase::where($this->searchWhere) {
->field(['id', 'dangerous_engineering_monitoring_id', 'case_name', 'assessor']) return SupervisionDangerousEngineeringCase::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'dangerous_engineering_monitoring_id', 'case_name', 'assessor'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); ->select()->each(function ($data) {
$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();
$data['dangerous_engineering_monitoring_title'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name']; $admin = Admin::field('name')->where('id', $data['assessor'])->findOrEmpty();
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; $data['dangerous_engineering_monitoring_title'] = $project['project_name'];
}) $data['project_name'] = $project['project_name'];
->toArray(); $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
} $data['assessor_name'] = $admin?->name;
})
->toArray();
/** }
* @notes 获取工程监理--危大方案提交列表数量
* @return int
* @author likeadmin /**
* @date 2024/03/04 14:00 * @notes 获取工程监理--危大方案提交列表数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/04 14:00
return SupervisionDangerousEngineeringCase::where($this->searchWhere)->count(); */
} public function count(): int
{
} return SupervisionDangerousEngineeringCase::where($this->searchWhere)->count();
}
}

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

@ -11,78 +11,81 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--危大工程施工列表列表 /**
* Class SupervisionDangerousEngineeringConstructionLists * 工程监理--危大工程施工列表列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionDangerousEngineeringConstructionLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/04 16:02 * @author likeadmin
*/ * @date 2024/03/04 16:02
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['dangerous_engineering_monitoring_id', 'is_notice'], return [
'%like%' => ['notice_user'], '=' => ['dangerous_engineering_monitoring_id', 'is_notice'],
]; '%like%' => ['notice_user'],
} ];
}
/**
* @notes 获取工程监理--危大工程施工列表列表 /**
* @return array * @notes 获取工程监理--危大工程施工列表列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/04 16:02 * @author likeadmin
*/ * @date 2024/03/04 16:02
public function lists(): array */
{ public function lists(): array
return SupervisionDangerousEngineeringConstruction::where($this->searchWhere) {
->field(['id', 'dangerous_engineering_monitoring_id', 'actual_construction_date', 'is_notice', 'notice_user']) return SupervisionDangerousEngineeringConstruction::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'dangerous_engineering_monitoring_id', 'actual_construction_date', 'is_notice', 'notice_user'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,position')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); ->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,position')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$data['type'] = $dangerous_engineering_monitoring->type_text; $admin = Admin::field('name')->where('id', $data['notice_user'])->findOrEmpty();
$data['position'] = $dangerous_engineering_monitoring['position']; $data['project_name'] = $project['project_name'];
$data['is_notice_text'] = $data->is_notice_text; $data['type'] = $dangerous_engineering_monitoring->type_text;
$data['dangerous_engineering_monitoring_title'] = $project['project_name']; $data['position'] = $dangerous_engineering_monitoring['position'];
}) $data['is_notice_text'] = $data->is_notice_text;
->toArray(); $data['dangerous_engineering_monitoring_title'] = $project['project_name'];
} $data['notice_user_name'] = $admin?->name;
})
->toArray();
/** }
* @notes 获取工程监理--危大工程施工列表数量
* @return int
* @author likeadmin /**
* @date 2024/03/04 16:02 * @notes 获取工程监理--危大工程施工列表数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/04 16:02
return SupervisionDangerousEngineeringConstruction::where($this->searchWhere)->count(); */
} public function count(): int
{
} return SupervisionDangerousEngineeringConstruction::where($this->searchWhere)->count();
}
}

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

@ -11,77 +11,80 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--危大工程消除列表列表 /**
* Class SupervisionDangerousEngineeringEliminateLists * 工程监理--危大工程消除列表列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionDangerousEngineeringEliminateLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/04 15:31 * @author likeadmin
*/ * @date 2024/03/04 15:31
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['dangerous_engineering_monitoring_id'], return [
'%like%' => ['eliminate_user', 'notice_user'], '=' => ['dangerous_engineering_monitoring_id'],
]; '%like%' => ['eliminate_user', 'notice_user'],
} ];
}
/**
* @notes 获取工程监理--危大工程消除列表列表 /**
* @return array * @notes 获取工程监理--危大工程消除列表列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/04 15:31 * @author likeadmin
*/ * @date 2024/03/04 15:31
public function lists(): array */
{ public function lists(): array
return SupervisionDangerousEngineeringEliminate::where($this->searchWhere) {
->field(['id', 'dangerous_engineering_monitoring_id', 'eliminate_date', 'eliminate_user', 'is_notice']) return SupervisionDangerousEngineeringEliminate::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'dangerous_engineering_monitoring_id', 'eliminate_date', 'eliminate_user', 'is_notice'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,position')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); ->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,position')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$data['position'] = $dangerous_engineering_monitoring['position']; $admin = Admin::field('name')->where('id', $data['eliminate_user'])->findOrEmpty();
$data['is_notice_text'] = $data->is_notice_text; $data['project_name'] = $project['project_name'];
$data['dangerous_engineering_monitoring_title'] = $project['project_name']; $data['position'] = $dangerous_engineering_monitoring['position'];
}) $data['is_notice_text'] = $data->is_notice_text;
->toArray(); $data['dangerous_engineering_monitoring_title'] = $project['project_name'];
} $data['eliminate_user_name'] = $admin?->name;
})
->toArray();
/** }
* @notes 获取工程监理--危大工程消除列表数量
* @return int
* @author likeadmin /**
* @date 2024/03/04 15:31 * @notes 获取工程监理--危大工程消除列表数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/04 15:31
return SupervisionDangerousEngineeringEliminate::where($this->searchWhere)->count(); */
} public function count(): int
{
} return SupervisionDangerousEngineeringEliminate::where($this->searchWhere)->count();
}
}

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

@ -11,87 +11,91 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\lists\ListsSearchInterface; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--危大工程监控列表 /**
* Class SupervisionDangerousEngineeringMonitoringLists * 工程监理--危大工程监控列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionDangerousEngineeringMonitoringLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/04 11:05 * @author likeadmin
*/ * @date 2024/03/04 11:05
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id', 'type', 'partial_project'], return [
'%like%' => ['position'], '=' => ['project_id', 'type', 'partial_project'],
]; '%like%' => ['position'],
} ];
}
/**
* @notes 获取工程监理--危大工程监控列表 /**
* @return array * @notes 获取工程监理--危大工程监控列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/04 11:05 * @author likeadmin
*/ * @date 2024/03/04 11:05
public function lists(): array */
{ public function lists(): array
return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere) {
->field(['id', 'project_id', 'type', 'partial_project', 'planned_construction_time', 'position']) return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'type', 'partial_project', 'planned_construction_time', 'position'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['partial_project_text'] = $data->partial_project_text; $admin = Admin::where('id', 'in', [$data['supervisor'], $data['responsible_person']])->column('name', 'id');
$data['type_text'] = $data->type_text; $data['project_name'] = $project['project_name'];
//实际施工时间 $data['partial_project_text'] = $data->partial_project_text;
$construction = SupervisionDangerousEngineeringConstruction::field('actual_construction_date')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty(); $data['type_text'] = $data->type_text;
$data['actual_construction_date'] = !$construction->isEmpty() ? $construction['actual_construction_date'] : ''; $data['supervisor_name'] = $admin[$data['supervisor']] ?? '';
//相关方案 $data['responsible_person_name'] = $admin[$data['responsible_person']] ?? '';
$case = SupervisionDangerousEngineeringCase::field('case_name')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty(); //实际施工时间
$data['case_name'] = !$case->isEmpty() ? $case['case_name'] : ''; $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'] : '';
$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'] : ''; $case = SupervisionDangerousEngineeringCase::field('case_name')->where('dangerous_engineering_monitoring_id', $data['id'])->order('id desc')->findOrEmpty();
$data['eliminate_user'] = !$eliminate->isEmpty() ? $eliminate['eliminate_user'] : ''; $data['case_name'] = !$case->isEmpty() ? $case['case_name'] : '';
}) //消除日期
->toArray(); $eliminate = SupervisionDangerousEngineeringEliminate::field('eliminate_date,eliminate_user')->where('dangerous_engineering_monitoring_id', $data['id'])->order('id desc')->findOrEmpty();
} $data['eliminate_date'] = !$eliminate->isEmpty() ? $eliminate['eliminate_date'] : '';
$data['eliminate_user'] = !$eliminate->isEmpty() ? $eliminate['eliminate_user'] : '';
})
/** ->toArray();
* @notes 获取工程监理--危大工程监控数量 }
* @return int
* @author likeadmin
* @date 2024/03/04 11:05 /**
*/ * @notes 获取工程监理--危大工程监控数量
public function count(): int * @return int
{ * @author likeadmin
return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)->count(); * @date 2024/03/04 11:05
} */
public function count(): int
} {
return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)->count();
}
}

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

@ -11,73 +11,77 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--超规模危险性较大工程安全监控列表 /**
* Class SupervisionExcessRiskSecurityMonitoringLists * 工程监理--超规模危险性较大工程安全监控列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionExcessRiskSecurityMonitoringLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/04 10:11 * @author likeadmin
*/ * @date 2024/03/04 10:11
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id', 'partial_project'], return [
'%like%' => ['project_characteristics'], '=' => ['project_id', 'partial_project'],
]; '%like%' => ['project_characteristics'],
} ];
}
/**
* @notes 获取工程监理--超规模危险性较大工程安全监控列表 /**
* @return array * @notes 获取工程监理--超规模危险性较大工程安全监控列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/04 10:11 * @author likeadmin
*/ * @date 2024/03/04 10:11
public function lists(): array */
{ public function lists(): array
return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere) {
->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time', 'actual_construction_time', 'problems_rectification']) return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time', 'actual_construction_time', 'problems_rectification'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['partial_project_text'] = $data->partial_project_text; $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
}) $data['project_name'] = $project['project_name'];
->toArray(); $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();
* @notes 获取工程监理--超规模危险性较大工程安全监控数量 }
* @return int
* @author likeadmin
* @date 2024/03/04 10:11 /**
*/ * @notes 获取工程监理--超规模危险性较大工程安全监控数量
public function count(): int * @return int
{ * @author likeadmin
return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)->count(); * @date 2024/03/04 10:11
} */
public function count(): int
} {
return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)->count();
}
}

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

@ -11,72 +11,76 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--危险性较大的工程安全监控列表 /**
* Class SupervisionHighRiskSecurityMonitoringLists * 工程监理--危险性较大的工程安全监控列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionHighRiskSecurityMonitoringLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/04 09:22 * @author likeadmin
*/ * @date 2024/03/04 09:22
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id', 'partial_project', 'project_characteristics'], return [
]; '=' => ['project_id', 'partial_project', 'project_characteristics'],
} ];
}
/**
* @notes 获取工程监理--危险性较大的工程安全监控列表 /**
* @return array * @notes 获取工程监理--危险性较大的工程安全监控列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/04 09:22 * @author likeadmin
*/ * @date 2024/03/04 09:22
public function lists(): array */
{ public function lists(): array
return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere) {
->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time']) return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time'])
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['partial_project_text'] = $data->partial_project_text; $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
}) $data['project_name'] = $project['project_name'];
->toArray(); $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();
* @notes 获取工程监理--危险性较大的工程安全监控数量 }
* @return int
* @author likeadmin
* @date 2024/03/04 09:22 /**
*/ * @notes 获取工程监理--危险性较大的工程安全监控数量
public function count(): int * @return int
{ * @author likeadmin
return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)->count(); * @date 2024/03/04 09:22
} */
public function count(): int
} {
return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)->count();
}
}

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

@ -11,77 +11,80 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits; use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
/**
* 大型机械设备及仪器台账列表 /**
* Class SupervisionLargeMechanicalEquipmentLists * 大型机械设备及仪器台账列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionLargeMechanicalEquipmentLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/02 09:51 * @author likeadmin
*/ * @date 2024/03/02 09:51
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id', 'company_id', 'approval_type'], return [
'%like%' => ['sn', 'name', 'use_site', 'approval_result'], '=' => ['project_id', 'company_id', 'approval_type'],
]; '%like%' => ['sn', 'name', 'use_site', 'approval_result'],
} ];
}
/**
* @notes 获取大型机械设备及仪器台账列表 /**
* @return array * @notes 获取大型机械设备及仪器台账列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/02 09:51 * @author likeadmin
*/ * @date 2024/03/02 09:51
public function lists(): array */
{ public function lists(): array
return SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) {
->limit($this->limitOffset, $this->limitLength) return SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty(); $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name']; $company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$data['company_name'] = $company['unit_name']; $admin = Admin::field('name')->where('id', $data['first_auditor'])->findOrEmpty();
$data['approval_type_text'] = $data->approval_type_text; $data['project_name'] = $project['project_name'];
$data['first_audit_opinion_text'] = $data->first_audit_opinion_text; $data['company_name'] = $company['unit_name'];
$data['final_audit_opinion_text'] = $data->final_audit_opinion_text; $data['approval_type_text'] = $data->approval_type_text;
}) $data['first_audit_opinion_text'] = $data->first_audit_opinion_text;
->toArray(); $data['final_audit_opinion_text'] = $data->final_audit_opinion_text;
} $data['first_auditor_name'] = $admin?->name;
})
->toArray();
/** }
* @notes 获取大型机械设备及仪器台账数量
* @return int
* @author likeadmin /**
* @date 2024/03/02 09:51 * @notes 获取大型机械设备及仪器台账数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/02 09:51
return SupervisionLargeMechanicalEquipment::where($this->searchWhere)->count(); */
} public function count(): int
{
} return SupervisionLargeMechanicalEquipment::where($this->searchWhere)->count();
}
}

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

@ -11,71 +11,74 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_dangerous; namespace app\adminapi\lists\supervision_dangerous;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
use app\common\model\supervision_project\SupervisionProject;
/**
* 工程监理--现场安全警示标志列表 /**
* Class SupervisionSafetyWarningSignLists * 工程监理--现场安全警示标志列表
* @package app\adminapi\listssupervision_dangerous * Class SupervisionSafetyWarningSignLists
*/ * @package app\adminapi\listssupervision_dangerous
class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/01 15:41 * @author likeadmin
*/ * @date 2024/03/01 15:41
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id'], return [
'%like%' => ['check_user', 'check_area'], '=' => ['project_id'],
]; '%like%' => ['check_user', 'check_area'],
} ];
}
/**
* @notes 获取工程监理--现场安全警示标志列表 /**
* @return array * @notes 获取工程监理--现场安全警示标志列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/01 15:41 * @author likeadmin
*/ * @date 2024/03/01 15:41
public function lists(): array */
{ public function lists(): array
return SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) {
->limit($this->limitOffset, $this->limitLength) return SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
}) $admin = Admin::field('name')->where('id', $data['check_user'])->findOrEmpty();
->toArray(); $data['project_name'] = $project['project_name'];
} $data['check_user_name'] = $admin?->name;
})
->toArray();
/** }
* @notes 获取工程监理--现场安全警示标志数量
* @return int
* @author likeadmin /**
* @date 2024/03/01 15:41 * @notes 获取工程监理--现场安全警示标志数量
*/ * @return int
public function count(): int * @author likeadmin
{ * @date 2024/03/01 15:41
return SupervisionSafetyWarningSign::where($this->searchWhere)->count(); */
} public function count(): int
{
} return SupervisionSafetyWarningSign::where($this->searchWhere)->count();
}
}

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

@ -11,71 +11,77 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work; namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionProject; use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_work\SupervisionMeetingMinutes; use app\common\model\auth\Admin;
use app\common\lists\ListsSearchInterface; use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMeetingMinutes;
/**
* 工程监理--会议纪要列表 /**
* Class SupervisionMeetingMinutesLists * 工程监理--会议纪要列表
* @package app\adminapi\listssupervision_work * Class SupervisionMeetingMinutesLists
*/ * @package app\adminapi\listssupervision_work
class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements ListsSearchInterface */
{ class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件 /**
* @return \string[][] * @notes 设置搜索条件
* @author likeadmin * @return \string[][]
* @date 2024/03/01 14:31 * @author likeadmin
*/ * @date 2024/03/01 14:31
public function setSearch(): array */
{ public function setSearch(): array
return [ {
'=' => ['project_id'], return [
'%like%' => ['theme', 'type', 'emcee', 'recorder'], '=' => ['project_id'],
]; '%like%' => ['theme', 'type', 'emcee', 'recorder'],
} ];
}
/**
* @notes 获取工程监理--会议纪要列表 /**
* @return array * @notes 获取工程监理--会议纪要列表
* @throws \think\db\exception\DataNotFoundException * @return array
* @throws \think\db\exception\DbException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DbException
* @author likeadmin * @throws \think\db\exception\ModelNotFoundException
* @date 2024/03/01 14:31 * @author likeadmin
*/ * @date 2024/03/01 14:31
public function lists(): array */
{ public function lists(): array
return SupervisionMeetingMinutes::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere) {
->limit($this->limitOffset, $this->limitLength) return SupervisionMeetingMinutes::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->order(['id' => 'desc']) ->limit($this->limitOffset, $this->limitLength)
->select()->each(function($data){ ->order(['id' => 'desc'])
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ->select()->each(function ($data) {
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
}) $admin = Admin::where('id', 'in', [$data['emcee'], $data['recorder']])->column('name', 'id');
->toArray(); $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'];
* @notes 获取工程监理--会议纪要数量 })
* @return int ->toArray();
* @author likeadmin }
* @date 2024/03/01 14:31
*/
public function count(): int /**
{ * @notes 获取工程监理--会议纪要数量
return SupervisionMeetingMinutes::where($this->searchWhere)->count(); * @return int
} * @author likeadmin
* @date 2024/03/01 14:31
} */
public function count(): int
{
return SupervisionMeetingMinutes::where($this->searchWhere)->count();
}
}

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

@ -11,214 +11,219 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\consult_basic\ConsultProject; use app\common\model\consult_basic\ConsultNewStartProject;
use app\common\model\consult_basic\ConsultProjectEvolve; use app\common\model\consult_basic\ConsultProject;
use app\common\model\consult_basic\ConsultProjectPreparation; use app\common\model\consult_basic\ConsultProjectEvolve;
use think\facade\Db; use app\common\model\consult_basic\ConsultProjectPreparation;
use think\facade\Db;
/**
* 项目咨询--新开工项目管理逻辑 /**
* Class ConsultNewStartProjectLogic * 项目咨询--新开工项目管理逻辑
* @package app\adminapi\logic\consult_basic * Class ConsultNewStartProjectLogic
*/ * @package app\adminapi\logic\consult_basic
class ConsultNewStartProjectLogic extends BaseLogic */
{ class ConsultNewStartProjectLogic extends BaseLogic
{
/**
* @notes 添加项目咨询--新开工项目管理 /**
* @param array $params * @notes 添加项目咨询--新开工项目管理
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
$res = ConsultNewStartProject::create([ try {
'project_id' => $params['project_id'], $res = ConsultNewStartProject::create([
'address' => $params['address'], 'project_id' => $params['project_id'],
'service_scope' => $params['service_scope'], 'address' => $params['address'],
'area' => $params['area'], 'service_scope' => $params['service_scope'],
'invest' => $params['invest'], 'area' => $params['area'],
'basic_type' => $params['basic_type'], 'invest' => $params['invest'],
'duration' => $params['duration'], 'basic_type' => $params['basic_type'],
'structure_type' => $params['structure_type'] ?? '', 'duration' => $params['duration'],
'land_floors' => $params['land_floors'] ?? 0, 'structure_type' => $params['structure_type'] ?? '',
'underground_floors' => $params['underground_floors'] ?? 0, 'land_floors' => $params['land_floors'] ?? 0,
'owner_unit' => $params['owner_unit'] ?? '', 'underground_floors' => $params['underground_floors'] ?? 0,
'owner_unit_contact' => $params['owner_unit_contact'] ?? '', 'owner_unit' => $params['owner_unit'] ?? '',
'design_unit' => $params['design_unit'] ?? '', 'owner_unit_contact' => $params['owner_unit_contact'] ?? '',
'design_unit_contact' => $params['design_unit_contact'] ?? '', 'design_unit' => $params['design_unit'] ?? '',
'survey_unit' => $params['survey_unit'] ?? '', 'design_unit_contact' => $params['design_unit_contact'] ?? '',
'survey_unit_contact' => $params['survey_unit_contact'] ?? '', 'survey_unit' => $params['survey_unit'] ?? '',
'build_unit' => $params['build_unit'] ?? '', 'survey_unit_contact' => $params['survey_unit_contact'] ?? '',
'build_unit_contact' => $params['build_unit_contact'] ?? '', 'build_unit' => $params['build_unit'] ?? '',
'project_manager' => $params['project_manager'] ?? '', 'build_unit_contact' => $params['build_unit_contact'] ?? '',
'deputy_project_manager' => $params['deputy_project_manager'] ?? '', 'project_manager' => $params['project_manager'] ?? '',
'engineer' => $params['engineer'] ?? '', 'deputy_project_manager' => $params['deputy_project_manager'] ?? '',
'content' => $params['content'] ?? '', 'engineer' => $params['engineer'] ?? '',
'create_user' => $params['create_user'], 'content' => $params['content'] ?? '',
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), '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'])) {
ConsultProjectEvolve::create([ foreach ($params['evolve'] as $v) {
'new_start_project_id' => $res->id,
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
}
}
if(!empty($params['preparation'])) {
foreach($params['preparation'] as $v) {
ConsultProjectPreparation::create([
'new_start_project_id' => $res->id,
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
}
}
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 编辑项目咨询--新开工项目管理
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 10:27
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
ConsultNewStartProject::where('id', $params['id'])->update([
'project_id' => $params['project_id'],
'address' => $params['address'],
'service_scope' => $params['service_scope'],
'area' => $params['area'],
'invest' => $params['invest'],
'basic_type' => $params['basic_type'],
'duration' => $params['duration'],
'structure_type' => $params['structure_type'] ?? '',
'land_floors' => $params['land_floors'] ?? 0,
'underground_floors' => $params['underground_floors'] ?? 0,
'owner_unit' => $params['owner_unit'] ?? '',
'owner_unit_contact' => $params['owner_unit_contact'] ?? '',
'design_unit' => $params['design_unit'] ?? '',
'design_unit_contact' => $params['design_unit_contact'] ?? '',
'survey_unit' => $params['survey_unit'] ?? '',
'survey_unit_contact' => $params['survey_unit_contact'] ?? '',
'build_unit' => $params['build_unit'] ?? '',
'build_unit_contact' => $params['build_unit_contact'] ?? '',
'project_manager' => $params['project_manager'] ?? '',
'deputy_project_manager' => $params['deputy_project_manager'] ?? '',
'engineer' => $params['engineer'] ?? '',
'content' => $params['content'] ?? '',
'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([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
}else{
ConsultProjectEvolve::create([ ConsultProjectEvolve::create([
'new_start_project_id' => $params['id'], 'new_start_project_id' => $res->id,
'name' => $v['name'], 'name' => $v['name'],
'progress_status' => $v['progress_status'], 'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user'] 'resp_user' => $v['resp_user']
]); ]);
} }
} }
} if (!empty($params['preparation'])) {
if(!empty($params['preparation'])) { foreach ($params['preparation'] as $v) {
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{
ConsultProjectPreparation::create([ ConsultProjectPreparation::create([
'new_start_project_id' => $params['id'], 'new_start_project_id' => $res->id,
'name' => $v['name'], 'name' => $v['name'],
'progress_status' => $v['progress_status'], 'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user'] 'resp_user' => $v['resp_user']
]); ]);
} }
} }
} Db::commit();
Db::commit(); return true;
return true; } catch (\Exception $e) {
} catch (\Exception $e) { Db::rollback();
Db::rollback(); self::setError($e->getMessage());
self::setError($e->getMessage()); return false;
return false; }
}
}
/**
* @notes 删除项目咨询--新开工项目管理
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 10:27
*/
public static function delete(array $params): bool
{
$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()){
self::setError('此数据下存在项目组后勤准备工作数据,须先删除项目组后勤准备工作数据'); /**
return false; * @notes 编辑项目咨询--新开工项目管理
} * @param array $params
return ConsultNewStartProject::destroy($params['id']); * @return bool
} * @author likeadmin
* @date 2024/03/11 10:27
*/
/** public static function edit(array $params): bool
* @notes 获取项目咨询--新开工项目管理详情 {
* @param $params Db::startTrans();
* @return array try {
* @author likeadmin ConsultNewStartProject::where('id', $params['id'])->update([
* @date 2024/03/11 10:27 'project_id' => $params['project_id'],
*/ 'address' => $params['address'],
public static function detail($params): array 'service_scope' => $params['service_scope'],
{ 'area' => $params['area'],
$data = ConsultNewStartProject::withoutField('update_time,delete_time')->findOrEmpty($params['id']); 'invest' => $params['invest'],
$project = ConsultProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); 'basic_type' => $params['basic_type'],
$data['project_name'] = $project['project_name']; 'duration' => $params['duration'],
return $data->toArray(); 'structure_type' => $params['structure_type'] ?? '',
} 'land_floors' => $params['land_floors'] ?? 0,
} 'underground_floors' => $params['underground_floors'] ?? 0,
'owner_unit' => $params['owner_unit'] ?? '',
'owner_unit_contact' => $params['owner_unit_contact'] ?? '',
'design_unit' => $params['design_unit'] ?? '',
'design_unit_contact' => $params['design_unit_contact'] ?? '',
'survey_unit' => $params['survey_unit'] ?? '',
'survey_unit_contact' => $params['survey_unit_contact'] ?? '',
'build_unit' => $params['build_unit'] ?? '',
'build_unit_contact' => $params['build_unit_contact'] ?? '',
'project_manager' => $params['project_manager'] ?? '',
'deputy_project_manager' => $params['deputy_project_manager'] ?? '',
'engineer' => $params['engineer'] ?? '',
'content' => $params['content'] ?? '',
'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([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
} else {
ConsultProjectEvolve::create([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
}
}
}
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 {
ConsultProjectPreparation::create([
'new_start_project_id' => $params['id'],
'name' => $v['name'],
'progress_status' => $v['progress_status'],
'resp_user' => $v['resp_user']
]);
}
}
}
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除项目咨询--新开工项目管理
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 10:27
*/
public static function delete(array $params): bool
{
$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()) {
self::setError('此数据下存在项目组后勤准备工作数据,须先删除项目组后勤准备工作数据');
return false;
}
return ConsultNewStartProject::destroy($params['id']);
}
/**
* @notes 获取项目咨询--新开工项目管理详情
* @param $params
* @return array
* @author likeadmin
* @date 2024/03/11 10:27
*/
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();
$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();
}
}

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

@ -11,100 +11,104 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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 app\common\logic\BaseLogic; use app\common\model\auth\Admin;
use think\facade\Db; use app\common\model\consult_basic\ConsultProjectEvolve;
use think\facade\Db;
/**
* 项目咨询--项目组工作开展情况逻辑 /**
* Class ConsultProjectEvolveLogic * 项目咨询--项目组工作开展情况逻辑
* @package app\adminapi\logic\consult_basic * Class ConsultProjectEvolveLogic
*/ * @package app\adminapi\logic\consult_basic
class ConsultProjectEvolveLogic extends BaseLogic */
{ class ConsultProjectEvolveLogic extends BaseLogic
{
/**
* @notes 添加项目咨询--项目组工作开展情况 /**
* @param array $params * @notes 添加项目咨询--项目组工作开展情况
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ConsultProjectEvolve::create([ try {
'new_start_project_id' => $params['new_start_project_id'], ConsultProjectEvolve::create([
'name' => $params['name'], 'new_start_project_id' => $params['new_start_project_id'],
'progress_status' => $params['progress_status'], 'name' => $params['name'],
'resp_user' => $params['resp_user'] 'progress_status' => $params['progress_status'],
]); 'resp_user' => $params['resp_user']
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑项目咨询--项目组工作开展情况 /**
* @param array $params * @notes 编辑项目咨询--项目组工作开展情况
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ConsultProjectEvolve::where('id', $params['id'])->update([ try {
'new_start_project_id' => $params['new_start_project_id'], ConsultProjectEvolve::where('id', $params['id'])->update([
'name' => $params['name'], 'new_start_project_id' => $params['new_start_project_id'],
'progress_status' => $params['progress_status'], 'name' => $params['name'],
'resp_user' => $params['resp_user'] 'progress_status' => $params['progress_status'],
]); 'resp_user' => $params['resp_user']
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除项目咨询--项目组工作开展情况 /**
* @param array $params * @notes 删除项目咨询--项目组工作开展情况
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return ConsultProjectEvolve::destroy($params['id']); {
} return ConsultProjectEvolve::destroy($params['id']);
}
/**
* @notes 获取项目咨询--项目组工作开展情况详情 /**
* @param $params * @notes 获取项目咨询--项目组工作开展情况详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function detail($params): array */
{ 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();
}
}

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

@ -11,277 +11,280 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
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;
/**
* 基本信息逻辑
* Class ConsultProjectLogic
* @package app\adminapi\logic\consult_basic
*/
class ConsultProjectLogic extends BaseLogic
{
/**
* @notes 添加基本信息
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 09:25
*/
public static function add(array $params): bool
{
Db::startTrans();
try {
ConsultProject::create([
'project_name' => $params['project_name'],
'project_code' => data_unique_code('XMZX'),
'industry' => $params['industry'],
'nature' => $params['nature'],
'company' => $params['company'] ?? '',
'build_area' => $params['build_area'],
'address' => $params['address'] ?? '',
'project_level' => $params['project_level'],
'total_investment' => $params['total_investment'],
'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0,
'contract' => $params['contract'] ?? '',
'contract_amount' => $params['contract_amount'] ?? 0,
'contract_content' => $params['contract_content'] ?? '',
'project_overview' => $params['project_overview'] ?? '',
'consult_content' => $params['consult_content'] ?? '',
'remark' => $params['remark'] ?? '',
'consult_start_date' => !empty($params['consult_start_date']) ? strtotime($params['consult_start_date']) : 0,
'consult_end_date' => !empty($params['consult_end_date']) ? strtotime($params['consult_end_date']) : 0,
'engineering_status' => $params['engineering_status'],
'consult_type' => $params['consult_type'],
'telephone' => $params['telephone'] ?? '',
'consult_user' => $params['consult_user'] ?? '',
'supervision_department' => $params['supervision_department'] ?? '',
'implementation_department' => $params['implementation_department'] ?? '',
'project_department' => $params['project_department'] ?? '',
'project_manager' => $params['project_manager'] ?? '',
'part_a_unit' => $params['part_a_unit'] ?? '',
'project_archiving' => $params['project_archiving'] ? json_encode($params['project_archiving']) : null,
'archiving_directory' => $params['archiving_directory'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if ($params['contract_id'] > 0) {
MarketingContract::where('id', $params['contract_id'])->update(['status' => 1]);
}
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 编辑基本信息
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 09:25
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
ConsultProject::where('id', $params['id'])->update([
'project_name' => $params['project_name'],
'industry' => $params['industry'],
'nature' => $params['nature'],
'company' => $params['company'] ?? '',
'build_area' => $params['build_area'],
'address' => $params['address'] ?? '',
'project_level' => $params['project_level'],
'total_investment' => $params['total_investment'],
'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0,
'contract' => $params['contract'] ?? '',
'contract_amount' => $params['contract_amount'] ?? 0,
'contract_content' => $params['contract_content'] ?? '',
'project_overview' => $params['project_overview'] ?? '',
'consult_content' => $params['consult_content'] ?? '',
'remark' => $params['remark'] ?? '',
'consult_start_date' => !empty($params['consult_start_date']) ? strtotime($params['consult_start_date']) : 0,
'consult_end_date' => !empty($params['consult_end_date']) ? strtotime($params['consult_end_date']) : 0,
'engineering_status' => $params['engineering_status'],
'consult_type' => $params['consult_type'],
'telephone' => $params['telephone'] ?? '',
'consult_user' => $params['consult_user'] ?? '',
'supervision_department' => $params['supervision_department'] ?? '',
'implementation_department' => $params['implementation_department'] ?? '',
'project_department' => $params['project_department'] ?? '',
'project_manager' => $params['project_manager'] ?? '',
'part_a_unit' => $params['part_a_unit'] ?? '',
'project_archiving' => $params['project_archiving'] ? json_encode($params['project_archiving']) : null,
'archiving_directory' => $params['archiving_directory'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除基本信息
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 09:25
*/
public static function delete(array $params): bool
{
//决策管理信息
$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()){
self::setError('此数据关联了需求研究管理信息,需删除需求研究管理信息');
return false;
}
//总控管理
$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()){
self::setError('此数据关联了接收管理信息,需删除接收管理信息');
return false;
}
//报建管理
$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()){
self::setError('此数据关联了招采管理信息,需删除招采管理信息');
return false;
}
//合同管理
$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()){
self::setError('此数据关联了造价管理信息,需删除造价管理信息');
return false;
}
//设计管理
$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()){
self::setError('此数据关联了现场准备信息,需删除现场准备信息');
return false;
}
//现场组织建设
$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()){
self::setError('此数据关联了现场实施管理信息,需删除现场实施管理信息');
return false;
}
//验收管理
$accept = ConsultAccept::where('project_id','in',$params['id'])->findOrEmpty();
if($accept->isEmpty()){
self::setError('此数据关联了验收管理信息,需删除验收管理信息');
return false;
}
return ConsultProject::destroy($params['id']);
}
/**
* @notes 获取基本信息详情
* @param $params
* @return array
* @author likeadmin
* @date 2024/03/11 09:25
*/
public static function detail($params): array
{
$data = ConsultProject::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$data['industry_text'] = $data->industry_text;
// $data['nature_text'] = $data->nature_text;
$data['build_area_text'] = $data->build_area_text;
$data['project_level_text'] = $data->project_level_text;
$data['engineering_status_text'] = $data->engineering_status_text;
$data['consult_type_text'] = $data->consult_type_text;
$data['project_archiving_text'] = $data->project_archiving_text;
$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;
return $data->toArray();
}
public static function datas() namespace app\adminapi\logic\consult_basic;
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
{ {
$datas = ConsultProject::field(['id', 'project_name'])
->order(['id' => 'desc'])
->select()->each(function($data){ /**
$data['projectinfo'] = 'ID：' . $data['id'] . ' / 名称：' . $data['project_name']; * @notes 添加基本信息
}) * @param array $params
->toArray(); * @return bool
return $datas; * @author likeadmin
} * @date 2024/03/11 09:25
} */
public static function add(array $params): bool
{
Db::startTrans();
try {
ConsultProject::create([
'project_name' => $params['project_name'],
'project_code' => data_unique_code('XMZX'),
'industry' => $params['industry'],
'nature' => $params['nature'],
'company' => $params['company'] ?? '',
'build_area' => $params['build_area'],
'address' => $params['address'] ?? '',
'project_level' => $params['project_level'],
'total_investment' => $params['total_investment'],
'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0,
'contract' => $params['contract'] ?? '',
'contract_amount' => $params['contract_amount'] ?? 0,
'contract_content' => $params['contract_content'] ?? '',
'project_overview' => $params['project_overview'] ?? '',
'consult_content' => $params['consult_content'] ?? '',
'remark' => $params['remark'] ?? '',
'consult_start_date' => !empty($params['consult_start_date']) ? strtotime($params['consult_start_date']) : 0,
'consult_end_date' => !empty($params['consult_end_date']) ? strtotime($params['consult_end_date']) : 0,
'engineering_status' => $params['engineering_status'],
'consult_type' => $params['consult_type'],
'telephone' => $params['telephone'] ?? '',
'consult_user' => $params['consult_user'] ?? '',
'supervision_department' => $params['supervision_department'] ?? '',
'implementation_department' => $params['implementation_department'] ?? '',
'project_department' => $params['project_department'] ?? '',
'project_manager' => $params['project_manager'] ?? '',
'part_a_unit' => $params['part_a_unit'] ?? '',
'project_archiving' => $params['project_archiving'] ? json_encode($params['project_archiving']) : null,
'archiving_directory' => $params['archiving_directory'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if ($params['contract_id'] > 0) {
MarketingContract::where('id', $params['contract_id'])->update(['status' => 1]);
}
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 编辑基本信息
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 09:25
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
ConsultProject::where('id', $params['id'])->update([
'project_name' => $params['project_name'],
'industry' => $params['industry'],
'nature' => $params['nature'],
'company' => $params['company'] ?? '',
'build_area' => $params['build_area'],
'address' => $params['address'] ?? '',
'project_level' => $params['project_level'],
'total_investment' => $params['total_investment'],
'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0,
'contract' => $params['contract'] ?? '',
'contract_amount' => $params['contract_amount'] ?? 0,
'contract_content' => $params['contract_content'] ?? '',
'project_overview' => $params['project_overview'] ?? '',
'consult_content' => $params['consult_content'] ?? '',
'remark' => $params['remark'] ?? '',
'consult_start_date' => !empty($params['consult_start_date']) ? strtotime($params['consult_start_date']) : 0,
'consult_end_date' => !empty($params['consult_end_date']) ? strtotime($params['consult_end_date']) : 0,
'engineering_status' => $params['engineering_status'],
'consult_type' => $params['consult_type'],
'telephone' => $params['telephone'] ?? '',
'consult_user' => $params['consult_user'] ?? '',
'supervision_department' => $params['supervision_department'] ?? '',
'implementation_department' => $params['implementation_department'] ?? '',
'project_department' => $params['project_department'] ?? '',
'project_manager' => $params['project_manager'] ?? '',
'part_a_unit' => $params['part_a_unit'] ?? '',
'project_archiving' => $params['project_archiving'] ? json_encode($params['project_archiving']) : null,
'archiving_directory' => $params['archiving_directory'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除基本信息
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/11 09:25
*/
public static function delete(array $params): bool
{
//决策管理信息
$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()) {
self::setError('此数据关联了需求研究管理信息,需删除需求研究管理信息');
return false;
}
//总控管理
$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()) {
self::setError('此数据关联了接收管理信息,需删除接收管理信息');
return false;
}
//报建管理
$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()) {
self::setError('此数据关联了招采管理信息,需删除招采管理信息');
return false;
}
//合同管理
$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()) {
self::setError('此数据关联了造价管理信息,需删除造价管理信息');
return false;
}
//设计管理
$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()) {
self::setError('此数据关联了现场准备信息,需删除现场准备信息');
return false;
}
//现场组织建设
$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()) {
self::setError('此数据关联了现场实施管理信息,需删除现场实施管理信息');
return false;
}
//验收管理
$accept = ConsultAccept::where('project_id', 'in', $params['id'])->findOrEmpty();
if ($accept->isEmpty()) {
self::setError('此数据关联了验收管理信息,需删除验收管理信息');
return false;
}
return ConsultProject::destroy($params['id']);
}
/**
* @notes 获取基本信息详情
* @param $params
* @return array
* @author likeadmin
* @date 2024/03/11 09:25
*/
public static function detail($params): array
{
$data = ConsultProject::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$data['industry_text'] = $data->industry_text;
// $data['nature_text'] = $data->nature_text;
$data['build_area_text'] = $data->build_area_text;
$data['project_level_text'] = $data->project_level_text;
$data['engineering_status_text'] = $data->engineering_status_text;
$data['consult_type_text'] = $data->consult_type_text;
$data['project_archiving_text'] = $data->project_archiving_text;
$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;
$admin = Admin::field('name')->where('id', $data['consult_user'])->findOrEmpty();
$data['consult_user_name'] = $admin?->name;
return $data->toArray();
}
public static function datas()
{
$datas = ConsultProject::field(['id', 'project_name'])
->order(['id' => 'desc'])
->select()->each(function ($data) {
$data['projectinfo'] = 'ID：' . $data['id'] . ' / 名称：' . $data['project_name'];
})
->toArray();
return $datas;
}
}

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

@ -11,100 +11,104 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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 app\common\logic\BaseLogic; use app\common\model\auth\Admin;
use think\facade\Db; use app\common\model\consult_basic\ConsultProjectPreparation;
use think\facade\Db;
/**
* 项目咨询--项目组后勤准备工作逻辑 /**
* Class ConsultProjectPreparationLogic * 项目咨询--项目组后勤准备工作逻辑
* @package app\adminapi\logic\consult_basic * Class ConsultProjectPreparationLogic
*/ * @package app\adminapi\logic\consult_basic
class ConsultProjectPreparationLogic extends BaseLogic */
{ class ConsultProjectPreparationLogic extends BaseLogic
{
/**
* @notes 添加项目咨询--项目组后勤准备工作 /**
* @param array $params * @notes 添加项目咨询--项目组后勤准备工作
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ConsultProjectPreparation::create([ try {
'new_start_project_id' => $params['new_start_project_id'], ConsultProjectPreparation::create([
'name' => $params['name'], 'new_start_project_id' => $params['new_start_project_id'],
'progress_status' => $params['progress_status'], 'name' => $params['name'],
'resp_user' => $params['resp_user'] 'progress_status' => $params['progress_status'],
]); 'resp_user' => $params['resp_user']
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑项目咨询--项目组后勤准备工作 /**
* @param array $params * @notes 编辑项目咨询--项目组后勤准备工作
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ConsultProjectPreparation::where('id', $params['id'])->update([ try {
'new_start_project_id' => $params['new_start_project_id'], ConsultProjectPreparation::where('id', $params['id'])->update([
'name' => $params['name'], 'new_start_project_id' => $params['new_start_project_id'],
'progress_status' => $params['progress_status'], 'name' => $params['name'],
'resp_user' => $params['resp_user'] 'progress_status' => $params['progress_status'],
]); 'resp_user' => $params['resp_user']
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除项目咨询--项目组后勤准备工作 /**
* @param array $params * @notes 删除项目咨询--项目组后勤准备工作
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return ConsultProjectPreparation::destroy($params['id']); {
} return ConsultProjectPreparation::destroy($params['id']);
}
/**
* @notes 获取项目咨询--项目组后勤准备工作详情 /**
* @param $params * @notes 获取项目咨询--项目组后勤准备工作详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/11 10:27 * @author likeadmin
*/ * @date 2024/03/11 10:27
public static function detail($params): array */
{ 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\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialCollectionPlan; use app\common\model\financial\FinancialCollectionPlan;
use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialRefund;
@ -123,6 +124,8 @@
$data['signed_amount'] = $contract?->signed_amount; $data['signed_amount'] = $contract?->signed_amount;
$data['signed_date'] = $contract?->create_time; $data['signed_date'] = $contract?->create_time;
$data['part_a_name'] = $custom?->name; $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'); $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\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialInvoice;
use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialRefund;
use app\common\model\marketing\MarketingContract; use app\common\model\marketing\MarketingContract;
@ -146,6 +147,8 @@
$data['sign_time'] = $contract['create_time']; $data['sign_time'] = $contract['create_time'];
$data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['contract_id'])->sum('apply_amount'); $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'); $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(); return $data->toArray();
} }

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

@ -11,117 +11,121 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\manage_communication; namespace app\adminapi\logic\manage_communication;
use app\common\model\manage_basic\ManageProject; use app\common\logic\BaseLogic;
use app\common\model\manage_communication\ManageAcceptDoc; use app\common\model\auth\Admin;
use app\common\logic\BaseLogic; use app\common\model\manage_basic\ManageProject;
use think\facade\Db; use app\common\model\manage_communication\ManageAcceptDoc;
use think\facade\Db;
/**
* 项目管理--收文管理逻辑 /**
* Class ManageAcceptDocLogic * 项目管理--收文管理逻辑
* @package app\adminapi\logic\manage_communication * Class ManageAcceptDocLogic
*/ * @package app\adminapi\logic\manage_communication
class ManageAcceptDocLogic extends BaseLogic */
{ class ManageAcceptDocLogic extends BaseLogic
{
/**
* @notes 添加项目管理--收文管理 /**
* @param array $params * @notes 添加项目管理--收文管理
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/07 16:46 * @author likeadmin
*/ * @date 2024/03/07 16:46
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ManageAcceptDoc::create([ try {
'project_id' => $params['project_id'], ManageAcceptDoc::create([
'code' => $params['code'] ?? '', 'project_id' => $params['project_id'],
'abstract' => $params['abstract'], 'code' => $params['code'] ?? '',
'send_company' => $params['send_company'], 'abstract' => $params['abstract'],
'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, 'send_company' => $params['send_company'],
'accept_user' => $params['accept_user'] ?? '', 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0,
'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0, 'accept_user' => $params['accept_user'] ?? '',
'read_user' => $params['read_user'] ?? '', 'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0,
'remark' => $params['remark'] ?? '', 'read_user' => $params['read_user'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null 'remark' => $params['remark'] ?? '',
]); 'annex' => $params['annex'] ? json_encode($params['annex']) : null
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑项目管理--收文管理 /**
* @param array $params * @notes 编辑项目管理--收文管理
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/07 16:46 * @author likeadmin
*/ * @date 2024/03/07 16:46
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ManageAcceptDoc::where('id', $params['id'])->update([ try {
'project_id' => $params['project_id'], ManageAcceptDoc::where('id', $params['id'])->update([
'code' => $params['code'] ?? '', 'project_id' => $params['project_id'],
'abstract' => $params['abstract'], 'code' => $params['code'] ?? '',
'send_company' => $params['send_company'], 'abstract' => $params['abstract'],
'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, 'send_company' => $params['send_company'],
'accept_user' => $params['accept_user'] ?? '', 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0,
'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0, 'accept_user' => $params['accept_user'] ?? '',
'read_user' => $params['read_user'] ?? '', 'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0,
'remark' => $params['remark'] ?? '', 'read_user' => $params['read_user'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'remark' => $params['remark'] ?? '',
'update_time' => time() 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除项目管理--收文管理 /**
* @param array $params * @notes 删除项目管理--收文管理
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/07 16:46 * @author likeadmin
*/ * @date 2024/03/07 16:46
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return ManageAcceptDoc::destroy($params['id']); {
} return ManageAcceptDoc::destroy($params['id']);
}
/**
* @notes 获取项目管理--收文管理详情 /**
* @param $params * @notes 获取项目管理--收文管理详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/07 16:46 * @author likeadmin
*/ * @date 2024/03/07 16:46
public static function detail($params): array */
{ 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(); $data = ManageAcceptDoc::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$data['project_name'] = $project['project_name']; $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
return $data->toArray(); $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();
}
}

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

@ -11,120 +11,123 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\manage_communication; namespace app\adminapi\logic\manage_communication;
use app\common\model\manage_basic\ManageProject; use app\common\logic\BaseLogic;
use app\common\model\manage_communication\ManageInfoReport; use app\common\model\auth\Admin;
use app\common\logic\BaseLogic; use app\common\model\manage_basic\ManageProject;
use think\facade\Db; use app\common\model\manage_communication\ManageInfoReport;
use think\facade\Db;
/**
* 项目管理--项目信息上报逻辑 /**
* Class ManageInfoReportLogic * 项目管理--项目信息上报逻辑
* @package app\adminapi\logic\manage_communication * Class ManageInfoReportLogic
*/ * @package app\adminapi\logic\manage_communication
class ManageInfoReportLogic extends BaseLogic */
{ class ManageInfoReportLogic extends BaseLogic
{
/**
* @notes 添加项目管理--项目信息上报 /**
* @param array $params * @notes 添加项目管理--项目信息上报
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/08 13:33 * @author likeadmin
*/ * @date 2024/03/08 13:33
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ManageInfoReport::create([ try {
'project_id' => $params['project_id'], ManageInfoReport::create([
'abstract' => $params['abstract'], 'project_id' => $params['project_id'],
'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, 'abstract' => $params['abstract'],
'severity' => $params['severity'] ?? 0, 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0,
'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, 'severity' => $params['severity'] ?? 0,
'content' => $params['content'] ?? '', 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null,
'opinions' => $params['opinions'] ?? '', 'content' => $params['content'] ?? '',
'giver' => $params['giver'] ?? '', 'opinions' => $params['opinions'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'giver' => $params['giver'] ?? '',
'create_user' => $params['create_user'], 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
]); 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑项目管理--项目信息上报 /**
* @param array $params * @notes 编辑项目管理--项目信息上报
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/08 13:33 * @author likeadmin
*/ * @date 2024/03/08 13:33
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ManageInfoReport::where('id', $params['id'])->update([ try {
'project_id' => $params['project_id'], ManageInfoReport::where('id', $params['id'])->update([
'abstract' => $params['abstract'], 'project_id' => $params['project_id'],
'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, 'abstract' => $params['abstract'],
'severity' => $params['severity'] ?? 0, 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0,
'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, 'severity' => $params['severity'] ?? 0,
'content' => $params['content'] ?? '', 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null,
'opinions' => $params['opinions'] ?? '', 'content' => $params['content'] ?? '',
'giver' => $params['giver'] ?? '', 'opinions' => $params['opinions'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'giver' => $params['giver'] ?? '',
'create_user' => $params['create_user'], 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
'update_time' => time() 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除项目管理--项目信息上报 /**
* @param array $params * @notes 删除项目管理--项目信息上报
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/08 13:33 * @author likeadmin
*/ * @date 2024/03/08 13:33
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return ManageInfoReport::destroy($params['id']); {
} return ManageInfoReport::destroy($params['id']);
}
/**
* @notes 获取项目管理--项目信息上报详情 /**
* @param $params * @notes 获取项目管理--项目信息上报详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/08 13:33 * @author likeadmin
*/ * @date 2024/03/08 13:33
public static function detail($params): array */
{ 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(); $data = ManageInfoReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$data['project_name'] = $project['project_name']; $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['severity_text'] = $data->severity_text; $data['project_name'] = $project['project_name'];
return $data->toArray(); $data['severity_text'] = $data->severity_text;
} $admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty();
} $data['giver_name'] = $admin?->name;
return $data->toArray();
}
}

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

@ -11,115 +11,119 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\manage_communication; namespace app\adminapi\logic\manage_communication;
use app\common\model\manage_basic\ManageProject; use app\common\logic\BaseLogic;
use app\common\model\manage_communication\ManageSendDoc; use app\common\model\auth\Admin;
use app\common\logic\BaseLogic; use app\common\model\manage_basic\ManageProject;
use think\facade\Db; use app\common\model\manage_communication\ManageSendDoc;
use think\facade\Db;
/**
* 项目管理--发文管理逻辑 /**
* Class ManageSendDocLogic * 项目管理--发文管理逻辑
* @package app\adminapi\logic\manage_communication * Class ManageSendDocLogic
*/ * @package app\adminapi\logic\manage_communication
class ManageSendDocLogic extends BaseLogic */
{ class ManageSendDocLogic extends BaseLogic
{
/**
* @notes 添加项目管理--发文管理 /**
* @param array $params * @notes 添加项目管理--发文管理
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/07 17:15 * @author likeadmin
*/ * @date 2024/03/07 17:15
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ManageSendDoc::create([ try {
'project_id' => $params['project_id'], ManageSendDoc::create([
'code' => $params['code'] ?? '', 'project_id' => $params['project_id'],
'abstract' => $params['abstract'], 'code' => $params['code'] ?? '',
'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, 'abstract' => $params['abstract'],
'send_company' => $params['send_company'], 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0,
'send_user' => $params['send_user'], 'send_company' => $params['send_company'],
'accept_user' => $params['accept_user'] ?? '', 'send_user' => $params['send_user'],
'remark' => $params['remark'] ?? '', 'accept_user' => $params['accept_user'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null 'remark' => $params['remark'] ?? '',
]); 'annex' => $params['annex'] ? json_encode($params['annex']) : null
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑项目管理--发文管理 /**
* @param array $params * @notes 编辑项目管理--发文管理
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/07 17:15 * @author likeadmin
*/ * @date 2024/03/07 17:15
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
ManageSendDoc::where('id', $params['id'])->update([ try {
'project_id' => $params['project_id'], ManageSendDoc::where('id', $params['id'])->update([
'code' => $params['code'] ?? '', 'project_id' => $params['project_id'],
'abstract' => $params['abstract'], 'code' => $params['code'] ?? '',
'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, 'abstract' => $params['abstract'],
'send_company' => $params['send_company'], 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0,
'send_user' => $params['send_user'], 'send_company' => $params['send_company'],
'accept_user' => $params['accept_user'] ?? '', 'send_user' => $params['send_user'],
'remark' => $params['remark'] ?? '', 'accept_user' => $params['accept_user'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'remark' => $params['remark'] ?? '',
'update_time' => time() 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除项目管理--发文管理 /**
* @param array $params * @notes 删除项目管理--发文管理
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/07 17:15 * @author likeadmin
*/ * @date 2024/03/07 17:15
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return ManageSendDoc::destroy($params['id']); {
} return ManageSendDoc::destroy($params['id']);
}
/**
* @notes 获取项目管理--发文管理详情 /**
* @param $params * @notes 获取项目管理--发文管理详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/07 17:15 * @author likeadmin
*/ * @date 2024/03/07 17:15
public static function detail($params): array */
{ 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(); $data = ManageSendDoc::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$data['project_name'] = $project['project_name']; $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
return $data->toArray(); $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\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\marketing\MarketingBranchFiling; use app\common\model\marketing\MarketingBranchFiling;
use think\facade\Db; use think\facade\Db;
@ -150,6 +151,11 @@
{ {
$data = MarketingBranchFiling::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); $data = MarketingBranchFiling::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$data['filing_type_text'] = $data->filing_type; $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(); return $data->toArray();
} }
} }

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

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept; use app\common\model\dept\Dept;
use app\common\model\GeoCity; use app\common\model\GeoCity;
use app\common\model\GeoProvince; use app\common\model\GeoProvince;
@ -214,6 +215,8 @@
$data['city_name'] = !$city->isEmpty() ? $city['city_name'] : ''; $data['city_name'] = !$city->isEmpty() ? $city['city_name'] : '';
$data['important_level_text'] = $data->important_level_text; $data['important_level_text'] = $data->important_level_text;
$data['category_text'] = $data->category_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(); return $data->toArray();
} }

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

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\marketing\MarketingContract; use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingProjectFiling; use app\common\model\marketing\MarketingProjectFiling;
use app\common\model\marketing\MarketingProjectFilingDetail; use app\common\model\marketing\MarketingProjectFilingDetail;
@ -120,6 +121,8 @@
$data['filing_role_text'] = $data->filing_role_text; $data['filing_role_text'] = $data->filing_role_text;
$data['status'] = (string)$data['status']; $data['status'] = (string)$data['status'];
$data['status_text'] = $data->status_text; $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(); return $data->toArray();
} }
} }

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

@ -11,139 +11,143 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_connect\SupervisionCompanyCheck;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--公司检查逻辑
* Class SupervisionCompanyCheckLogic
* @package app\adminapi\logic\supervision_connect
*/
class SupervisionCompanyCheckLogic extends BaseLogic
{
/**
* @notes 添加工程监理--公司检查
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/05 11:57
*/
public static function add(array $params): bool
{
Db::startTrans();
try {
SupervisionCompanyCheck::create([
'project_id' => $params['project_id'],
'name' => $params['name'],
'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
'user' => $params['user'],
'problem_name' => $params['problem_name'],
'problem_type' => $params['problem_type'],
'problem_desc' => $params['problem_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 编辑工程监理--公司检查
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/05 11:57
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
SupervisionCompanyCheck::where('id', $params['id'])->update([
'project_id' => $params['project_id'],
'name' => $params['name'],
'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
'user' => $params['user'],
'problem_name' => $params['problem_name'],
'problem_type' => $params['problem_type'],
'problem_desc' => $params['problem_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'update_time' => time()
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/** /**
* @notes 回复工程监理--公司检查 * 工程监理--公司检查逻辑
* @param array $params * Class SupervisionCompanyCheckLogic
* @return bool * @package app\adminapi\logic\supervision_connect
* @author likeadmin
* @date 2024/03/05 11:57
*/ */
public static function reply(array $params): bool class SupervisionCompanyCheckLogic extends BaseLogic
{ {
Db::startTrans();
try {
SupervisionCompanyCheck::where('id', $params['id'])->update([ /**
'reply_user' => $params['reply_user'], * @notes 添加工程监理--公司检查
'reply_date' => !empty($params['reply_date']) ? strtotime($params['reply_date']) : 0, * @param array $params
'reply_content' => $params['reply_content'], * @return bool
'review_opinions' => $params['review_opinions'], * @author likeadmin
]); * @date 2024/03/05 11:57
Db::commit(); */
return true; public static function add(array $params): bool
} catch (\Exception $e) { {
Db::rollback(); Db::startTrans();
self::setError($e->getMessage()); try {
return false; SupervisionCompanyCheck::create([
'project_id' => $params['project_id'],
'name' => $params['name'],
'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
'user' => $params['user'],
'problem_name' => $params['problem_name'],
'problem_type' => $params['problem_type'],
'problem_desc' => $params['problem_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
} }
}
/**
/** * @notes 编辑工程监理--公司检查
* @notes 删除工程监理--公司检查 * @param array $params
* @param array $params * @return bool
* @return bool * @author likeadmin
* @author likeadmin * @date 2024/03/05 11:57
* @date 2024/03/05 11:57 */
*/ public static function edit(array $params): bool
public static function delete(array $params): bool {
{ Db::startTrans();
return SupervisionCompanyCheck::destroy($params['id']); try {
} SupervisionCompanyCheck::where('id', $params['id'])->update([
'project_id' => $params['project_id'],
'name' => $params['name'],
/** 'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
* @notes 获取工程监理--公司检查详情 'user' => $params['user'],
* @param $params 'problem_name' => $params['problem_name'],
* @return array 'problem_type' => $params['problem_type'],
* @author likeadmin 'problem_desc' => $params['problem_desc'],
* @date 2024/03/05 11:57 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
*/ 'update_time' => time()
public static function detail($params): array ]);
{ Db::commit();
$data = SupervisionCompanyCheck::field('id,project_id,name,date,user,problem_name,problem_type,problem_desc,annex')->findOrEmpty($params['id']); return true;
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); } catch (\Exception $e) {
$data['project_name'] = $project['project_name']; Db::rollback();
return $data->toArray(); self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 回复工程监理--公司检查
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/05 11:57
*/
public static function reply(array $params): bool
{
Db::startTrans();
try {
SupervisionCompanyCheck::where('id', $params['id'])->update([
'reply_user' => $params['reply_user'],
'reply_date' => !empty($params['reply_date']) ? strtotime($params['reply_date']) : 0,
'reply_content' => $params['reply_content'],
'review_opinions' => $params['review_opinions'],
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除工程监理--公司检查
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/05 11:57
*/
public static function delete(array $params): bool
{
return SupervisionCompanyCheck::destroy($params['id']);
}
/**
* @notes 获取工程监理--公司检查详情
* @param $params
* @return array
* @author likeadmin
* @date 2024/03/05 11:57
*/
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();
$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();
}
}

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

@ -11,122 +11,125 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--项目重大信息上报逻辑 /**
* Class SupervisionProjectInfoReportLogic * 工程监理--项目重大信息上报逻辑
* @package app\adminapi\logic\supervision_connect * Class SupervisionProjectInfoReportLogic
*/ * @package app\adminapi\logic\supervision_connect
class SupervisionProjectInfoReportLogic extends BaseLogic */
{ class SupervisionProjectInfoReportLogic extends BaseLogic
{
/**
* @notes 添加工程监理--项目重大信息上报 /**
* @param array $params * @notes 添加工程监理--项目重大信息上报
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/05 10:53 * @author likeadmin
*/ * @date 2024/03/05 10:53
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionProjectInfoReport::create([ try {
'project_id' => $params['project_id'], SupervisionProjectInfoReport::create([
'abstract' => $params['abstract'], 'project_id' => $params['project_id'],
'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, 'abstract' => $params['abstract'],
'severity' => $params['severity'], 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0,
'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, 'severity' => $params['severity'],
'info_content' => $params['info_content'], 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null,
'opinions' => $params['opinions'], 'info_content' => $params['info_content'],
'giver' => $params['giver'], 'opinions' => $params['opinions'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'giver' => $params['giver'],
'create_user' => $params['create_user'], 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
]); 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑工程监理--项目重大信息上报 /**
* @param array $params * @notes 编辑工程监理--项目重大信息上报
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/05 10:53 * @author likeadmin
*/ * @date 2024/03/05 10:53
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionProjectInfoReport::where('id', $params['id'])->update([ try {
'project_id' => $params['project_id'], SupervisionProjectInfoReport::where('id', $params['id'])->update([
'abstract' => $params['abstract'], 'project_id' => $params['project_id'],
'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, 'abstract' => $params['abstract'],
'severity' => $params['severity'], 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0,
'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, 'severity' => $params['severity'],
'info_content' => $params['info_content'], 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null,
'opinions' => $params['opinions'], 'info_content' => $params['info_content'],
'giver' => $params['giver'], 'opinions' => $params['opinions'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'giver' => $params['giver'],
'create_user' => $params['create_user'], 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
'update_time' => time() 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除工程监理--项目重大信息上报 /**
* @param array $params * @notes 删除工程监理--项目重大信息上报
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/05 10:53 * @author likeadmin
*/ * @date 2024/03/05 10:53
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return SupervisionProjectInfoReport::destroy($params['id']); {
} return SupervisionProjectInfoReport::destroy($params['id']);
}
/**
* @notes 获取工程监理--项目重大信息上报详情 /**
* @param $params * @notes 获取工程监理--项目重大信息上报详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/05 10:53 * @author likeadmin
*/ * @date 2024/03/05 10:53
public static function detail($params): array */
{ 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(); $data = SupervisionProjectInfoReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name,project_manager')->where('id', $data['project_id'])->findOrEmpty();
$data['project_manager'] = $project['project_manager']; $data['project_name'] = $project['project_name'];
$data['severity_text'] = $data->severity_text; $data['project_manager'] = $project['project_manager'];
$data['info_cate_text'] = $data->info_cate_text; $data['severity_text'] = $data->severity_text;
return $data->toArray(); $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();
}
}

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

@ -11,118 +11,121 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--危大方案提交列表逻辑 /**
* Class SupervisionDangerousEngineeringCaseLogic * 工程监理--危大方案提交列表逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionDangerousEngineeringCaseLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionDangerousEngineeringCaseLogic extends BaseLogic */
{ class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
{
/**
* @notes 添加工程监理--危大方案提交列表 /**
* @param array $params * @notes 添加工程监理--危大方案提交列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 14:00 * @author likeadmin
*/ * @date 2024/03/04 14:00
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionDangerousEngineeringCase::create([ try {
'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], SupervisionDangerousEngineeringCase::create([
'case_name' => $params['case_name'], 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'],
'assessor' => $params['assessor'], 'case_name' => $params['case_name'],
'review_content' => $params['review_content'], 'assessor' => $params['assessor'],
'remark' => $params['remark'], 'review_content' => $params['review_content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'remark' => $params['remark'],
'create_user' => $params['create_user'], 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
]); 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑工程监理--危大方案提交列表 /**
* @param array $params * @notes 编辑工程监理--危大方案提交列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 14:00 * @author likeadmin
*/ * @date 2024/03/04 14:00
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionDangerousEngineeringCase::where('id', $params['id'])->update([ try {
'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], SupervisionDangerousEngineeringCase::where('id', $params['id'])->update([
'case_name' => $params['case_name'], 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'],
'assessor' => $params['assessor'], 'case_name' => $params['case_name'],
'review_content' => $params['review_content'], 'assessor' => $params['assessor'],
'remark' => $params['remark'], 'review_content' => $params['review_content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'remark' => $params['remark'],
'create_user' => $params['create_user'], 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
'update_time' => time() 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除工程监理--危大方案提交列表 /**
* @param array $params * @notes 删除工程监理--危大方案提交列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 14:00 * @author likeadmin
*/ * @date 2024/03/04 14:00
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return SupervisionDangerousEngineeringCase::destroy($params['id']); {
} return SupervisionDangerousEngineeringCase::destroy($params['id']);
}
/**
* @notes 获取工程监理--危大方案提交列表详情 /**
* @param $params * @notes 获取工程监理--危大方案提交列表详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/04 14:00 * @author likeadmin
*/ * @date 2024/03/04 14:00
public static function detail($params): array */
{ 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(); $data = SupervisionDangerousEngineeringCase::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$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();
$data['dangerous_engineering_monitoring_title'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$data['project_name'] = $project['project_name']; $admin = Admin::field('name')->where('id', $data['assessor'])->findOrEmpty();
$data['type'] = $dangerous_engineering_monitoring->type_text; $data['dangerous_engineering_monitoring_title'] = $project['project_name'];
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; $data['project_name'] = $project['project_name'];
return $data->toArray(); $data['type'] = $dangerous_engineering_monitoring->type_text;
} $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
} $data['assessor_name'] = $admin?->name;
return $data->toArray();
}
}

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

@ -11,115 +11,118 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--危大工程施工列表逻辑 /**
* Class SupervisionDangerousEngineeringConstructionLogic * 工程监理--危大工程施工列表逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionDangerousEngineeringConstructionLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic */
{ class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic
{
/**
* @notes 添加工程监理--危大工程施工列表 /**
* @param array $params * @notes 添加工程监理--危大工程施工列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 16:02 * @author likeadmin
*/ * @date 2024/03/04 16:02
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionDangerousEngineeringConstruction::create([ try {
'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], SupervisionDangerousEngineeringConstruction::create([
'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0, 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'],
'is_notice' => $params['is_notice'], 'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0,
'notice_user' => $params['notice_user'] 'is_notice' => $params['is_notice'],
]); 'notice_user' => $params['notice_user']
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑工程监理--危大工程施工列表 /**
* @param array $params * @notes 编辑工程监理--危大工程施工列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 16:02 * @author likeadmin
*/ * @date 2024/03/04 16:02
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionDangerousEngineeringConstruction::where('id', $params['id'])->update([ try {
'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], SupervisionDangerousEngineeringConstruction::where('id', $params['id'])->update([
'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0, 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'],
'is_notice' => $params['is_notice'], 'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0,
'notice_user' => $params['notice_user'], 'is_notice' => $params['is_notice'],
'update_time' => time(), 'notice_user' => $params['notice_user'],
]); 'update_time' => time(),
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除工程监理--危大工程施工列表 /**
* @param array $params * @notes 删除工程监理--危大工程施工列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 16:02 * @author likeadmin
*/ * @date 2024/03/04 16:02
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return SupervisionDangerousEngineeringConstruction::destroy($params['id']); {
} return SupervisionDangerousEngineeringConstruction::destroy($params['id']);
}
/**
* @notes 获取工程监理--危大工程施工列表详情 /**
* @param $params * @notes 获取工程监理--危大工程施工列表详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/04 16:02 * @author likeadmin
*/ * @date 2024/03/04 16:02
public static function detail($params): array */
{ 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(); $data = SupervisionDangerousEngineeringConstruction::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$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();
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$data['type'] = $dangerous_engineering_monitoring->type_text; $admin = Admin::field('name')->where('id', $data['notice_user'])->findOrEmpty();
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; $data['project_name'] = $project['project_name'];
$data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time']; $data['type'] = $dangerous_engineering_monitoring->type_text;
$data['position'] = $dangerous_engineering_monitoring['position']; $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
$data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics']; $data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time'];
$data['supervisor'] = $dangerous_engineering_monitoring['supervisor']; $data['position'] = $dangerous_engineering_monitoring['position'];
$data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person']; $data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics'];
$data['is_notice_text'] = $data->is_notice_text; $data['supervisor'] = $dangerous_engineering_monitoring['supervisor'];
return $data->toArray(); $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();
}
}

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

@ -11,117 +11,120 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--危大工程消除列表逻辑 /**
* Class SupervisionDangerousEngineeringEliminateLogic * 工程监理--危大工程消除列表逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionDangerousEngineeringEliminateLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic */
{ class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic
{
/**
* @notes 添加工程监理--危大工程消除列表 /**
* @param array $params * @notes 添加工程监理--危大工程消除列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 15:31 * @author likeadmin
*/ * @date 2024/03/04 15:31
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionDangerousEngineeringEliminate::create([ try {
'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], SupervisionDangerousEngineeringEliminate::create([
'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0, 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'],
'eliminate_user' => $params['eliminate_user'], 'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0,
'is_notice' => $params['is_notice'], 'eliminate_user' => $params['eliminate_user'],
'notice_user' => $params['notice_user'] 'is_notice' => $params['is_notice'],
]); 'notice_user' => $params['notice_user']
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑工程监理--危大工程消除列表 /**
* @param array $params * @notes 编辑工程监理--危大工程消除列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 15:31 * @author likeadmin
*/ * @date 2024/03/04 15:31
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionDangerousEngineeringEliminate::where('id', $params['id'])->update([ try {
'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], SupervisionDangerousEngineeringEliminate::where('id', $params['id'])->update([
'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0, 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'],
'eliminate_user' => $params['eliminate_user'], 'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0,
'is_notice' => $params['is_notice'], 'eliminate_user' => $params['eliminate_user'],
'notice_user' => $params['notice_user'], 'is_notice' => $params['is_notice'],
'update_time' => time() 'notice_user' => $params['notice_user'],
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除工程监理--危大工程消除列表 /**
* @param array $params * @notes 删除工程监理--危大工程消除列表
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 15:31 * @author likeadmin
*/ * @date 2024/03/04 15:31
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return SupervisionDangerousEngineeringEliminate::destroy($params['id']); {
} return SupervisionDangerousEngineeringEliminate::destroy($params['id']);
}
/**
* @notes 获取工程监理--危大工程消除列表详情 /**
* @param $params * @notes 获取工程监理--危大工程消除列表详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/04 15:31 * @author likeadmin
*/ * @date 2024/03/04 15:31
public static function detail($params): array */
{ 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(); $data = SupervisionDangerousEngineeringEliminate::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$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();
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$data['type'] = $dangerous_engineering_monitoring->type_text; $admin = Admin::field('name')->where('id', $data['eliminate_user'])->findOrEmpty();
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; $data['project_name'] = $project['project_name'];
$data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time']; $data['type'] = $dangerous_engineering_monitoring->type_text;
$data['position'] = $dangerous_engineering_monitoring['position']; $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
$data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics']; $data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time'];
$data['supervisor'] = $dangerous_engineering_monitoring['supervisor']; $data['position'] = $dangerous_engineering_monitoring['position'];
$data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person']; $data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics'];
$data['is_notice_text'] = $data->is_notice_text; $data['supervisor'] = $dangerous_engineering_monitoring['supervisor'];
return $data->toArray(); $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();
}
}

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

@ -11,138 +11,142 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\SupervisionDangerousEngineeringConstruction; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction;
use app\common\logic\BaseLogic; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
use app\common\model\supervision_work\SupervisionCheckItem; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db; use app\common\model\supervision_work\SupervisionCheckItem;
use think\facade\Db;
/**
* 工程监理--危大工程监控逻辑 /**
* Class SupervisionDangerousEngineeringMonitoringLogic * 工程监理--危大工程监控逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionDangerousEngineeringMonitoringLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic */
{ class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
{
/**
* @notes 添加工程监理--危大工程监控 /**
* @param array $params * @notes 添加工程监理--危大工程监控
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 11:05 * @author likeadmin
*/ * @date 2024/03/04 11:05
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionDangerousEngineeringMonitoring::create([ try {
'project_id' => $params['project_id'], SupervisionDangerousEngineeringMonitoring::create([
'type' => $params['type'], 'project_id' => $params['project_id'],
'partial_project' => $params['partial_project'], 'type' => $params['type'],
'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, 'partial_project' => $params['partial_project'],
'check_item_id' => $params['check_item_id'], 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
'position' => $params['position'], 'check_item_id' => $params['check_item_id'],
'project_characteristics' => $params['project_characteristics'], 'position' => $params['position'],
'supervisor' => $params['supervisor'], 'project_characteristics' => $params['project_characteristics'],
'responsible_person' => $params['responsible_person'] 'supervisor' => $params['supervisor'],
]); 'responsible_person' => $params['responsible_person']
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
/**
* @notes 编辑工程监理--危大工程监控
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/04 11:05
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
SupervisionDangerousEngineeringMonitoring::where('id', $params['id'])->update([
'project_id' => $params['project_id'],
'type' => $params['type'],
'partial_project' => $params['partial_project'],
'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
'check_item_id' => $params['check_item_id'],
'position' => $params['position'],
'project_characteristics' => $params['project_characteristics'],
'supervisor' => $params['supervisor'],
'responsible_person' => $params['responsible_person'],
'update_time' => time()
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除工程监理--危大工程监控
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/04 11:05
*/
public static function delete(array $params): bool
{
$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()){
self::setError('当前数据下存在危大工程消除信息,须先删除危大工程消除信息'); /**
return false; * @notes 编辑工程监理--危大工程监控
} * @param array $params
$construction = SupervisionDangerousEngineeringConstruction::where('dangerous_engineering_monitoring_id','in',$params['id'])->findOrEmpty(); * @return bool
if(!$construction->isEmpty()){ * @author likeadmin
self::setError('当前数据下存在危大工程施工信息,须先删除危大工程施工信息'); * @date 2024/03/04 11:05
return false; */
} public static function edit(array $params): bool
return SupervisionDangerousEngineeringMonitoring::destroy($params['id']); {
} Db::startTrans();
try {
SupervisionDangerousEngineeringMonitoring::where('id', $params['id'])->update([
/** 'project_id' => $params['project_id'],
* @notes 获取工程监理--危大工程监控详情 'type' => $params['type'],
* @param $params 'partial_project' => $params['partial_project'],
* @return array 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
* @author likeadmin 'check_item_id' => $params['check_item_id'],
* @date 2024/03/04 11:05 'position' => $params['position'],
*/ 'project_characteristics' => $params['project_characteristics'],
public static function detail($params): array 'supervisor' => $params['supervisor'],
{ 'responsible_person' => $params['responsible_person'],
$data = SupervisionDangerousEngineeringMonitoring::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); 'update_time' => time()
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); ]);
$node = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty(); Db::commit();
$data['project_name'] = $project['project_name']; return true;
$data['node_name'] = $node['node_name']; } catch (\Exception $e) {
$data['partial_project_text'] = $data->partial_project_text; Db::rollback();
$data['type_text'] = $data->type_text; self::setError($e->getMessage());
return $data->toArray(); return false;
} }
} }
/**
* @notes 删除工程监理--危大工程监控
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/04 11:05
*/
public static function delete(array $params): bool
{
$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()) {
self::setError('当前数据下存在危大工程消除信息,须先删除危大工程消除信息');
return false;
}
$construction = SupervisionDangerousEngineeringConstruction::where('dangerous_engineering_monitoring_id', 'in', $params['id'])->findOrEmpty();
if (!$construction->isEmpty()) {
self::setError('当前数据下存在危大工程施工信息,须先删除危大工程施工信息');
return false;
}
return SupervisionDangerousEngineeringMonitoring::destroy($params['id']);
}
/**
* @notes 获取工程监理--危大工程监控详情
* @param $params
* @return array
* @author likeadmin
* @date 2024/03/04 11:05
*/
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();
$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();
}
}

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

@ -11,145 +11,149 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--超规模危险性较大工程安全监控逻辑 /**
* Class SupervisionExcessRiskSecurityMonitoringLogic * 工程监理--超规模危险性较大工程安全监控逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionExcessRiskSecurityMonitoringLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic */
{ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
{
/**
* @notes 添加工程监理--超规模危险性较大工程安全监控 /**
* @param array $params * @notes 添加工程监理--超规模危险性较大工程安全监控
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 10:11 * @author likeadmin
*/ * @date 2024/03/04 10:11
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionExcessRiskSecurityMonitoring::create([ try {
'project_id' => $params['project_id'], SupervisionExcessRiskSecurityMonitoring::create([
'partial_project' => $params['partial_project'], 'project_id' => $params['project_id'],
'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, 'partial_project' => $params['partial_project'],
'project_characteristics' => $params['project_characteristics'], 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0,
'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, 'project_characteristics' => $params['project_characteristics'],
'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
'is_discuss' => $params['is_discuss'], 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0,
'is_modify' => $params['is_modify'], 'is_discuss' => $params['is_discuss'],
'is_agree' => $params['is_agree'], 'is_modify' => $params['is_modify'],
'is_accept' => $params['is_accept'], 'is_agree' => $params['is_agree'],
'is_accept_to_plan' => $params['is_accept_to_plan'], 'is_accept' => $params['is_accept'],
'check_user' => $params['check_user'], 'is_accept_to_plan' => $params['is_accept_to_plan'],
'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, 'check_user' => $params['check_user'],
'problems_rectification' => $params['problems_rectification'], 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0,
'responsible_person' => $params['responsible_person'], 'problems_rectification' => $params['problems_rectification'],
'exceed_the_control_value' => $params['exceed_the_control_value'], 'responsible_person' => $params['responsible_person'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'], 'exceed_the_control_value' => $params['exceed_the_control_value'],
'control_measures' => $params['control_measures'], 'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'create_user' => $params['create_user'], 'control_measures' => $params['control_measures'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
]); 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑工程监理--超规模危险性较大工程安全监控 /**
* @param array $params * @notes 编辑工程监理--超规模危险性较大工程安全监控
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 10:11 * @author likeadmin
*/ * @date 2024/03/04 10:11
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionExcessRiskSecurityMonitoring::where('id', $params['id'])->update([ try {
'project_id' => $params['project_id'], SupervisionExcessRiskSecurityMonitoring::where('id', $params['id'])->update([
'partial_project' => $params['partial_project'], 'project_id' => $params['project_id'],
'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, 'partial_project' => $params['partial_project'],
'project_characteristics' => $params['project_characteristics'], 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0,
'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, 'project_characteristics' => $params['project_characteristics'],
'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
'is_discuss' => $params['is_discuss'], 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0,
'is_modify' => $params['is_modify'], 'is_discuss' => $params['is_discuss'],
'is_agree' => $params['is_agree'], 'is_modify' => $params['is_modify'],
'is_accept' => $params['is_accept'], 'is_agree' => $params['is_agree'],
'is_accept_to_plan' => $params['is_accept_to_plan'], 'is_accept' => $params['is_accept'],
'check_user' => $params['check_user'], 'is_accept_to_plan' => $params['is_accept_to_plan'],
'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, 'check_user' => $params['check_user'],
'problems_rectification' => $params['problems_rectification'], 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0,
'responsible_person' => $params['responsible_person'], 'problems_rectification' => $params['problems_rectification'],
'exceed_the_control_value' => $params['exceed_the_control_value'], 'responsible_person' => $params['responsible_person'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'], 'exceed_the_control_value' => $params['exceed_the_control_value'],
'control_measures' => $params['control_measures'], 'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'create_user' => $params['create_user'], 'control_measures' => $params['control_measures'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
'update_time' => time() 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除工程监理--超规模危险性较大工程安全监控 /**
* @param array $params * @notes 删除工程监理--超规模危险性较大工程安全监控
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 10:11 * @author likeadmin
*/ * @date 2024/03/04 10:11
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return SupervisionExcessRiskSecurityMonitoring::destroy($params['id']); {
} return SupervisionExcessRiskSecurityMonitoring::destroy($params['id']);
}
/**
* @notes 获取工程监理--超规模危险性较大工程安全监控详情 /**
* @param $params * @notes 获取工程监理--超规模危险性较大工程安全监控详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/04 10:11 * @author likeadmin
*/ * @date 2024/03/04 10:11
public static function detail($params): array */
{ 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(); $data = SupervisionExcessRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['partial_project_text'] = $data->partial_project_text; $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
$data['is_discuss_text'] = $data->is_discuss_text; $data['project_name'] = $project['project_name'];
$data['is_modify_text'] = $data->is_modify_text; $data['partial_project_text'] = $data->partial_project_text;
$data['is_agree_text'] = $data->is_agree_text; $data['is_discuss_text'] = $data->is_discuss_text;
$data['is_accept_text'] = $data->is_accept_text; $data['is_modify_text'] = $data->is_modify_text;
$data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text; $data['is_agree_text'] = $data->is_agree_text;
$data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text; $data['is_accept_text'] = $data->is_accept_text;
$data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text; $data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text;
return $data->toArray(); $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();
}
}

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

@ -11,142 +11,146 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--危险性较大的工程安全监控逻辑 /**
* Class SupervisionHighRiskSecurityMonitoringLogic * 工程监理--危险性较大的工程安全监控逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionHighRiskSecurityMonitoringLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic */
{ class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
{
/**
* @notes 添加工程监理--危险性较大的工程安全监控 /**
* @param array $params * @notes 添加工程监理--危险性较大的工程安全监控
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 09:22 * @author likeadmin
*/ * @date 2024/03/04 09:22
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionHighRiskSecurityMonitoring::create([ try {
'project_id' => $params['project_id'], SupervisionHighRiskSecurityMonitoring::create([
'partial_project' => $params['partial_project'], 'project_id' => $params['project_id'],
'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, 'partial_project' => $params['partial_project'],
'project_characteristics' => $params['project_characteristics'], 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0,
'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, 'project_characteristics' => $params['project_characteristics'],
'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
'is_report' => $params['is_report'], 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0,
'is_agree' => $params['is_agree'], 'is_report' => $params['is_report'],
'is_accept' => $params['is_accept'], 'is_agree' => $params['is_agree'],
'is_accept_to_plan' => $params['is_accept_to_plan'], 'is_accept' => $params['is_accept'],
'check_user' => $params['check_user'], 'is_accept_to_plan' => $params['is_accept_to_plan'],
'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, 'check_user' => $params['check_user'],
'problems_rectification' => $params['problems_rectification'], 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0,
'responsible_person' => $params['responsible_person'], 'problems_rectification' => $params['problems_rectification'],
'exceed_the_control_value' => $params['exceed_the_control_value'], 'responsible_person' => $params['responsible_person'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'], 'exceed_the_control_value' => $params['exceed_the_control_value'],
'control_measures' => $params['control_measures'], 'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'create_user' => $params['create_user'], 'control_measures' => $params['control_measures'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
]); 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑工程监理--危险性较大的工程安全监控 /**
* @param array $params * @notes 编辑工程监理--危险性较大的工程安全监控
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 09:22 * @author likeadmin
*/ * @date 2024/03/04 09:22
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionHighRiskSecurityMonitoring::where('id', $params['id'])->update([ try {
'project_id' => $params['project_id'], SupervisionHighRiskSecurityMonitoring::where('id', $params['id'])->update([
'partial_project' => $params['partial_project'], 'project_id' => $params['project_id'],
'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, 'partial_project' => $params['partial_project'],
'project_characteristics' => $params['project_characteristics'], 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0,
'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, 'project_characteristics' => $params['project_characteristics'],
'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0,
'is_report' => $params['is_report'], 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0,
'is_agree' => $params['is_agree'], 'is_report' => $params['is_report'],
'is_accept' => $params['is_accept'], 'is_agree' => $params['is_agree'],
'is_accept_to_plan' => $params['is_accept_to_plan'], 'is_accept' => $params['is_accept'],
'check_user' => $params['check_user'], 'is_accept_to_plan' => $params['is_accept_to_plan'],
'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, 'check_user' => $params['check_user'],
'problems_rectification' => $params['problems_rectification'], 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0,
'responsible_person' => $params['responsible_person'], 'problems_rectification' => $params['problems_rectification'],
'exceed_the_control_value' => $params['exceed_the_control_value'], 'responsible_person' => $params['responsible_person'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'], 'exceed_the_control_value' => $params['exceed_the_control_value'],
'control_measures' => $params['control_measures'], 'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'create_user' => $params['create_user'], 'control_measures' => $params['control_measures'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), 'create_user' => $params['create_user'],
'update_time' => time() 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除工程监理--危险性较大的工程安全监控 /**
* @param array $params * @notes 删除工程监理--危险性较大的工程安全监控
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/04 09:22 * @author likeadmin
*/ * @date 2024/03/04 09:22
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return SupervisionHighRiskSecurityMonitoring::destroy($params['id']); {
} return SupervisionHighRiskSecurityMonitoring::destroy($params['id']);
}
/**
* @notes 获取工程监理--危险性较大的工程安全监控详情 /**
* @param $params * @notes 获取工程监理--危险性较大的工程安全监控详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/04 09:22 * @author likeadmin
*/ * @date 2024/03/04 09:22
public static function detail($params): array */
{ 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(); $data = SupervisionHighRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$data['partial_project_text'] = $data->partial_project_text; $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id');
$data['is_report_text'] = $data->is_report_text; $data['project_name'] = $project['project_name'];
$data['is_agree_text'] = $data->is_agree_text; $data['partial_project_text'] = $data->partial_project_text;
$data['is_accept_text'] = $data->is_accept_text; $data['is_report_text'] = $data->is_report_text;
$data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text; $data['is_agree_text'] = $data->is_agree_text;
$data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text; $data['is_accept_text'] = $data->is_accept_text;
$data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text; $data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text;
return $data->toArray(); $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();
}
}

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

@ -11,124 +11,62 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecord; use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment;
use app\common\model\supervision_project\SupervisionParticipatingUnits; use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecord;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_project\SupervisionParticipatingUnits;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 大型机械设备及仪器台账逻辑 /**
* Class SupervisionLargeMechanicalEquipmentLogic * 大型机械设备及仪器台账逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionLargeMechanicalEquipmentLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic */
{ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
{
/**
* @notes 添加大型机械设备及仪器台账 /**
* @param array $params * @notes 添加大型机械设备及仪器台账
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/02 09:51 * @author likeadmin
*/ * @date 2024/03/02 09:51
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
$res = SupervisionLargeMechanicalEquipment::create([ try {
'project_id' => $params['project_id'], $res = SupervisionLargeMechanicalEquipment::create([
'sn' => data_unique_code('SBYQTZ'), 'project_id' => $params['project_id'],
'name' => $params['name'], 'sn' => data_unique_code('SBYQTZ'),
'use_site' => $params['use_site'], 'name' => $params['name'],
'entry_time' => !empty($params['entry_time']) ? strtotime($params['entry_time']) : 0, 'use_site' => $params['use_site'],
'company_id' => $params['company_id'], 'entry_time' => !empty($params['entry_time']) ? strtotime($params['entry_time']) : 0,
'approval_date' => !empty($params['approval_date']) ? strtotime($params['approval_date']) : 0, 'company_id' => $params['company_id'],
'approval_result' => $params['approval_result'], 'approval_date' => !empty($params['approval_date']) ? strtotime($params['approval_date']) : 0,
'approval_form_code' => $params['approval_form_code'], 'approval_result' => $params['approval_result'],
'approval_type' => $params['approval_type'], 'approval_form_code' => $params['approval_form_code'],
'first_audit_opinion' => $params['first_audit_opinion'], 'approval_type' => $params['approval_type'],
'first_auditor' => $params['first_auditor'], 'first_audit_opinion' => $params['first_audit_opinion'],
'first_audit_time' => !empty($params['first_audit_time']) ? strtotime($params['first_audit_time']) : 0, 'first_auditor' => $params['first_auditor'],
'final_audit_opinion' => $params['final_audit_opinion'], 'first_audit_time' => !empty($params['first_audit_time']) ? strtotime($params['first_audit_time']) : 0,
'final_audit_time' => !empty($params['final_audit_time']) ? strtotime($params['final_audit_time']) : 0, 'final_audit_opinion' => $params['final_audit_opinion'],
'remark' => $params['remark'], 'final_audit_time' => !empty($params['final_audit_time']) ? strtotime($params['final_audit_time']) : 0,
'annex' => $params['annex'] ? json_encode($params['annex']) : null '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'])) {
SupervisionLargeMechanicalEquipmentMaintenanceRecord::create([ foreach ($params['maintenance_record'] as $v) {
'large_mechanical_equipment_id' => $res->id,
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
'month_warranty_file' => $v['month_warranty_file'],
'maintenance_period' => !empty($v['maintenance_period']) ? strtotime($v['maintenance_period']) : 0,
'accessory_one_validity' => !empty($v['accessory_one_validity']) ? strtotime($v['accessory_one_validity']) : 0,
'accessory_two_validity' => !empty($v['accessory_two_validity']) ? strtotime($v['accessory_two_validity']) : 0,
]);
}
}
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 编辑大型机械设备及仪器台账
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/02 09:51
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
SupervisionLargeMechanicalEquipment::where('id', $params['id'])->update([
'project_id' => $params['project_id'],
'name' => $params['name'],
'use_site' => $params['use_site'],
'entry_time' => !empty($params['entry_time']) ? strtotime($params['entry_time']) : 0,
'company_id' => $params['company_id'],
'approval_date' => !empty($params['approval_date']) ? strtotime($params['approval_date']) : 0,
'approval_result' => $params['approval_result'],
'approval_form_code' => $params['approval_form_code'],
'approval_type' => $params['approval_type'],
'first_audit_opinion' => $params['first_audit_opinion'],
'first_auditor' => $params['first_auditor'],
'first_audit_time' => !empty($params['first_audit_time']) ? strtotime($params['first_audit_time']) : 0,
'final_audit_opinion' => $params['final_audit_opinion'],
'final_audit_time' => !empty($params['final_audit_time']) ? strtotime($params['final_audit_time']) : 0,
'remark' => $params['remark'],
'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([
'large_mechanical_equipment_id' => $params['id'],
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
'month_warranty_file' => $v['month_warranty_file'],
'maintenance_period' => !empty($v['maintenance_period']) ? strtotime($v['maintenance_period']) : 0,
'accessory_one_validity' => !empty($v['accessory_one_validity']) ? strtotime($v['accessory_one_validity']) : 0,
'accessory_two_validity' => !empty($v['accessory_two_validity']) ? strtotime($v['accessory_two_validity']) : 0,
'update_time' => time()
]);
}else{
SupervisionLargeMechanicalEquipmentMaintenanceRecord::create([ SupervisionLargeMechanicalEquipmentMaintenanceRecord::create([
'large_mechanical_equipment_id' => $params['id'], 'large_mechanical_equipment_id' => $res->id,
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0, 'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
'month_warranty_file' => $v['month_warranty_file'], 'month_warranty_file' => $v['month_warranty_file'],
'maintenance_period' => !empty($v['maintenance_period']) ? strtotime($v['maintenance_period']) : 0, 'maintenance_period' => !empty($v['maintenance_period']) ? strtotime($v['maintenance_period']) : 0,
@ -136,53 +74,118 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
'accessory_two_validity' => !empty($v['accessory_two_validity']) ? strtotime($v['accessory_two_validity']) : 0, 'accessory_two_validity' => !empty($v['accessory_two_validity']) ? strtotime($v['accessory_two_validity']) : 0,
]); ]);
} }
} }
} Db::commit();
Db::commit(); return true;
return true; } catch (\Exception $e) {
} catch (\Exception $e) { Db::rollback();
Db::rollback(); self::setError($e->getMessage());
self::setError($e->getMessage()); return false;
return false; }
}
}
/**
* @notes 删除大型机械设备及仪器台账
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/02 09:51
*/
public static function delete(array $params): bool
{
$maintenance_record = SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('large_mechanical_equipment_id','in',$params['id'])->findOrEmpty();
if(!$maintenance_record->isEmpty()){
self::setError('当前数据下存在机械维修保养记录,请先删除机械维修保养记录数据');
return false;
} }
return SupervisionLargeMechanicalEquipment::destroy($params['id']);
}
/**
* @notes 编辑大型机械设备及仪器台账
/** * @param array $params
* @notes 获取大型机械设备及仪器台账详情 * @return bool
* @param $params * @author likeadmin
* @return array * @date 2024/03/02 09:51
* @author likeadmin */
* @date 2024/03/02 09:51 public static function edit(array $params): bool
*/ {
public static function detail($params): array Db::startTrans();
{ try {
$data = SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); SupervisionLargeMechanicalEquipment::where('id', $params['id'])->update([
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); 'project_id' => $params['project_id'],
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty(); 'name' => $params['name'],
$data['project_name'] = $project['project_name']; 'use_site' => $params['use_site'],
$data['company_name'] = $company['unit_name']; 'entry_time' => !empty($params['entry_time']) ? strtotime($params['entry_time']) : 0,
$data['approval_type_text'] = $data->approval_type_text; 'company_id' => $params['company_id'],
$data['first_audit_opinion_text'] = $data->first_audit_opinion_text; 'approval_date' => !empty($params['approval_date']) ? strtotime($params['approval_date']) : 0,
$data['final_audit_opinion_text'] = $data->final_audit_opinion_text; 'approval_result' => $params['approval_result'],
return $data->toArray(); 'approval_form_code' => $params['approval_form_code'],
} 'approval_type' => $params['approval_type'],
} 'first_audit_opinion' => $params['first_audit_opinion'],
'first_auditor' => $params['first_auditor'],
'first_audit_time' => !empty($params['first_audit_time']) ? strtotime($params['first_audit_time']) : 0,
'final_audit_opinion' => $params['final_audit_opinion'],
'final_audit_time' => !empty($params['final_audit_time']) ? strtotime($params['final_audit_time']) : 0,
'remark' => $params['remark'],
'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([
'large_mechanical_equipment_id' => $params['id'],
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
'month_warranty_file' => $v['month_warranty_file'],
'maintenance_period' => !empty($v['maintenance_period']) ? strtotime($v['maintenance_period']) : 0,
'accessory_one_validity' => !empty($v['accessory_one_validity']) ? strtotime($v['accessory_one_validity']) : 0,
'accessory_two_validity' => !empty($v['accessory_two_validity']) ? strtotime($v['accessory_two_validity']) : 0,
'update_time' => time()
]);
} else {
SupervisionLargeMechanicalEquipmentMaintenanceRecord::create([
'large_mechanical_equipment_id' => $params['id'],
'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0,
'month_warranty_file' => $v['month_warranty_file'],
'maintenance_period' => !empty($v['maintenance_period']) ? strtotime($v['maintenance_period']) : 0,
'accessory_one_validity' => !empty($v['accessory_one_validity']) ? strtotime($v['accessory_one_validity']) : 0,
'accessory_two_validity' => !empty($v['accessory_two_validity']) ? strtotime($v['accessory_two_validity']) : 0,
]);
}
}
}
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除大型机械设备及仪器台账
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/02 09:51
*/
public static function delete(array $params): bool
{
$maintenance_record = SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('large_mechanical_equipment_id', 'in', $params['id'])->findOrEmpty();
if (!$maintenance_record->isEmpty()) {
self::setError('当前数据下存在机械维修保养记录,请先删除机械维修保养记录数据');
return false;
}
return SupervisionLargeMechanicalEquipment::destroy($params['id']);
}
/**
* @notes 获取大型机械设备及仪器台账详情
* @param $params
* @return array
* @author likeadmin
* @date 2024/03/02 09:51
*/
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();
$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();
}
}

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

@ -11,111 +11,114 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | author: likeadminTeam // | 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\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign;
use think\facade\Db; use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
* 工程监理--现场安全警示标志逻辑 /**
* Class SupervisionSafetyWarningSignLogic * 工程监理--现场安全警示标志逻辑
* @package app\adminapi\logic\supervision_dangerous * Class SupervisionSafetyWarningSignLogic
*/ * @package app\adminapi\logic\supervision_dangerous
class SupervisionSafetyWarningSignLogic extends BaseLogic */
{ class SupervisionSafetyWarningSignLogic extends BaseLogic
{
/**
* @notes 添加工程监理--现场安全警示标志 /**
* @param array $params * @notes 添加工程监理--现场安全警示标志
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/01 15:41 * @author likeadmin
*/ * @date 2024/03/01 15:41
public static function add(array $params): bool */
{ public static function add(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionSafetyWarningSign::create([ try {
'project_id' => $params['project_id'], SupervisionSafetyWarningSign::create([
'check_user' => $params['check_user'], 'project_id' => $params['project_id'],
'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, 'check_user' => $params['check_user'],
'check_area' => $params['check_area'], 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0,
'problem_desc' => $params['problem_desc'], 'check_area' => $params['check_area'],
'remark' => $params['remark'], 'problem_desc' => $params['problem_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'remark' => $params['remark'],
]); 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 编辑工程监理--现场安全警示标志 /**
* @param array $params * @notes 编辑工程监理--现场安全警示标志
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/01 15:41 * @author likeadmin
*/ * @date 2024/03/01 15:41
public static function edit(array $params): bool */
{ public static function edit(array $params): bool
Db::startTrans(); {
try { Db::startTrans();
SupervisionSafetyWarningSign::where('id', $params['id'])->update([ try {
'project_id' => $params['project_id'], SupervisionSafetyWarningSign::where('id', $params['id'])->update([
'check_user' => $params['check_user'], 'project_id' => $params['project_id'],
'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, 'check_user' => $params['check_user'],
'check_area' => $params['check_area'], 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0,
'problem_desc' => $params['problem_desc'], 'check_area' => $params['check_area'],
'remark' => $params['remark'], 'problem_desc' => $params['problem_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'remark' => $params['remark'],
'update_time' => time() 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); 'update_time' => time()
Db::commit(); ]);
return true; Db::commit();
} catch (\Exception $e) { return true;
Db::rollback(); } catch (\Exception $e) {
self::setError($e->getMessage()); Db::rollback();
return false; self::setError($e->getMessage());
} return false;
} }
}
/**
* @notes 删除工程监理--现场安全警示标志 /**
* @param array $params * @notes 删除工程监理--现场安全警示标志
* @return bool * @param array $params
* @author likeadmin * @return bool
* @date 2024/03/01 15:41 * @author likeadmin
*/ * @date 2024/03/01 15:41
public static function delete(array $params): bool */
{ public static function delete(array $params): bool
return SupervisionSafetyWarningSign::destroy($params['id']); {
} return SupervisionSafetyWarningSign::destroy($params['id']);
}
/**
* @notes 获取工程监理--现场安全警示标志详情 /**
* @param $params * @notes 获取工程监理--现场安全警示标志详情
* @return array * @param $params
* @author likeadmin * @return array
* @date 2024/03/01 15:41 * @author likeadmin
*/ * @date 2024/03/01 15:41
public static function detail($params): array */
{ 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(); $data = SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$data['project_name'] = $project['project_name']; $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
return $data->toArray(); $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['project_name'] = $project['project_name'];
$data['emcee_name'] = $admin[$data['emcee']] ?? ''; $data['emcee_name'] = $admin[$data['emcee']] ?? '';
$data['recorder_name'] = $admin[$data['recorder']] ?? ''; $data['recorder_name'] = $admin[$data['recorder']] ?? '';
$data['attendees_name'] = implode(',', $attendees);
return $data->toArray(); return $data->toArray();
} }
} }