diff --git a/app/adminapi/lists/consult_basic/ConsultNewStartProjectLists.php b/app/adminapi/lists/consult_basic/ConsultNewStartProjectLists.php index 004f73386..e54aa2f59 100644 --- a/app/adminapi/lists/consult_basic/ConsultNewStartProjectLists.php +++ b/app/adminapi/lists/consult_basic/ConsultNewStartProjectLists.php @@ -11,72 +11,77 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\consult_basic; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\consult_basic\ConsultNewStartProject; -use app\common\lists\ListsSearchInterface; -use app\common\model\consult_basic\ConsultProject; - - -/** - * 项目咨询--新开工项目管理列表 - * Class ConsultNewStartProjectLists - * @package app\adminapi\listsconsult_basic - */ -class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id'], - '%like%' => ['address', 'service_scope', 'basic_type', 'duration'], - ]; - } - - - /** - * @notes 获取项目咨询--新开工项目管理列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function lists(): array - { - return ConsultNewStartProject::where($this->searchWhere) - ->field(['id', 'project_id', 'address', 'service_scope', 'area', 'invest', 'basic_type', 'duration']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = ConsultProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取项目咨询--新开工项目管理数量 - * @return int - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function count(): int - { - return ConsultNewStartProject::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\consult_basic; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\consult_basic\ConsultNewStartProject; + use app\common\model\consult_basic\ConsultProject; + + + /** + * 项目咨询--新开工项目管理列表 + * Class ConsultNewStartProjectLists + * @package app\adminapi\listsconsult_basic + */ + class ConsultNewStartProjectLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id'], + '%like%' => ['address', 'service_scope', 'basic_type', 'duration'], + ]; + } + + + /** + * @notes 获取项目咨询--新开工项目管理列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public function lists(): array + { + return ConsultNewStartProject::where($this->searchWhere) + ->field(['id', 'project_id', 'address', 'service_scope', 'area', 'invest', 'basic_type', 'duration']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = ConsultProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $admin = Admin::where('id', 'in', [$data['project_manager'], $data['deputy_project_manager'], $data['engineer']])->column('name', 'id'); + $data['project_manager_name'] = $admin[$data['project_manager']] ?? ''; + $data['deputy_project_manager_name'] = $admin[$data['deputy_project_manager']] ?? ''; + $data['engineer_name'] = $admin[$data['engineer']] ?? ''; + }) + ->toArray(); + } + + + /** + * @notes 获取项目咨询--新开工项目管理数量 + * @return int + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public function count(): int + { + return ConsultNewStartProject::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/consult_basic/ConsultProjectEvolveLists.php b/app/adminapi/lists/consult_basic/ConsultProjectEvolveLists.php index bd7a170e2..d82738b0a 100644 --- a/app/adminapi/lists/consult_basic/ConsultProjectEvolveLists.php +++ b/app/adminapi/lists/consult_basic/ConsultProjectEvolveLists.php @@ -11,67 +11,71 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\consult_basic; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\consult_basic\ConsultProjectEvolve; -use app\common\lists\ListsSearchInterface; - - -/** - * 项目咨询--项目组工作开展情况列表 - * Class ConsultProjectEvolveLists - * @package app\adminapi\listsconsult_basic - */ -class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function setSearch(): array - { - return [ - '=' => ['new_start_project_id'], - ]; - } - - - /** - * @notes 获取项目咨询--项目组工作开展情况列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function lists(): array - { - return ConsultProjectEvolve::where($this->searchWhere) - ->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select() - ->toArray(); - } - - - /** - * @notes 获取项目咨询--项目组工作开展情况数量 - * @return int - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function count(): int - { - return ConsultProjectEvolve::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\consult_basic; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\consult_basic\ConsultProjectEvolve; + + + /** + * 项目咨询--项目组工作开展情况列表 + * Class ConsultProjectEvolveLists + * @package app\adminapi\listsconsult_basic + */ + class ConsultProjectEvolveLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public function setSearch(): array + { + return [ + '=' => ['new_start_project_id'], + ]; + } + + + /** + * @notes 获取项目咨询--项目组工作开展情况列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public function lists(): array + { + return ConsultProjectEvolve::where($this->searchWhere) + ->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->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 + */ + public function count(): int + { + return ConsultProjectEvolve::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/consult_basic/ConsultProjectLists.php b/app/adminapi/lists/consult_basic/ConsultProjectLists.php index 09340eaa9..6d5e497fd 100644 --- a/app/adminapi/lists/consult_basic/ConsultProjectLists.php +++ b/app/adminapi/lists/consult_basic/ConsultProjectLists.php @@ -11,76 +11,79 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\consult_basic; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\consult_basic\ConsultProject; -use app\common\lists\ListsSearchInterface; - - -/** - * 基本信息列表 - * Class ConsultProjectLists - * @package app\adminapi\listsconsult_basic - */ -class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/11 09:25 - */ - public function setSearch(): array - { - return [ - '%like%' => ['project_name', 'project_code', 'company', 'contract'], - ]; - } - - - /** - * @notes 获取基本信息列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/11 09:25 - */ - 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']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $data['engineering_status_text'] = $data->engineering_status_text; - $data['consult_type_text'] = $data->consult_type_text; - $data['project_manager_name'] = $data->project_manager_name_text; - $data['implementation_department_name'] = $data->implementation_department_name_text; - $data['supervision_department_name'] = $data->supervision_department_name_text; - $data['contract_name'] = $data->contract_name_text; - $data['company_name'] = $data->company_name_text; - - }) - ->toArray(); - } - - - /** - * @notes 获取基本信息数量 - * @return int - * @author likeadmin - * @date 2024/03/11 09:25 - */ - public function count(): int - { - return ConsultProject::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\consult_basic; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\consult_basic\ConsultProject; + + + /** + * 基本信息列表 + * Class ConsultProjectLists + * @package app\adminapi\listsconsult_basic + */ + class ConsultProjectLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/11 09:25 + */ + public function setSearch(): array + { + return [ + '%like%' => ['project_name', 'project_code', 'company', 'contract'], + ]; + } + + + /** + * @notes 获取基本信息列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/11 09:25 + */ + 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']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $data['engineering_status_text'] = $data->engineering_status_text; + $data['consult_type_text'] = $data->consult_type_text; + $data['project_manager_name'] = $data->project_manager_name_text; + $data['implementation_department_name'] = $data->implementation_department_name_text; + $data['supervision_department_name'] = $data->supervision_department_name_text; + $data['contract_name'] = $data->contract_name_text; + $data['company_name'] = $data->company_name_text; + $admin = Admin::field('name')->where('id', $data['consult_user'])->findOrEmpty(); + $data['consult_user_name'] = $admin?->name; + + }) + ->toArray(); + } + + + /** + * @notes 获取基本信息数量 + * @return int + * @author likeadmin + * @date 2024/03/11 09:25 + */ + public function count(): int + { + return ConsultProject::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/consult_basic/ConsultProjectPreparationLists.php b/app/adminapi/lists/consult_basic/ConsultProjectPreparationLists.php index 7734b570c..bdb70b51a 100644 --- a/app/adminapi/lists/consult_basic/ConsultProjectPreparationLists.php +++ b/app/adminapi/lists/consult_basic/ConsultProjectPreparationLists.php @@ -11,67 +11,71 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\consult_basic; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\consult_basic\ConsultProjectPreparation; -use app\common\lists\ListsSearchInterface; - - -/** - * 项目咨询--项目组后勤准备工作列表 - * Class ConsultProjectPreparationLists - * @package app\adminapi\listsconsult_basic - */ -class ConsultProjectPreparationLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function setSearch(): array - { - return [ - '=' => ['new_start_project_id'], - ]; - } - - - /** - * @notes 获取项目咨询--项目组后勤准备工作列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function lists(): array - { - return ConsultProjectPreparation::where($this->searchWhere) - ->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select() - ->toArray(); - } - - - /** - * @notes 获取项目咨询--项目组后勤准备工作数量 - * @return int - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public function count(): int - { - return ConsultProjectPreparation::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\consult_basic; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\consult_basic\ConsultProjectPreparation; + + + /** + * 项目咨询--项目组后勤准备工作列表 + * Class ConsultProjectPreparationLists + * @package app\adminapi\listsconsult_basic + */ + class ConsultProjectPreparationLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public function setSearch(): array + { + return [ + '=' => ['new_start_project_id'], + ]; + } + + + /** + * @notes 获取项目咨询--项目组后勤准备工作列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public function lists(): array + { + return ConsultProjectPreparation::where($this->searchWhere) + ->field(['id', 'new_start_project_id', 'name', 'progress_status', 'resp_user']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->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 + */ + public function count(): int + { + return ConsultProjectPreparation::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/financial/FinancialCollectionPlanLists.php b/app/adminapi/lists/financial/FinancialCollectionPlanLists.php index 03fd931b4..87e9322ab 100644 --- a/app/adminapi/lists/financial/FinancialCollectionPlanLists.php +++ b/app/adminapi/lists/financial/FinancialCollectionPlanLists.php @@ -17,6 +17,7 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; use app\common\model\financial\FinancialCollectionPlan; use app\common\model\marketing\MarketingContract; @@ -72,6 +73,8 @@ $data['business_nature'] = $contract?->business_nature_text; $data['signed_amount'] = $contract?->signed_amount; $data['signed_date'] = $contract?->create_time; + $admin = Admin::field('name')->where('id', $data['collection_user'])->findOrEmpty(); + $data['collection_user_name'] = $admin?->name; }) ->toArray(); } diff --git a/app/adminapi/lists/financial/FinancialInvoiceLists.php b/app/adminapi/lists/financial/FinancialInvoiceLists.php index 75956e1d7..e24fc94e9 100644 --- a/app/adminapi/lists/financial/FinancialInvoiceLists.php +++ b/app/adminapi/lists/financial/FinancialInvoiceLists.php @@ -17,6 +17,7 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; use app\common\model\marketing\MarketingContract; @@ -66,6 +67,8 @@ ->select()->each(function ($data) { $contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['apply_contact'])->findOrEmpty(); + $data['apply_contact_name'] = $admin?->name; $data['contract_name'] = $contract['contract_name']; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['part_a'] = $custom['name']; diff --git a/app/adminapi/lists/manage_communication/ManageAcceptDocLists.php b/app/adminapi/lists/manage_communication/ManageAcceptDocLists.php index 84af576c4..d64429f52 100644 --- a/app/adminapi/lists/manage_communication/ManageAcceptDocLists.php +++ b/app/adminapi/lists/manage_communication/ManageAcceptDocLists.php @@ -11,86 +11,90 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\manage_communication; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\manage_basic\ManageProject; -use app\common\model\manage_communication\ManageAcceptDoc; -use app\common\lists\ListsSearchInterface; - - -/** - * 项目管理--收文管理列表 - * Class ManageAcceptDocLists - * @package app\adminapi\listsmanage_communication - */ -class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/07 16:46 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id'], - '%like%' => ['send_company', 'accept_user'], - ]; - } - - - /** - * @notes 获取项目管理--收文管理列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/07 16:46 - */ - public function lists(): array - { - $params = $this->request->get(); - $condition = []; - if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ - if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){ - $condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]]; - } - } - return ManageAcceptDoc::where($this->searchWhere)->where($condition) - ->field(['id', 'project_id', 'abstract', 'send_company', 'send_date', 'accept_user', 'accept_date']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取项目管理--收文管理数量 - * @return int - * @author likeadmin - * @date 2024/03/07 16:46 - */ - public function count(): int - { - $params = $this->request->get(); - $condition = []; - if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ - if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){ - $condition[] = ['date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]]; - } - } - return ManageAcceptDoc::where($this->searchWhere)->where($condition)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\manage_communication; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\manage_basic\ManageProject; + use app\common\model\manage_communication\ManageAcceptDoc; + + + /** + * 项目管理--收文管理列表 + * Class ManageAcceptDocLists + * @package app\adminapi\listsmanage_communication + */ + class ManageAcceptDocLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/07 16:46 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id'], + '%like%' => ['send_company', 'accept_user'], + ]; + } + + + /** + * @notes 获取项目管理--收文管理列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/07 16:46 + */ + public function lists(): array + { + $params = $this->request->get(); + $condition = []; + if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') { + if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) { + $condition[] = ['send_date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]]; + } + } + return ManageAcceptDoc::where($this->searchWhere)->where($condition) + ->field(['id', 'project_id', 'abstract', 'send_company', 'send_date', 'accept_user', 'accept_date']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $admin = Admin::where('id', 'in', [$data['accept_user'], $data['read_user']])->column('name', 'id'); + $data['accept_user_name'] = $admin[$data['accept_user']] ?? ''; + $data['read_user_name'] = $admin[$data['read_user']] ?? ''; + }) + ->toArray(); + } + + + /** + * @notes 获取项目管理--收文管理数量 + * @return int + * @author likeadmin + * @date 2024/03/07 16:46 + */ + public function count(): int + { + $params = $this->request->get(); + $condition = []; + if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') { + if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) { + $condition[] = ['date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]]; + } + } + return ManageAcceptDoc::where($this->searchWhere)->where($condition)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/manage_communication/ManageInfoReportLists.php b/app/adminapi/lists/manage_communication/ManageInfoReportLists.php index 13c6ca0d0..2cb4d339d 100644 --- a/app/adminapi/lists/manage_communication/ManageInfoReportLists.php +++ b/app/adminapi/lists/manage_communication/ManageInfoReportLists.php @@ -11,74 +11,77 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\manage_communication; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\manage_basic\ManageProject; -use app\common\model\manage_communication\ManageInfoReport; -use app\common\lists\ListsSearchInterface; - - -/** - * 项目管理--项目信息上报列表 - * Class ManageInfoReportLists - * @package app\adminapi\listsmanage_communication - */ -class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/08 13:33 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id', 'severity'], - '%like%' => ['giver'], - ]; - } - - - /** - * @notes 获取项目管理--项目信息上报列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/08 13:33 - */ - public function lists(): array - { - return ManageInfoReport::where($this->searchWhere) - ->field(['id', 'project_id', 'abstract', 'happen_date', 'severity', 'info_cate', 'giver']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['severity_text'] = $data->severity_text; - $data['info_cate_text'] = $data->info_cate_text; - }) - ->toArray(); - } - - - /** - * @notes 获取项目管理--项目信息上报数量 - * @return int - * @author likeadmin - * @date 2024/03/08 13:33 - */ - public function count(): int - { - return ManageInfoReport::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\manage_communication; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\manage_basic\ManageProject; + use app\common\model\manage_communication\ManageInfoReport; + + + /** + * 项目管理--项目信息上报列表 + * Class ManageInfoReportLists + * @package app\adminapi\listsmanage_communication + */ + class ManageInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/08 13:33 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id', 'severity'], + '%like%' => ['giver'], + ]; + } + + + /** + * @notes 获取项目管理--项目信息上报列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/08 13:33 + */ + public function lists(): array + { + return ManageInfoReport::where($this->searchWhere) + ->field(['id', 'project_id', 'abstract', 'happen_date', 'severity', 'info_cate', 'giver']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['severity_text'] = $data->severity_text; + $data['info_cate_text'] = $data->info_cate_text; + $admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty(); + $data['giver_name'] = $admin?->name; + }) + ->toArray(); + } + + + /** + * @notes 获取项目管理--项目信息上报数量 + * @return int + * @author likeadmin + * @date 2024/03/08 13:33 + */ + public function count(): int + { + return ManageInfoReport::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/manage_communication/ManageSendDocLists.php b/app/adminapi/lists/manage_communication/ManageSendDocLists.php index 407357a15..5491a643e 100644 --- a/app/adminapi/lists/manage_communication/ManageSendDocLists.php +++ b/app/adminapi/lists/manage_communication/ManageSendDocLists.php @@ -11,86 +11,90 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\manage_communication; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\manage_basic\ManageProject; -use app\common\model\manage_communication\ManageSendDoc; -use app\common\lists\ListsSearchInterface; - - -/** - * 项目管理--发文管理列表 - * Class ManageSendDocLists - * @package app\adminapi\listsmanage_communication - */ -class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/07 17:15 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id'], - '%like%' => ['code', 'send_user', 'accept_user'], - ]; - } - - - /** - * @notes 获取项目管理--发文管理列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/07 17:15 - */ - public function lists(): array - { - $params = $this->request->get(); - $condition = []; - if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ - if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){ - $condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]]; - } - } - return ManageSendDoc::where($this->searchWhere)->where($condition) - ->field(['id', 'project_id', 'code', 'abstract', 'send_date', 'send_company', 'send_user', 'accept_user', 'remark']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = ManageProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取项目管理--发文管理数量 - * @return int - * @author likeadmin - * @date 2024/03/07 17:15 - */ - public function count(): int - { - $params = $this->request->get(); - $condition = []; - if(isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != ''){ - if(strtotime($params['end_date']) - strtotime($params['start_date']) >= 0){ - $condition[] = ['send_date','between',[strtotime($params['start_date'].' 00:00:00'),strtotime($params['end_date'].' 23:59:59')]]; - } - } - return ManageSendDoc::where($this->searchWhere)->where($condition)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\manage_communication; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\manage_basic\ManageProject; + use app\common\model\manage_communication\ManageSendDoc; + + + /** + * 项目管理--发文管理列表 + * Class ManageSendDocLists + * @package app\adminapi\listsmanage_communication + */ + class ManageSendDocLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/07 17:15 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id'], + '%like%' => ['code', 'send_user', 'accept_user'], + ]; + } + + + /** + * @notes 获取项目管理--发文管理列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/07 17:15 + */ + public function lists(): array + { + $params = $this->request->get(); + $condition = []; + if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') { + if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) { + $condition[] = ['send_date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]]; + } + } + return ManageSendDoc::where($this->searchWhere)->where($condition) + ->field(['id', 'project_id', 'code', 'abstract', 'send_date', 'send_company', 'send_user', 'accept_user', 'remark']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = ManageProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $admin = Admin::where('id', 'in', [$data['send_user'], $data['accept_user']])->column('name', 'id'); + $data['send_user_name'] = $admin[$data['send_user']] ?? ''; + $data['accept_user_name'] = $admin[$data['accept_user']] ?? ''; + }) + ->toArray(); + } + + + /** + * @notes 获取项目管理--发文管理数量 + * @return int + * @author likeadmin + * @date 2024/03/07 17:15 + */ + public function count(): int + { + $params = $this->request->get(); + $condition = []; + if (isset($params['start_date']) && $params['start_date'] != '' && isset($params['end_date']) && $params['end_date'] != '') { + if (strtotime($params['end_date']) - strtotime($params['start_date']) >= 0) { + $condition[] = ['send_date', 'between', [strtotime($params['start_date'] . ' 00:00:00'), strtotime($params['end_date'] . ' 23:59:59')]]; + } + } + return ManageSendDoc::where($this->searchWhere)->where($condition)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/marketing/MarketingBranchFilingLists.php b/app/adminapi/lists/marketing/MarketingBranchFilingLists.php index e06d9c44b..315295e68 100644 --- a/app/adminapi/lists/marketing/MarketingBranchFilingLists.php +++ b/app/adminapi/lists/marketing/MarketingBranchFilingLists.php @@ -17,6 +17,7 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; use app\common\model\marketing\MarketingBranchFiling; @@ -59,6 +60,11 @@ ->order(['id' => 'desc']) ->select()->each(function ($data) { $data['filing_type_text'] = $data->filing_type; + $admin = Admin::where('id', 'in', [$data['fddbr'], $data['jbr'], $data['fzr'], $data['jsfzr']])->column('name', 'id'); + $data['fddbr_name'] = $admin[$data['fddbr']] ?? ''; + $data['jbr_name'] = $admin[$data['jbr']] ?? ''; + $data['fzr_name'] = $admin[$data['fzr']] ?? ''; + $data['jsfzr_name'] = $admin[$data['jsfzr']] ?? ''; }) ->toArray(); } diff --git a/app/adminapi/lists/marketing/MarketingCustomLists.php b/app/adminapi/lists/marketing/MarketingCustomLists.php index 0aa3c80d7..1dec1a792 100644 --- a/app/adminapi/lists/marketing/MarketingCustomLists.php +++ b/app/adminapi/lists/marketing/MarketingCustomLists.php @@ -17,6 +17,7 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; use app\common\model\dept\Dept; use app\common\model\GeoCity; use app\common\model\GeoProvince; @@ -74,6 +75,8 @@ $data['total_contract_num'] = MarketingContract::where('part_a', $data['id'])->where('status', 1)->count(); $data['total_contract_amount'] = MarketingContract::where('part_a', $data['id'])->where('status', 1)->sum('signed_amount'); $data['is_deal'] = $data['total_contract_num'] <= 0 ? '否' : '是'; + $admin = Admin::field('name')->where('id', $data['invoice_contact'])->findOrEmpty(); + $data['invoice_contact_name'] = $admin?->name; }) ->toArray(); } diff --git a/app/adminapi/lists/marketing/MarketingProjectFilingDetailLists.php b/app/adminapi/lists/marketing/MarketingProjectFilingDetailLists.php index 4b0be632c..720fa5cbe 100644 --- a/app/adminapi/lists/marketing/MarketingProjectFilingDetailLists.php +++ b/app/adminapi/lists/marketing/MarketingProjectFilingDetailLists.php @@ -17,6 +17,7 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; use app\common\model\marketing\MarketingContract; use app\common\model\marketing\MarketingProjectFiling; use app\common\model\marketing\MarketingProjectFilingDetail; @@ -71,6 +72,8 @@ $data['filing_role_text'] = $data->filing_role_text; $data['status'] = (string)$data['status']; $data['status_text'] = $data->status_text; + $admin = Admin::field('name')->where('id', $data['filing_user'])->findOrEmpty(); + $data['filing_user_name'] = $admin?->name; }) ->toArray(); } diff --git a/app/adminapi/lists/supervision_connect/SupervisionCompanyCheckLists.php b/app/adminapi/lists/supervision_connect/SupervisionCompanyCheckLists.php index 807d4adc4..e5879f90a 100644 --- a/app/adminapi/lists/supervision_connect/SupervisionCompanyCheckLists.php +++ b/app/adminapi/lists/supervision_connect/SupervisionCompanyCheckLists.php @@ -11,72 +11,76 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_connect; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_connect\SupervisionCompanyCheck; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--公司检查列表 - * Class SupervisionCompanyCheckLists - * @package app\adminapi\listssupervision_connect - */ -class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/05 11:57 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id'], - '%like%' => ['name', 'user', 'problem_name'], - ]; - } - - - /** - * @notes 获取工程监理--公司检查列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/05 11:57 - */ - 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']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--公司检查数量 - * @return int - * @author likeadmin - * @date 2024/03/05 11:57 - */ - public function count(): int - { - return SupervisionCompanyCheck::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_connect; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_connect\SupervisionCompanyCheck; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--公司检查列表 + * Class SupervisionCompanyCheckLists + * @package app\adminapi\listssupervision_connect + */ + class SupervisionCompanyCheckLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/05 11:57 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id'], + '%like%' => ['name', 'user', 'problem_name'], + ]; + } + + + /** + * @notes 获取工程监理--公司检查列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/05 11:57 + */ + 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']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $admin = Admin::where('id', 'in', [$data['user'], $data['reply_user']])->column('name', 'id'); + $data['user_name'] = $admin[$data['user']] ?? ''; + $data['reply_user_name'] = $admin[$data['reply_user']] ?? ''; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--公司检查数量 + * @return int + * @author likeadmin + * @date 2024/03/05 11:57 + */ + public function count(): int + { + return SupervisionCompanyCheck::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_connect/SupervisionProjectInfoReportLists.php b/app/adminapi/lists/supervision_connect/SupervisionProjectInfoReportLists.php index e30dd47ef..6c150ddbe 100644 --- a/app/adminapi/lists/supervision_connect/SupervisionProjectInfoReportLists.php +++ b/app/adminapi/lists/supervision_connect/SupervisionProjectInfoReportLists.php @@ -11,74 +11,77 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_connect; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_connect\SupervisionProjectInfoReport; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--项目重大信息上报列表 - * Class SupervisionProjectInfoReportLists - * @package app\adminapi\listssupervision_connect - */ -class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/05 10:53 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id', 'severity'], - '%like%' => ['abstract', 'giver'], - ]; - } - - - /** - * @notes 获取工程监理--项目重大信息上报列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/05 10:53 - */ - public function lists(): array - { - return SupervisionProjectInfoReport::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['project_manager'] = $project['project_manager']; - $data['severity_text'] = $data->severity_text; - $data['info_cate_text'] = $data->info_cate_text; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--项目重大信息上报数量 - * @return int - * @author likeadmin - * @date 2024/03/05 10:53 - */ - public function count(): int - { - return SupervisionProjectInfoReport::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_connect; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_connect\SupervisionProjectInfoReport; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--项目重大信息上报列表 + * Class SupervisionProjectInfoReportLists + * @package app\adminapi\listssupervision_connect + */ + class SupervisionProjectInfoReportLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/05 10:53 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id', 'severity'], + '%like%' => ['abstract', 'giver'], + ]; + } + + + /** + * @notes 获取工程监理--项目重大信息上报列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/05 10:53 + */ + public function lists(): array + { + return SupervisionProjectInfoReport::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name,project_manager')->where('id', $data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['project_manager'] = $project['project_manager']; + $data['severity_text'] = $data->severity_text; + $data['info_cate_text'] = $data->info_cate_text; + $admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty(); + $data['giver_name'] = $admin?->name; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--项目重大信息上报数量 + * @return int + * @author likeadmin + * @date 2024/03/05 10:53 + */ + public function count(): int + { + return SupervisionProjectInfoReport::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringCaseLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringCaseLists.php index 8f89e99f0..0e358844d 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringCaseLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringCaseLists.php @@ -11,76 +11,79 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--危大方案提交列表列表 - * Class SupervisionDangerousEngineeringCaseLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/04 14:00 - */ - public function setSearch(): array - { - return [ - '=' => ['dangerous_engineering_monitoring_id'], - '%like%' => ['case_name', 'assessor'], - ]; - } - - - /** - * @notes 获取工程监理--危大方案提交列表列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/04 14:00 - */ - public function lists(): array - { - return SupervisionDangerousEngineeringCase::where($this->searchWhere) - ->field(['id', 'dangerous_engineering_monitoring_id', 'case_name', 'assessor']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); - $project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); - $data['dangerous_engineering_monitoring_title'] = $project['project_name']; - $data['project_name'] = $project['project_name']; - $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--危大方案提交列表数量 - * @return int - * @author likeadmin - * @date 2024/03/04 14:00 - */ - public function count(): int - { - return SupervisionDangerousEngineeringCase::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--危大方案提交列表列表 + * Class SupervisionDangerousEngineeringCaseLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionDangerousEngineeringCaseLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/04 14:00 + */ + public function setSearch(): array + { + return [ + '=' => ['dangerous_engineering_monitoring_id'], + '%like%' => ['case_name', 'assessor'], + ]; + } + + + /** + * @notes 获取工程监理--危大方案提交列表列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/04 14:00 + */ + public function lists(): array + { + return SupervisionDangerousEngineeringCase::where($this->searchWhere) + ->field(['id', 'dangerous_engineering_monitoring_id', 'case_name', 'assessor']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['assessor'])->findOrEmpty(); + $data['dangerous_engineering_monitoring_title'] = $project['project_name']; + $data['project_name'] = $project['project_name']; + $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; + $data['assessor_name'] = $admin?->name; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--危大方案提交列表数量 + * @return int + * @author likeadmin + * @date 2024/03/04 14:00 + */ + public function count(): int + { + return SupervisionDangerousEngineeringCase::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringConstructionLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringConstructionLists.php index c09aeb7b8..808311390 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringConstructionLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringConstructionLists.php @@ -11,78 +11,81 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--危大工程施工列表列表 - * Class SupervisionDangerousEngineeringConstructionLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/04 16:02 - */ - public function setSearch(): array - { - return [ - '=' => ['dangerous_engineering_monitoring_id', 'is_notice'], - '%like%' => ['notice_user'], - ]; - } - - - /** - * @notes 获取工程监理--危大工程施工列表列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/04 16:02 - */ - public function lists(): array - { - return SupervisionDangerousEngineeringConstruction::where($this->searchWhere) - ->field(['id', 'dangerous_engineering_monitoring_id', 'actual_construction_date', 'is_notice', 'notice_user']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,position')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); - $project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['type'] = $dangerous_engineering_monitoring->type_text; - $data['position'] = $dangerous_engineering_monitoring['position']; - $data['is_notice_text'] = $data->is_notice_text; - $data['dangerous_engineering_monitoring_title'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--危大工程施工列表数量 - * @return int - * @author likeadmin - * @date 2024/03/04 16:02 - */ - public function count(): int - { - return SupervisionDangerousEngineeringConstruction::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--危大工程施工列表列表 + * Class SupervisionDangerousEngineeringConstructionLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionDangerousEngineeringConstructionLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/04 16:02 + */ + public function setSearch(): array + { + return [ + '=' => ['dangerous_engineering_monitoring_id', 'is_notice'], + '%like%' => ['notice_user'], + ]; + } + + + /** + * @notes 获取工程监理--危大工程施工列表列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/04 16:02 + */ + public function lists(): array + { + return SupervisionDangerousEngineeringConstruction::where($this->searchWhere) + ->field(['id', 'dangerous_engineering_monitoring_id', 'actual_construction_date', 'is_notice', 'notice_user']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,position')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['notice_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['type'] = $dangerous_engineering_monitoring->type_text; + $data['position'] = $dangerous_engineering_monitoring['position']; + $data['is_notice_text'] = $data->is_notice_text; + $data['dangerous_engineering_monitoring_title'] = $project['project_name']; + $data['notice_user_name'] = $admin?->name; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--危大工程施工列表数量 + * @return int + * @author likeadmin + * @date 2024/03/04 16:02 + */ + public function count(): int + { + return SupervisionDangerousEngineeringConstruction::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringEliminateLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringEliminateLists.php index 6602f520e..90f43facb 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringEliminateLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringEliminateLists.php @@ -11,77 +11,80 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--危大工程消除列表列表 - * Class SupervisionDangerousEngineeringEliminateLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/04 15:31 - */ - public function setSearch(): array - { - return [ - '=' => ['dangerous_engineering_monitoring_id'], - '%like%' => ['eliminate_user', 'notice_user'], - ]; - } - - - /** - * @notes 获取工程监理--危大工程消除列表列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/04 15:31 - */ - public function lists(): array - { - return SupervisionDangerousEngineeringEliminate::where($this->searchWhere) - ->field(['id', 'dangerous_engineering_monitoring_id', 'eliminate_date', 'eliminate_user', 'is_notice']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,position')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); - $project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['position'] = $dangerous_engineering_monitoring['position']; - $data['is_notice_text'] = $data->is_notice_text; - $data['dangerous_engineering_monitoring_title'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--危大工程消除列表数量 - * @return int - * @author likeadmin - * @date 2024/03/04 15:31 - */ - public function count(): int - { - return SupervisionDangerousEngineeringEliminate::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--危大工程消除列表列表 + * Class SupervisionDangerousEngineeringEliminateLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionDangerousEngineeringEliminateLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/04 15:31 + */ + public function setSearch(): array + { + return [ + '=' => ['dangerous_engineering_monitoring_id'], + '%like%' => ['eliminate_user', 'notice_user'], + ]; + } + + + /** + * @notes 获取工程监理--危大工程消除列表列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/04 15:31 + */ + public function lists(): array + { + return SupervisionDangerousEngineeringEliminate::where($this->searchWhere) + ->field(['id', 'dangerous_engineering_monitoring_id', 'eliminate_date', 'eliminate_user', 'is_notice']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,position')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['eliminate_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['position'] = $dangerous_engineering_monitoring['position']; + $data['is_notice_text'] = $data->is_notice_text; + $data['dangerous_engineering_monitoring_title'] = $project['project_name']; + $data['eliminate_user_name'] = $admin?->name; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--危大工程消除列表数量 + * @return int + * @author likeadmin + * @date 2024/03/04 15:31 + */ + public function count(): int + { + return SupervisionDangerousEngineeringEliminate::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php index 2428624e0..2e8c66609 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLists.php @@ -11,87 +11,91 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--危大工程监控列表 - * Class SupervisionDangerousEngineeringMonitoringLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/04 11:05 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id', 'type', 'partial_project'], - '%like%' => ['position'], - ]; - } - - - /** - * @notes 获取工程监理--危大工程监控列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/04 11:05 - */ - public function lists(): array - { - return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere) - ->field(['id', 'project_id', 'type', 'partial_project', 'planned_construction_time', 'position']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['partial_project_text'] = $data->partial_project_text; - $data['type_text'] = $data->type_text; - //实际施工时间 - $construction = SupervisionDangerousEngineeringConstruction::field('actual_construction_date')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty(); - $data['actual_construction_date'] = !$construction->isEmpty() ? $construction['actual_construction_date'] : ''; - //相关方案 - $case = SupervisionDangerousEngineeringCase::field('case_name')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty(); - $data['case_name'] = !$case->isEmpty() ? $case['case_name'] : ''; - //消除日期 - $eliminate = SupervisionDangerousEngineeringEliminate::field('eliminate_date,eliminate_user')->where('dangerous_engineering_monitoring_id',$data['id'])->order('id desc')->findOrEmpty(); - $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 - */ - public function count(): int - { - return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--危大工程监控列表 + * Class SupervisionDangerousEngineeringMonitoringLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionDangerousEngineeringMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/04 11:05 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id', 'type', 'partial_project'], + '%like%' => ['position'], + ]; + } + + + /** + * @notes 获取工程监理--危大工程监控列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/04 11:05 + */ + public function lists(): array + { + return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere) + ->field(['id', 'project_id', 'type', 'partial_project', 'planned_construction_time', 'position']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $admin = Admin::where('id', 'in', [$data['supervisor'], $data['responsible_person']])->column('name', 'id'); + $data['project_name'] = $project['project_name']; + $data['partial_project_text'] = $data->partial_project_text; + $data['type_text'] = $data->type_text; + $data['supervisor_name'] = $admin[$data['supervisor']] ?? ''; + $data['responsible_person_name'] = $admin[$data['responsible_person']] ?? ''; + //实际施工时间 + $construction = SupervisionDangerousEngineeringConstruction::field('actual_construction_date')->where('dangerous_engineering_monitoring_id', $data['id'])->order('id desc')->findOrEmpty(); + $data['actual_construction_date'] = !$construction->isEmpty() ? $construction['actual_construction_date'] : ''; + //相关方案 + $case = SupervisionDangerousEngineeringCase::field('case_name')->where('dangerous_engineering_monitoring_id', $data['id'])->order('id desc')->findOrEmpty(); + $data['case_name'] = !$case->isEmpty() ? $case['case_name'] : ''; + //消除日期 + $eliminate = SupervisionDangerousEngineeringEliminate::field('eliminate_date,eliminate_user')->where('dangerous_engineering_monitoring_id', $data['id'])->order('id desc')->findOrEmpty(); + $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 + */ + public function count(): int + { + return SupervisionDangerousEngineeringMonitoring::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLists.php index 487344bf7..9410855db 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLists.php @@ -11,73 +11,77 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--超规模危险性较大工程安全监控列表 - * Class SupervisionExcessRiskSecurityMonitoringLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/04 10:11 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id', 'partial_project'], - '%like%' => ['project_characteristics'], - ]; - } - - - /** - * @notes 获取工程监理--超规模危险性较大工程安全监控列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/04 10:11 - */ - 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']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['partial_project_text'] = $data->partial_project_text; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--超规模危险性较大工程安全监控数量 - * @return int - * @author likeadmin - * @date 2024/03/04 10:11 - */ - public function count(): int - { - return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--超规模危险性较大工程安全监控列表 + * Class SupervisionExcessRiskSecurityMonitoringLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionExcessRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/04 10:11 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id', 'partial_project'], + '%like%' => ['project_characteristics'], + ]; + } + + + /** + * @notes 获取工程监理--超规模危险性较大工程安全监控列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/04 10:11 + */ + 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']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id'); + $data['project_name'] = $project['project_name']; + $data['partial_project_text'] = $data->partial_project_text; + $data['check_user_name'] = $admin[$data['check_user']] ?? ''; + $data['responsible_person_name'] = $admin[$data['responsible_person']] ?? ''; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--超规模危险性较大工程安全监控数量 + * @return int + * @author likeadmin + * @date 2024/03/04 10:11 + */ + public function count(): int + { + return SupervisionExcessRiskSecurityMonitoring::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLists.php index 6bfb1b1c9..2f32ed525 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLists.php @@ -11,72 +11,76 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--危险性较大的工程安全监控列表 - * Class SupervisionHighRiskSecurityMonitoringLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/04 09:22 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id', 'partial_project', 'project_characteristics'], - ]; - } - - - /** - * @notes 获取工程监理--危险性较大的工程安全监控列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/04 09:22 - */ - public function lists(): array - { - return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere) - ->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['partial_project_text'] = $data->partial_project_text; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--危险性较大的工程安全监控数量 - * @return int - * @author likeadmin - * @date 2024/03/04 09:22 - */ - public function count(): int - { - return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--危险性较大的工程安全监控列表 + * Class SupervisionHighRiskSecurityMonitoringLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionHighRiskSecurityMonitoringLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/04 09:22 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id', 'partial_project', 'project_characteristics'], + ]; + } + + + /** + * @notes 获取工程监理--危险性较大的工程安全监控列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/04 09:22 + */ + public function lists(): array + { + return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere) + ->field(['id', 'project_id', 'partial_project', 'attribution_date', 'project_characteristics', 'planned_construction_time']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id'); + $data['project_name'] = $project['project_name']; + $data['partial_project_text'] = $data->partial_project_text; + $data['check_user_name'] = $admin[$data['check_user']] ?? ''; + $data['responsible_person_name'] = $admin[$data['responsible_person']] ?? ''; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--危险性较大的工程安全监控数量 + * @return int + * @author likeadmin + * @date 2024/03/04 09:22 + */ + public function count(): int + { + return SupervisionHighRiskSecurityMonitoring::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionLargeMechanicalEquipmentLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionLargeMechanicalEquipmentLists.php index ac228ac72..ea29f60f1 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionLargeMechanicalEquipmentLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionLargeMechanicalEquipmentLists.php @@ -11,77 +11,80 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_project\SupervisionParticipatingUnits; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 大型机械设备及仪器台账列表 - * Class SupervisionLargeMechanicalEquipmentLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/02 09:51 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id', 'company_id', 'approval_type'], - '%like%' => ['sn', 'name', 'use_site', 'approval_result'], - ]; - } - - - /** - * @notes 获取大型机械设备及仪器台账列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/02 09:51 - */ - public function lists(): array - { - return SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty(); - $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; - }) - ->toArray(); - } - - - /** - * @notes 获取大型机械设备及仪器台账数量 - * @return int - * @author likeadmin - * @date 2024/03/02 09:51 - */ - public function count(): int - { - return SupervisionLargeMechanicalEquipment::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment; + use app\common\model\supervision_project\SupervisionParticipatingUnits; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 大型机械设备及仪器台账列表 + * Class SupervisionLargeMechanicalEquipmentLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionLargeMechanicalEquipmentLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/02 09:51 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id', 'company_id', 'approval_type'], + '%like%' => ['sn', 'name', 'use_site', 'approval_result'], + ]; + } + + + /** + * @notes 获取大型机械设备及仪器台账列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/02 09:51 + */ + public function lists(): array + { + return SupervisionLargeMechanicalEquipment::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['first_auditor'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['company_name'] = $company['unit_name']; + $data['approval_type_text'] = $data->approval_type_text; + $data['first_audit_opinion_text'] = $data->first_audit_opinion_text; + $data['final_audit_opinion_text'] = $data->final_audit_opinion_text; + $data['first_auditor_name'] = $admin?->name; + }) + ->toArray(); + } + + + /** + * @notes 获取大型机械设备及仪器台账数量 + * @return int + * @author likeadmin + * @date 2024/03/02 09:51 + */ + public function count(): int + { + return SupervisionLargeMechanicalEquipment::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php index 136042fae..6d7bbfd64 100644 --- a/app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php +++ b/app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php @@ -11,71 +11,74 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_dangerous; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign; -use app\common\lists\ListsSearchInterface; -use app\common\model\supervision_project\SupervisionProject; - - -/** - * 工程监理--现场安全警示标志列表 - * Class SupervisionSafetyWarningSignLists - * @package app\adminapi\listssupervision_dangerous - */ -class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/01 15:41 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id'], - '%like%' => ['check_user', 'check_area'], - ]; - } - - - /** - * @notes 获取工程监理--现场安全警示标志列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/01 15:41 - */ - public function lists(): array - { - return SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--现场安全警示标志数量 - * @return int - * @author likeadmin - * @date 2024/03/01 15:41 - */ - public function count(): int - { - return SupervisionSafetyWarningSign::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_dangerous; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign; + use app\common\model\supervision_project\SupervisionProject; + + + /** + * 工程监理--现场安全警示标志列表 + * Class SupervisionSafetyWarningSignLists + * @package app\adminapi\listssupervision_dangerous + */ + class SupervisionSafetyWarningSignLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id'], + '%like%' => ['check_user', 'check_area'], + ]; + } + + + /** + * @notes 获取工程监理--现场安全警示标志列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function lists(): array + { + return SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['check_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['check_user_name'] = $admin?->name; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--现场安全警示标志数量 + * @return int + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function count(): int + { + return SupervisionSafetyWarningSign::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php b/app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php index c372e0fef..e9fa2a99d 100644 --- a/app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php @@ -11,71 +11,77 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\lists\supervision_work; - - -use app\adminapi\lists\BaseAdminDataLists; -use app\common\model\supervision_project\SupervisionProject; -use app\common\model\supervision_work\SupervisionMeetingMinutes; -use app\common\lists\ListsSearchInterface; - - -/** - * 工程监理--会议纪要列表 - * Class SupervisionMeetingMinutesLists - * @package app\adminapi\listssupervision_work - */ -class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements ListsSearchInterface -{ - - - /** - * @notes 设置搜索条件 - * @return \string[][] - * @author likeadmin - * @date 2024/03/01 14:31 - */ - public function setSearch(): array - { - return [ - '=' => ['project_id'], - '%like%' => ['theme', 'type', 'emcee', 'recorder'], - ]; - } - - - /** - * @notes 获取工程监理--会议纪要列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/03/01 14:31 - */ - public function lists(): array - { - return SupervisionMeetingMinutes::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select()->each(function($data){ - $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - }) - ->toArray(); - } - - - /** - * @notes 获取工程监理--会议纪要数量 - * @return int - * @author likeadmin - * @date 2024/03/01 14:31 - */ - public function count(): int - { - return SupervisionMeetingMinutes::where($this->searchWhere)->count(); - } - -} \ No newline at end of file + + namespace app\adminapi\lists\supervision_work; + + + use app\adminapi\lists\BaseAdminDataLists; + use app\common\lists\ListsSearchInterface; + use app\common\model\auth\Admin; + use app\common\model\supervision_project\SupervisionProject; + use app\common\model\supervision_work\SupervisionMeetingMinutes; + + + /** + * 工程监理--会议纪要列表 + * Class SupervisionMeetingMinutesLists + * @package app\adminapi\listssupervision_work + */ + class SupervisionMeetingMinutesLists extends BaseAdminDataLists implements ListsSearchInterface + { + + + /** + * @notes 设置搜索条件 + * @return \string[][] + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function setSearch(): array + { + return [ + '=' => ['project_id'], + '%like%' => ['theme', 'type', 'emcee', 'recorder'], + ]; + } + + + /** + * @notes 获取工程监理--会议纪要列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function lists(): array + { + return SupervisionMeetingMinutes::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + $project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty(); + $admin = Admin::where('id', 'in', [$data['emcee'], $data['recorder']])->column('name', 'id'); + $attendees = Admin::where('id', 'in', $data['attendees'])->column('name'); + $data['emcee_name'] = $admin[$data['emcee']] ?? ''; + $data['recorder_name'] = $admin[$data['recorder']] ?? ''; + $data['attendees_name'] = implode(',', $attendees); + $data['project_name'] = $project['project_name']; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--会议纪要数量 + * @return int + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function count(): int + { + return SupervisionMeetingMinutes::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/logic/consult_basic/ConsultNewStartProjectLogic.php b/app/adminapi/logic/consult_basic/ConsultNewStartProjectLogic.php index ed8a167c3..19d3ab121 100644 --- a/app/adminapi/logic/consult_basic/ConsultNewStartProjectLogic.php +++ b/app/adminapi/logic/consult_basic/ConsultNewStartProjectLogic.php @@ -11,214 +11,219 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\consult_basic; - - -use app\common\model\consult_basic\ConsultNewStartProject; -use app\common\logic\BaseLogic; -use app\common\model\consult_basic\ConsultProject; -use app\common\model\consult_basic\ConsultProjectEvolve; -use app\common\model\consult_basic\ConsultProjectPreparation; -use think\facade\Db; - - -/** - * 项目咨询--新开工项目管理逻辑 - * Class ConsultNewStartProjectLogic - * @package app\adminapi\logic\consult_basic - */ -class ConsultNewStartProjectLogic extends BaseLogic -{ - - - /** - * @notes 添加项目咨询--新开工项目管理 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - $res = ConsultNewStartProject::create([ - '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) { - ConsultProjectEvolve::create([ - '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{ + + namespace app\adminapi\logic\consult_basic; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\consult_basic\ConsultNewStartProject; + use app\common\model\consult_basic\ConsultProject; + use app\common\model\consult_basic\ConsultProjectEvolve; + use app\common\model\consult_basic\ConsultProjectPreparation; + use think\facade\Db; + + + /** + * 项目咨询--新开工项目管理逻辑 + * Class ConsultNewStartProjectLogic + * @package app\adminapi\logic\consult_basic + */ + class ConsultNewStartProjectLogic extends BaseLogic + { + + + /** + * @notes 添加项目咨询--新开工项目管理 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + $res = ConsultNewStartProject::create([ + '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) { ConsultProjectEvolve::create([ - 'new_start_project_id' => $params['id'], + '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) { - 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{ + } + if (!empty($params['preparation'])) { + foreach ($params['preparation'] as $v) { ConsultProjectPreparation::create([ - 'new_start_project_id' => $params['id'], + '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 delete(array $params): bool - { - $evolve = ConsultProjectEvolve::where('new_start_project_id','in',$params['id'])->findOrEmpty(); - if(!$evolve->isEmpty()){ - self::setError('此数据下存在项目组工作开展情况数据,须先删除项目组工作开展情况数据'); - return false; + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + 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']; - return $data->toArray(); - } -} \ No newline at end of file + + + /** + * @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([ + '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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/consult_basic/ConsultProjectEvolveLogic.php b/app/adminapi/logic/consult_basic/ConsultProjectEvolveLogic.php index 7938201c4..04c9d4976 100644 --- a/app/adminapi/logic/consult_basic/ConsultProjectEvolveLogic.php +++ b/app/adminapi/logic/consult_basic/ConsultProjectEvolveLogic.php @@ -11,100 +11,104 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\consult_basic; - - -use app\common\model\consult_basic\ConsultProjectEvolve; -use app\common\logic\BaseLogic; -use think\facade\Db; - - -/** - * 项目咨询--项目组工作开展情况逻辑 - * Class ConsultProjectEvolveLogic - * @package app\adminapi\logic\consult_basic - */ -class ConsultProjectEvolveLogic extends BaseLogic -{ - - - /** - * @notes 添加项目咨询--项目组工作开展情况 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - ConsultProjectEvolve::create([ - 'new_start_project_id' => $params['new_start_project_id'], - 'name' => $params['name'], - 'progress_status' => $params['progress_status'], - 'resp_user' => $params['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 { - ConsultProjectEvolve::where('id', $params['id'])->update([ - 'new_start_project_id' => $params['new_start_project_id'], - 'name' => $params['name'], - 'progress_status' => $params['progress_status'], - 'resp_user' => $params['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 - { - return ConsultProjectEvolve::destroy($params['id']); - } - - - /** - * @notes 获取项目咨询--项目组工作开展情况详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public static function detail($params): array - { - return ConsultProjectEvolve::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\consult_basic; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\consult_basic\ConsultProjectEvolve; + use think\facade\Db; + + + /** + * 项目咨询--项目组工作开展情况逻辑 + * Class ConsultProjectEvolveLogic + * @package app\adminapi\logic\consult_basic + */ + class ConsultProjectEvolveLogic extends BaseLogic + { + + + /** + * @notes 添加项目咨询--项目组工作开展情况 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + ConsultProjectEvolve::create([ + 'new_start_project_id' => $params['new_start_project_id'], + 'name' => $params['name'], + 'progress_status' => $params['progress_status'], + 'resp_user' => $params['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 { + ConsultProjectEvolve::where('id', $params['id'])->update([ + 'new_start_project_id' => $params['new_start_project_id'], + 'name' => $params['name'], + 'progress_status' => $params['progress_status'], + 'resp_user' => $params['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 + { + return ConsultProjectEvolve::destroy($params['id']); + } + + + /** + * @notes 获取项目咨询--项目组工作开展情况详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public static function detail($params): array + { + $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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/consult_basic/ConsultProjectLogic.php b/app/adminapi/logic/consult_basic/ConsultProjectLogic.php index 08818c719..ca3478cb7 100644 --- a/app/adminapi/logic/consult_basic/ConsultProjectLogic.php +++ b/app/adminapi/logic/consult_basic/ConsultProjectLogic.php @@ -11,277 +11,280 @@ // +---------------------------------------------------------------------- // | 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']; - }) - ->toArray(); - return $datas; - } -} \ No newline at end of file + + + /** + * @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; + $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; + } + } \ No newline at end of file diff --git a/app/adminapi/logic/consult_basic/ConsultProjectPreparationLogic.php b/app/adminapi/logic/consult_basic/ConsultProjectPreparationLogic.php index 93e1264f7..7cfada5f0 100644 --- a/app/adminapi/logic/consult_basic/ConsultProjectPreparationLogic.php +++ b/app/adminapi/logic/consult_basic/ConsultProjectPreparationLogic.php @@ -11,100 +11,104 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\consult_basic; - - -use app\common\model\consult_basic\ConsultProjectPreparation; -use app\common\logic\BaseLogic; -use think\facade\Db; - - -/** - * 项目咨询--项目组后勤准备工作逻辑 - * Class ConsultProjectPreparationLogic - * @package app\adminapi\logic\consult_basic - */ -class ConsultProjectPreparationLogic extends BaseLogic -{ - - - /** - * @notes 添加项目咨询--项目组后勤准备工作 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - ConsultProjectPreparation::create([ - 'new_start_project_id' => $params['new_start_project_id'], - 'name' => $params['name'], - 'progress_status' => $params['progress_status'], - 'resp_user' => $params['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 { - ConsultProjectPreparation::where('id', $params['id'])->update([ - 'new_start_project_id' => $params['new_start_project_id'], - 'name' => $params['name'], - 'progress_status' => $params['progress_status'], - 'resp_user' => $params['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 - { - return ConsultProjectPreparation::destroy($params['id']); - } - - - /** - * @notes 获取项目咨询--项目组后勤准备工作详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/11 10:27 - */ - public static function detail($params): array - { - return ConsultProjectPreparation::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\consult_basic; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\consult_basic\ConsultProjectPreparation; + use think\facade\Db; + + + /** + * 项目咨询--项目组后勤准备工作逻辑 + * Class ConsultProjectPreparationLogic + * @package app\adminapi\logic\consult_basic + */ + class ConsultProjectPreparationLogic extends BaseLogic + { + + + /** + * @notes 添加项目咨询--项目组后勤准备工作 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + ConsultProjectPreparation::create([ + 'new_start_project_id' => $params['new_start_project_id'], + 'name' => $params['name'], + 'progress_status' => $params['progress_status'], + 'resp_user' => $params['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 { + ConsultProjectPreparation::where('id', $params['id'])->update([ + 'new_start_project_id' => $params['new_start_project_id'], + 'name' => $params['name'], + 'progress_status' => $params['progress_status'], + 'resp_user' => $params['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 + { + return ConsultProjectPreparation::destroy($params['id']); + } + + + /** + * @notes 获取项目咨询--项目组后勤准备工作详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/11 10:27 + */ + public static function detail($params): array + { + $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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/financial/FinancialCollectionPlanLogic.php b/app/adminapi/logic/financial/FinancialCollectionPlanLogic.php index b8b1b4125..42414d19c 100644 --- a/app/adminapi/logic/financial/FinancialCollectionPlanLogic.php +++ b/app/adminapi/logic/financial/FinancialCollectionPlanLogic.php @@ -16,6 +16,7 @@ use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; use app\common\model\financial\FinancialCollectionPlan; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; @@ -123,6 +124,8 @@ $data['signed_amount'] = $contract?->signed_amount; $data['signed_date'] = $contract?->create_time; $data['part_a_name'] = $custom?->name; + $admin = Admin::field('name')->where('id', $data['collection_user'])->findOrEmpty(); + $data['collection_user_name'] = $admin?->name; //开票金额 $data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['contract_id'])->sum('apply_amount'); //到账金额 diff --git a/app/adminapi/logic/financial/FinancialInvoiceLogic.php b/app/adminapi/logic/financial/FinancialInvoiceLogic.php index cf231ba09..3b1af42f5 100644 --- a/app/adminapi/logic/financial/FinancialInvoiceLogic.php +++ b/app/adminapi/logic/financial/FinancialInvoiceLogic.php @@ -16,6 +16,7 @@ use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; use app\common\model\marketing\MarketingContract; @@ -146,6 +147,8 @@ $data['sign_time'] = $contract['create_time']; $data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['contract_id'])->sum('apply_amount'); $data['total_refund_amount'] = FinancialRefund::where('contract_id', $data['contract_id'])->sum('amount'); + $admin = Admin::field('name')->where('id', $data['apply_contact'])->findOrEmpty(); + $data['apply_contact_name'] = $admin?->name; return $data->toArray(); } diff --git a/app/adminapi/logic/manage_communication/ManageAcceptDocLogic.php b/app/adminapi/logic/manage_communication/ManageAcceptDocLogic.php index b89f342a2..3f88f16da 100644 --- a/app/adminapi/logic/manage_communication/ManageAcceptDocLogic.php +++ b/app/adminapi/logic/manage_communication/ManageAcceptDocLogic.php @@ -11,117 +11,121 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\manage_communication; - - -use app\common\model\manage_basic\ManageProject; -use app\common\model\manage_communication\ManageAcceptDoc; -use app\common\logic\BaseLogic; -use think\facade\Db; - - -/** - * 项目管理--收文管理逻辑 - * Class ManageAcceptDocLogic - * @package app\adminapi\logic\manage_communication - */ -class ManageAcceptDocLogic extends BaseLogic -{ - - - /** - * @notes 添加项目管理--收文管理 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/07 16:46 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - ManageAcceptDoc::create([ - 'project_id' => $params['project_id'], - 'code' => $params['code'] ?? '', - 'abstract' => $params['abstract'], - 'send_company' => $params['send_company'], - 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, - 'accept_user' => $params['accept_user'] ?? '', - 'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0, - 'read_user' => $params['read_user'] ?? '', - 'remark' => $params['remark'] ?? '', - '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/07 16:46 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - ManageAcceptDoc::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'code' => $params['code'] ?? '', - 'abstract' => $params['abstract'], - 'send_company' => $params['send_company'], - 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, - 'accept_user' => $params['accept_user'] ?? '', - 'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0, - 'read_user' => $params['read_user'] ?? '', - 'remark' => $params['remark'] ?? '', - '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 - * @return bool - * @author likeadmin - * @date 2024/03/07 16:46 - */ - public static function delete(array $params): bool - { - return ManageAcceptDoc::destroy($params['id']); - } - - - /** - * @notes 获取项目管理--收文管理详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/07 16:46 - */ - 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['project_name'] = $project['project_name']; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\manage_communication; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\manage_basic\ManageProject; + use app\common\model\manage_communication\ManageAcceptDoc; + use think\facade\Db; + + + /** + * 项目管理--收文管理逻辑 + * Class ManageAcceptDocLogic + * @package app\adminapi\logic\manage_communication + */ + class ManageAcceptDocLogic extends BaseLogic + { + + + /** + * @notes 添加项目管理--收文管理 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/07 16:46 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + ManageAcceptDoc::create([ + 'project_id' => $params['project_id'], + 'code' => $params['code'] ?? '', + 'abstract' => $params['abstract'], + 'send_company' => $params['send_company'], + 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, + 'accept_user' => $params['accept_user'] ?? '', + 'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0, + 'read_user' => $params['read_user'] ?? '', + 'remark' => $params['remark'] ?? '', + '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/07 16:46 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ManageAcceptDoc::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'code' => $params['code'] ?? '', + 'abstract' => $params['abstract'], + 'send_company' => $params['send_company'], + 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, + 'accept_user' => $params['accept_user'] ?? '', + 'accept_date' => !empty($params['accept_date']) ? strtotime($params['accept_date']) : 0, + 'read_user' => $params['read_user'] ?? '', + 'remark' => $params['remark'] ?? '', + '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 + * @return bool + * @author likeadmin + * @date 2024/03/07 16:46 + */ + public static function delete(array $params): bool + { + return ManageAcceptDoc::destroy($params['id']); + } + + + /** + * @notes 获取项目管理--收文管理详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/07 16:46 + */ + 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['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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/manage_communication/ManageInfoReportLogic.php b/app/adminapi/logic/manage_communication/ManageInfoReportLogic.php index 7fe4a8927..4094073ce 100644 --- a/app/adminapi/logic/manage_communication/ManageInfoReportLogic.php +++ b/app/adminapi/logic/manage_communication/ManageInfoReportLogic.php @@ -11,120 +11,123 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\manage_communication; - - -use app\common\model\manage_basic\ManageProject; -use app\common\model\manage_communication\ManageInfoReport; -use app\common\logic\BaseLogic; -use think\facade\Db; - - -/** - * 项目管理--项目信息上报逻辑 - * Class ManageInfoReportLogic - * @package app\adminapi\logic\manage_communication - */ -class ManageInfoReportLogic extends BaseLogic -{ - - - /** - * @notes 添加项目管理--项目信息上报 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/08 13:33 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - ManageInfoReport::create([ - 'project_id' => $params['project_id'], - 'abstract' => $params['abstract'], - 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, - 'severity' => $params['severity'] ?? 0, - 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, - 'content' => $params['content'] ?? '', - 'opinions' => $params['opinions'] ?? '', - 'giver' => $params['giver'] ?? '', - '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/08 13:33 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - ManageInfoReport::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'abstract' => $params['abstract'], - 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, - 'severity' => $params['severity'] ?? 0, - 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, - 'content' => $params['content'] ?? '', - 'opinions' => $params['opinions'] ?? '', - 'giver' => $params['giver'] ?? '', - 'annex' => $params['annex'] ? json_encode($params['annex']) : null, - 'create_user' => $params['create_user'], - 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), - '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/08 13:33 - */ - public static function delete(array $params): bool - { - return ManageInfoReport::destroy($params['id']); - } - - - /** - * @notes 获取项目管理--项目信息上报详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/08 13:33 - */ - 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['project_name'] = $project['project_name']; - $data['severity_text'] = $data->severity_text; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\manage_communication; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\manage_basic\ManageProject; + use app\common\model\manage_communication\ManageInfoReport; + use think\facade\Db; + + + /** + * 项目管理--项目信息上报逻辑 + * Class ManageInfoReportLogic + * @package app\adminapi\logic\manage_communication + */ + class ManageInfoReportLogic extends BaseLogic + { + + + /** + * @notes 添加项目管理--项目信息上报 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/08 13:33 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + ManageInfoReport::create([ + 'project_id' => $params['project_id'], + 'abstract' => $params['abstract'], + 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, + 'severity' => $params['severity'] ?? 0, + 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, + 'content' => $params['content'] ?? '', + 'opinions' => $params['opinions'] ?? '', + 'giver' => $params['giver'] ?? '', + '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/08 13:33 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ManageInfoReport::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'abstract' => $params['abstract'], + 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, + 'severity' => $params['severity'] ?? 0, + 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, + 'content' => $params['content'] ?? '', + 'opinions' => $params['opinions'] ?? '', + 'giver' => $params['giver'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'create_user' => $params['create_user'], + 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), + '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/08 13:33 + */ + public static function delete(array $params): bool + { + return ManageInfoReport::destroy($params['id']); + } + + + /** + * @notes 获取项目管理--项目信息上报详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/08 13:33 + */ + 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['project_name'] = $project['project_name']; + $data['severity_text'] = $data->severity_text; + $admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty(); + $data['giver_name'] = $admin?->name; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/manage_communication/ManageSendDocLogic.php b/app/adminapi/logic/manage_communication/ManageSendDocLogic.php index 04322c03d..6ef5e1fbf 100644 --- a/app/adminapi/logic/manage_communication/ManageSendDocLogic.php +++ b/app/adminapi/logic/manage_communication/ManageSendDocLogic.php @@ -11,115 +11,119 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\manage_communication; - - -use app\common\model\manage_basic\ManageProject; -use app\common\model\manage_communication\ManageSendDoc; -use app\common\logic\BaseLogic; -use think\facade\Db; - - -/** - * 项目管理--发文管理逻辑 - * Class ManageSendDocLogic - * @package app\adminapi\logic\manage_communication - */ -class ManageSendDocLogic extends BaseLogic -{ - - - /** - * @notes 添加项目管理--发文管理 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/07 17:15 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - ManageSendDoc::create([ - 'project_id' => $params['project_id'], - 'code' => $params['code'] ?? '', - 'abstract' => $params['abstract'], - 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, - 'send_company' => $params['send_company'], - 'send_user' => $params['send_user'], - 'accept_user' => $params['accept_user'] ?? '', - 'remark' => $params['remark'] ?? '', - '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/07 17:15 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - ManageSendDoc::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'code' => $params['code'] ?? '', - 'abstract' => $params['abstract'], - 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, - 'send_company' => $params['send_company'], - 'send_user' => $params['send_user'], - 'accept_user' => $params['accept_user'] ?? '', - 'remark' => $params['remark'] ?? '', - '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 - * @return bool - * @author likeadmin - * @date 2024/03/07 17:15 - */ - public static function delete(array $params): bool - { - return ManageSendDoc::destroy($params['id']); - } - - - /** - * @notes 获取项目管理--发文管理详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/07 17:15 - */ - 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['project_name'] = $project['project_name']; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\manage_communication; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\manage_basic\ManageProject; + use app\common\model\manage_communication\ManageSendDoc; + use think\facade\Db; + + + /** + * 项目管理--发文管理逻辑 + * Class ManageSendDocLogic + * @package app\adminapi\logic\manage_communication + */ + class ManageSendDocLogic extends BaseLogic + { + + + /** + * @notes 添加项目管理--发文管理 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/07 17:15 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + ManageSendDoc::create([ + 'project_id' => $params['project_id'], + 'code' => $params['code'] ?? '', + 'abstract' => $params['abstract'], + 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, + 'send_company' => $params['send_company'], + 'send_user' => $params['send_user'], + 'accept_user' => $params['accept_user'] ?? '', + 'remark' => $params['remark'] ?? '', + '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/07 17:15 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ManageSendDoc::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'code' => $params['code'] ?? '', + 'abstract' => $params['abstract'], + 'send_date' => !empty($params['send_date']) ? strtotime($params['send_date']) : 0, + 'send_company' => $params['send_company'], + 'send_user' => $params['send_user'], + 'accept_user' => $params['accept_user'] ?? '', + 'remark' => $params['remark'] ?? '', + '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 + * @return bool + * @author likeadmin + * @date 2024/03/07 17:15 + */ + public static function delete(array $params): bool + { + return ManageSendDoc::destroy($params['id']); + } + + + /** + * @notes 获取项目管理--发文管理详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/07 17:15 + */ + 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['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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/marketing/MarketingBranchFilingLogic.php b/app/adminapi/logic/marketing/MarketingBranchFilingLogic.php index 4eb365755..d81a03172 100644 --- a/app/adminapi/logic/marketing/MarketingBranchFilingLogic.php +++ b/app/adminapi/logic/marketing/MarketingBranchFilingLogic.php @@ -16,6 +16,7 @@ use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; use app\common\model\marketing\MarketingBranchFiling; use think\facade\Db; @@ -150,6 +151,11 @@ { $data = MarketingBranchFiling::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); $data['filing_type_text'] = $data->filing_type; + $admin = Admin::where('id', 'in', [$data['fddbr'], $data['jbr'], $data['fzr'], $data['jsfzr']])->column('name', 'id'); + $data['fddbr_name'] = $admin[$data['fddbr']] ?? ''; + $data['jbr_name'] = $admin[$data['jbr']] ?? ''; + $data['fzr_name'] = $admin[$data['fzr']] ?? ''; + $data['jsfzr_name'] = $admin[$data['jsfzr']] ?? ''; return $data->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/marketing/MarketingCustomLogic.php b/app/adminapi/logic/marketing/MarketingCustomLogic.php index fb8de587c..71cb955a4 100644 --- a/app/adminapi/logic/marketing/MarketingCustomLogic.php +++ b/app/adminapi/logic/marketing/MarketingCustomLogic.php @@ -16,6 +16,7 @@ use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; use app\common\model\dept\Dept; use app\common\model\GeoCity; use app\common\model\GeoProvince; @@ -214,6 +215,8 @@ $data['city_name'] = !$city->isEmpty() ? $city['city_name'] : ''; $data['important_level_text'] = $data->important_level_text; $data['category_text'] = $data->category_text; + $admin = Admin::field('name')->where('id', $data['invoice_contact'])->findOrEmpty(); + $data['invoice_contact_name'] = $admin?->name; return $data->toArray(); } diff --git a/app/adminapi/logic/marketing/MarketingProjectFilingDetailLogic.php b/app/adminapi/logic/marketing/MarketingProjectFilingDetailLogic.php index 7b3642c22..039719139 100644 --- a/app/adminapi/logic/marketing/MarketingProjectFilingDetailLogic.php +++ b/app/adminapi/logic/marketing/MarketingProjectFilingDetailLogic.php @@ -16,6 +16,7 @@ use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; use app\common\model\marketing\MarketingContract; use app\common\model\marketing\MarketingProjectFiling; use app\common\model\marketing\MarketingProjectFilingDetail; @@ -120,6 +121,8 @@ $data['filing_role_text'] = $data->filing_role_text; $data['status'] = (string)$data['status']; $data['status_text'] = $data->status_text; + $admin = Admin::field('name')->where('id', $data['filing_user'])->findOrEmpty(); + $data['filing_user_name'] = $admin?->name; return $data->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_connect/SupervisionCompanyCheckLogic.php b/app/adminapi/logic/supervision_connect/SupervisionCompanyCheckLogic.php index f5cf702b3..77bbc14eb 100644 --- a/app/adminapi/logic/supervision_connect/SupervisionCompanyCheckLogic.php +++ b/app/adminapi/logic/supervision_connect/SupervisionCompanyCheckLogic.php @@ -11,139 +11,143 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_connect; - - -use app\common\model\supervision_connect\SupervisionCompanyCheck; -use app\common\logic\BaseLogic; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--公司检查逻辑 - * 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; - } - } + + namespace app\adminapi\logic\supervision_connect; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_connect\SupervisionCompanyCheck; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + /** - * @notes 回复工程监理--公司检查 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/05 11:57 + * 工程监理--公司检查逻辑 + * Class SupervisionCompanyCheckLogic + * @package app\adminapi\logic\supervision_connect */ - 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'], - '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 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 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']; - return $data->toArray(); - } -} \ No newline at end of file + + + /** + * @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 + * @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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php b/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php index 185fc3beb..7565f5345 100644 --- a/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php +++ b/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php @@ -11,122 +11,125 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_connect; - - -use app\common\model\supervision_connect\SupervisionProjectInfoReport; -use app\common\logic\BaseLogic; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--项目重大信息上报逻辑 - * Class SupervisionProjectInfoReportLogic - * @package app\adminapi\logic\supervision_connect - */ -class SupervisionProjectInfoReportLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--项目重大信息上报 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/05 10:53 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionProjectInfoReport::create([ - 'project_id' => $params['project_id'], - 'abstract' => $params['abstract'], - 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, - 'severity' => $params['severity'], - 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, - 'info_content' => $params['info_content'], - 'opinions' => $params['opinions'], - 'giver' => $params['giver'], - '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/05 10:53 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - SupervisionProjectInfoReport::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'abstract' => $params['abstract'], - 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, - 'severity' => $params['severity'], - 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, - 'info_content' => $params['info_content'], - 'opinions' => $params['opinions'], - 'giver' => $params['giver'], - 'annex' => $params['annex'] ? json_encode($params['annex']) : null, - 'create_user' => $params['create_user'], - 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), - '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/05 10:53 - */ - public static function delete(array $params): bool - { - return SupervisionProjectInfoReport::destroy($params['id']); - } - - - /** - * @notes 获取工程监理--项目重大信息上报详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/05 10:53 - */ - 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['project_name'] = $project['project_name']; - $data['project_manager'] = $project['project_manager']; - $data['severity_text'] = $data->severity_text; - $data['info_cate_text'] = $data->info_cate_text; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\supervision_connect; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_connect\SupervisionProjectInfoReport; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 工程监理--项目重大信息上报逻辑 + * Class SupervisionProjectInfoReportLogic + * @package app\adminapi\logic\supervision_connect + */ + class SupervisionProjectInfoReportLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--项目重大信息上报 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/05 10:53 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionProjectInfoReport::create([ + 'project_id' => $params['project_id'], + 'abstract' => $params['abstract'], + 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, + 'severity' => $params['severity'], + 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, + 'info_content' => $params['info_content'], + 'opinions' => $params['opinions'], + 'giver' => $params['giver'], + '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/05 10:53 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionProjectInfoReport::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'abstract' => $params['abstract'], + 'happen_date' => !empty($params['happen_date']) ? strtotime($params['happen_date']) : 0, + 'severity' => $params['severity'], + 'info_cate' => $params['info_cate'] ? json_encode($params['info_cate']) : null, + 'info_content' => $params['info_content'], + 'opinions' => $params['opinions'], + 'giver' => $params['giver'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'create_user' => $params['create_user'], + 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), + '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/05 10:53 + */ + public static function delete(array $params): bool + { + return SupervisionProjectInfoReport::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--项目重大信息上报详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/05 10:53 + */ + 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['project_name'] = $project['project_name']; + $data['project_manager'] = $project['project_manager']; + $data['severity_text'] = $data->severity_text; + $data['info_cate_text'] = $data->info_cate_text; + $admin = Admin::field('name')->where('id', $data['giver'])->findOrEmpty(); + $data['giver_name'] = $admin?->name; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php index 0a93e2ed9..a5d7f6e6f 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php @@ -11,118 +11,121 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; -use app\common\logic\BaseLogic; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--危大方案提交列表逻辑 - * Class SupervisionDangerousEngineeringCaseLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionDangerousEngineeringCaseLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--危大方案提交列表 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/04 14:00 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionDangerousEngineeringCase::create([ - 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], - 'case_name' => $params['case_name'], - 'assessor' => $params['assessor'], - 'review_content' => $params['review_content'], - 'remark' => $params['remark'], - '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/04 14:00 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - SupervisionDangerousEngineeringCase::where('id', $params['id'])->update([ - 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], - 'case_name' => $params['case_name'], - 'assessor' => $params['assessor'], - 'review_content' => $params['review_content'], - 'remark' => $params['remark'], - 'annex' => $params['annex'] ? json_encode($params['annex']) : null, - 'create_user' => $params['create_user'], - 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), - '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 14:00 - */ - public static function delete(array $params): bool - { - return SupervisionDangerousEngineeringCase::destroy($params['id']); - } - - - /** - * @notes 获取工程监理--危大方案提交列表详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/04 14:00 - */ - public static function detail($params): array - { - $data = SupervisionDangerousEngineeringCase::withoutField('update_time,delete_time')->findOrEmpty($params['id']); - $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); - $project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); - $data['dangerous_engineering_monitoring_title'] = $project['project_name']; - $data['project_name'] = $project['project_name']; - $data['type'] = $dangerous_engineering_monitoring->type_text; - $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 工程监理--危大方案提交列表逻辑 + * Class SupervisionDangerousEngineeringCaseLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionDangerousEngineeringCaseLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--危大方案提交列表 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/04 14:00 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionDangerousEngineeringCase::create([ + 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], + 'case_name' => $params['case_name'], + 'assessor' => $params['assessor'], + 'review_content' => $params['review_content'], + 'remark' => $params['remark'], + '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/04 14:00 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionDangerousEngineeringCase::where('id', $params['id'])->update([ + 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], + 'case_name' => $params['case_name'], + 'assessor' => $params['assessor'], + 'review_content' => $params['review_content'], + 'remark' => $params['remark'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'create_user' => $params['create_user'], + 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), + '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 14:00 + */ + public static function delete(array $params): bool + { + return SupervisionDangerousEngineeringCase::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--危大方案提交列表详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/04 14:00 + */ + public static function detail($params): array + { + $data = SupervisionDangerousEngineeringCase::withoutField('update_time,delete_time')->findOrEmpty($params['id']); + $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['assessor'])->findOrEmpty(); + $data['dangerous_engineering_monitoring_title'] = $project['project_name']; + $data['project_name'] = $project['project_name']; + $data['type'] = $dangerous_engineering_monitoring->type_text; + $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; + $data['assessor_name'] = $admin?->name; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringConstructionLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringConstructionLogic.php index 9f5932e39..b6a7ba1ac 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringConstructionLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringConstructionLogic.php @@ -11,115 +11,118 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; -use app\common\logic\BaseLogic; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--危大工程施工列表逻辑 - * Class SupervisionDangerousEngineeringConstructionLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--危大工程施工列表 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/04 16:02 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionDangerousEngineeringConstruction::create([ - 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], - 'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0, - 'is_notice' => $params['is_notice'], - 'notice_user' => $params['notice_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/04 16:02 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - SupervisionDangerousEngineeringConstruction::where('id', $params['id'])->update([ - 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], - 'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0, - 'is_notice' => $params['is_notice'], - 'notice_user' => $params['notice_user'], - '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 16:02 - */ - public static function delete(array $params): bool - { - return SupervisionDangerousEngineeringConstruction::destroy($params['id']); - } - - - /** - * @notes 获取工程监理--危大工程施工列表详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/04 16:02 - */ - public static function detail($params): array - { - $data = SupervisionDangerousEngineeringConstruction::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); - $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project,planned_construction_time,position,project_characteristics,supervisor,responsible_person')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); - $project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['type'] = $dangerous_engineering_monitoring->type_text; - $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; - $data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time']; - $data['position'] = $dangerous_engineering_monitoring['position']; - $data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics']; - $data['supervisor'] = $dangerous_engineering_monitoring['supervisor']; - $data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person']; - $data['is_notice_text'] = $data->is_notice_text; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 工程监理--危大工程施工列表逻辑 + * Class SupervisionDangerousEngineeringConstructionLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionDangerousEngineeringConstructionLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--危大工程施工列表 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/04 16:02 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionDangerousEngineeringConstruction::create([ + 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], + 'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0, + 'is_notice' => $params['is_notice'], + 'notice_user' => $params['notice_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/04 16:02 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionDangerousEngineeringConstruction::where('id', $params['id'])->update([ + 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], + 'actual_construction_date' => !empty($params['actual_construction_date']) ? strtotime($params['actual_construction_date']) : 0, + 'is_notice' => $params['is_notice'], + 'notice_user' => $params['notice_user'], + '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 16:02 + */ + public static function delete(array $params): bool + { + return SupervisionDangerousEngineeringConstruction::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--危大工程施工列表详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/04 16:02 + */ + public static function detail($params): array + { + $data = SupervisionDangerousEngineeringConstruction::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project,planned_construction_time,position,project_characteristics,supervisor,responsible_person')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['notice_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['type'] = $dangerous_engineering_monitoring->type_text; + $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; + $data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time']; + $data['position'] = $dangerous_engineering_monitoring['position']; + $data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics']; + $data['supervisor'] = $dangerous_engineering_monitoring['supervisor']; + $data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person']; + $data['is_notice_text'] = $data->is_notice_text; + $data['notice_user_name'] = $admin?->name; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringEliminateLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringEliminateLogic.php index 0ba31754e..caa4fb259 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringEliminateLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringEliminateLogic.php @@ -11,117 +11,120 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; -use app\common\logic\BaseLogic; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--危大工程消除列表逻辑 - * Class SupervisionDangerousEngineeringEliminateLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--危大工程消除列表 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/04 15:31 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionDangerousEngineeringEliminate::create([ - 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], - 'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0, - 'eliminate_user' => $params['eliminate_user'], - 'is_notice' => $params['is_notice'], - 'notice_user' => $params['notice_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/04 15:31 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - SupervisionDangerousEngineeringEliminate::where('id', $params['id'])->update([ - 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], - 'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0, - 'eliminate_user' => $params['eliminate_user'], - 'is_notice' => $params['is_notice'], - 'notice_user' => $params['notice_user'], - '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 15:31 - */ - public static function delete(array $params): bool - { - return SupervisionDangerousEngineeringEliminate::destroy($params['id']); - } - - - /** - * @notes 获取工程监理--危大工程消除列表详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/04 15:31 - */ - public static function detail($params): array - { - $data = SupervisionDangerousEngineeringEliminate::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); - $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project,planned_construction_time,position,project_characteristics,supervisor,responsible_person')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty(); - $project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty(); - $data['project_name'] = $project['project_name']; - $data['type'] = $dangerous_engineering_monitoring->type_text; - $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; - $data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time']; - $data['position'] = $dangerous_engineering_monitoring['position']; - $data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics']; - $data['supervisor'] = $dangerous_engineering_monitoring['supervisor']; - $data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person']; - $data['is_notice_text'] = $data->is_notice_text; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 工程监理--危大工程消除列表逻辑 + * Class SupervisionDangerousEngineeringEliminateLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionDangerousEngineeringEliminateLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--危大工程消除列表 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/04 15:31 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionDangerousEngineeringEliminate::create([ + 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], + 'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0, + 'eliminate_user' => $params['eliminate_user'], + 'is_notice' => $params['is_notice'], + 'notice_user' => $params['notice_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/04 15:31 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionDangerousEngineeringEliminate::where('id', $params['id'])->update([ + 'dangerous_engineering_monitoring_id' => $params['dangerous_engineering_monitoring_id'], + 'eliminate_date' => !empty($params['eliminate_date']) ? strtotime($params['eliminate_date']) : 0, + 'eliminate_user' => $params['eliminate_user'], + 'is_notice' => $params['is_notice'], + 'notice_user' => $params['notice_user'], + '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 15:31 + */ + public static function delete(array $params): bool + { + return SupervisionDangerousEngineeringEliminate::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--危大工程消除列表详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/04 15:31 + */ + public static function detail($params): array + { + $data = SupervisionDangerousEngineeringEliminate::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project,planned_construction_time,position,project_characteristics,supervisor,responsible_person')->where('id', $data['dangerous_engineering_monitoring_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id', $dangerous_engineering_monitoring['project_id'])->findOrEmpty(); + $admin = Admin::field('name')->where('id', $data['eliminate_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['type'] = $dangerous_engineering_monitoring->type_text; + $data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text; + $data['planned_construction_time'] = $dangerous_engineering_monitoring['planned_construction_time']; + $data['position'] = $dangerous_engineering_monitoring['position']; + $data['project_characteristics'] = $dangerous_engineering_monitoring['project_characteristics']; + $data['supervisor'] = $dangerous_engineering_monitoring['supervisor']; + $data['responsible_person'] = $dangerous_engineering_monitoring['responsible_person']; + $data['is_notice_text'] = $data->is_notice_text; + $data['eliminate_user_name'] = $admin?->name; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php index 0530fa3a6..928daba39 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php @@ -11,138 +11,142 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; -use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; -use app\common\logic\BaseLogic; -use app\common\model\supervision_project\SupervisionProject; -use app\common\model\supervision_work\SupervisionCheckItem; -use think\facade\Db; - - -/** - * 工程监理--危大工程监控逻辑 - * Class SupervisionDangerousEngineeringMonitoringLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--危大工程监控 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/04 11:05 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionDangerousEngineeringMonitoring::create([ - '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'] - ]); - 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 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; + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringConstruction; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringEliminate; + use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring; + use app\common\model\supervision_project\SupervisionProject; + use app\common\model\supervision_work\SupervisionCheckItem; + use think\facade\Db; + + + /** + * 工程监理--危大工程监控逻辑 + * Class SupervisionDangerousEngineeringMonitoringLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--危大工程监控 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/04 11:05 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionDangerousEngineeringMonitoring::create([ + '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'] + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + 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(); - $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; - return $data->toArray(); - } -} \ No newline at end of file + + + /** + * @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; + } + $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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php index dba91bd8a..140f4f1a8 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php @@ -11,145 +11,149 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring; -use app\common\logic\BaseLogic; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--超规模危险性较大工程安全监控逻辑 - * Class SupervisionExcessRiskSecurityMonitoringLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--超规模危险性较大工程安全监控 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/04 10:11 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionExcessRiskSecurityMonitoring::create([ - 'project_id' => $params['project_id'], - 'partial_project' => $params['partial_project'], - 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, - 'project_characteristics' => $params['project_characteristics'], - 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, - 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, - 'is_discuss' => $params['is_discuss'], - 'is_modify' => $params['is_modify'], - 'is_agree' => $params['is_agree'], - 'is_accept' => $params['is_accept'], - 'is_accept_to_plan' => $params['is_accept_to_plan'], - 'check_user' => $params['check_user'], - 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, - 'problems_rectification' => $params['problems_rectification'], - 'responsible_person' => $params['responsible_person'], - 'exceed_the_control_value' => $params['exceed_the_control_value'], - 'exceed_the_warning_value' => $params['exceed_the_warning_value'], - 'control_measures' => $params['control_measures'], - '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/04 10:11 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - SupervisionExcessRiskSecurityMonitoring::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'partial_project' => $params['partial_project'], - 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, - 'project_characteristics' => $params['project_characteristics'], - 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, - 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, - 'is_discuss' => $params['is_discuss'], - 'is_modify' => $params['is_modify'], - 'is_agree' => $params['is_agree'], - 'is_accept' => $params['is_accept'], - 'is_accept_to_plan' => $params['is_accept_to_plan'], - 'check_user' => $params['check_user'], - 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, - 'problems_rectification' => $params['problems_rectification'], - 'responsible_person' => $params['responsible_person'], - 'exceed_the_control_value' => $params['exceed_the_control_value'], - 'exceed_the_warning_value' => $params['exceed_the_warning_value'], - 'control_measures' => $params['control_measures'], - 'create_user' => $params['create_user'], - 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), - '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 10:11 - */ - public static function delete(array $params): bool - { - return SupervisionExcessRiskSecurityMonitoring::destroy($params['id']); - } - - - /** - * @notes 获取工程监理--超规模危险性较大工程安全监控详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/04 10:11 - */ - 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['project_name'] = $project['project_name']; - $data['partial_project_text'] = $data->partial_project_text; - $data['is_discuss_text'] = $data->is_discuss_text; - $data['is_modify_text'] = $data->is_modify_text; - $data['is_agree_text'] = $data->is_agree_text; - $data['is_accept_text'] = $data->is_accept_text; - $data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text; - $data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text; - $data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 工程监理--超规模危险性较大工程安全监控逻辑 + * Class SupervisionExcessRiskSecurityMonitoringLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--超规模危险性较大工程安全监控 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/04 10:11 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionExcessRiskSecurityMonitoring::create([ + 'project_id' => $params['project_id'], + 'partial_project' => $params['partial_project'], + 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, + 'project_characteristics' => $params['project_characteristics'], + 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, + 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, + 'is_discuss' => $params['is_discuss'], + 'is_modify' => $params['is_modify'], + 'is_agree' => $params['is_agree'], + 'is_accept' => $params['is_accept'], + 'is_accept_to_plan' => $params['is_accept_to_plan'], + 'check_user' => $params['check_user'], + 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, + 'problems_rectification' => $params['problems_rectification'], + 'responsible_person' => $params['responsible_person'], + 'exceed_the_control_value' => $params['exceed_the_control_value'], + 'exceed_the_warning_value' => $params['exceed_the_warning_value'], + 'control_measures' => $params['control_measures'], + '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/04 10:11 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionExcessRiskSecurityMonitoring::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'partial_project' => $params['partial_project'], + 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, + 'project_characteristics' => $params['project_characteristics'], + 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, + 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, + 'is_discuss' => $params['is_discuss'], + 'is_modify' => $params['is_modify'], + 'is_agree' => $params['is_agree'], + 'is_accept' => $params['is_accept'], + 'is_accept_to_plan' => $params['is_accept_to_plan'], + 'check_user' => $params['check_user'], + 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, + 'problems_rectification' => $params['problems_rectification'], + 'responsible_person' => $params['responsible_person'], + 'exceed_the_control_value' => $params['exceed_the_control_value'], + 'exceed_the_warning_value' => $params['exceed_the_warning_value'], + 'control_measures' => $params['control_measures'], + 'create_user' => $params['create_user'], + 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), + '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 10:11 + */ + public static function delete(array $params): bool + { + return SupervisionExcessRiskSecurityMonitoring::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--超规模危险性较大工程安全监控详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/04 10:11 + */ + 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(); + $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id'); + $data['project_name'] = $project['project_name']; + $data['partial_project_text'] = $data->partial_project_text; + $data['is_discuss_text'] = $data->is_discuss_text; + $data['is_modify_text'] = $data->is_modify_text; + $data['is_agree_text'] = $data->is_agree_text; + $data['is_accept_text'] = $data->is_accept_text; + $data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text; + $data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text; + $data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text; + $data['check_user_name'] = $admin[$data['check_user']] ?? ''; + $data['responsible_person_name'] = $admin[$data['responsible_person']] ?? ''; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php index 7335bbe3d..604f1aaaa 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php @@ -11,142 +11,146 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring; -use app\common\logic\BaseLogic; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--危险性较大的工程安全监控逻辑 - * Class SupervisionHighRiskSecurityMonitoringLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--危险性较大的工程安全监控 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/04 09:22 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionHighRiskSecurityMonitoring::create([ - 'project_id' => $params['project_id'], - 'partial_project' => $params['partial_project'], - 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, - 'project_characteristics' => $params['project_characteristics'], - 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, - 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, - 'is_report' => $params['is_report'], - 'is_agree' => $params['is_agree'], - 'is_accept' => $params['is_accept'], - 'is_accept_to_plan' => $params['is_accept_to_plan'], - 'check_user' => $params['check_user'], - 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, - 'problems_rectification' => $params['problems_rectification'], - 'responsible_person' => $params['responsible_person'], - 'exceed_the_control_value' => $params['exceed_the_control_value'], - 'exceed_the_warning_value' => $params['exceed_the_warning_value'], - 'control_measures' => $params['control_measures'], - '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/04 09:22 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - SupervisionHighRiskSecurityMonitoring::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'partial_project' => $params['partial_project'], - 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, - 'project_characteristics' => $params['project_characteristics'], - 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, - 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, - 'is_report' => $params['is_report'], - 'is_agree' => $params['is_agree'], - 'is_accept' => $params['is_accept'], - 'is_accept_to_plan' => $params['is_accept_to_plan'], - 'check_user' => $params['check_user'], - 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, - 'problems_rectification' => $params['problems_rectification'], - 'responsible_person' => $params['responsible_person'], - 'exceed_the_control_value' => $params['exceed_the_control_value'], - 'exceed_the_warning_value' => $params['exceed_the_warning_value'], - 'control_measures' => $params['control_measures'], - 'create_user' => $params['create_user'], - 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), - '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 09:22 - */ - public static function delete(array $params): bool - { - return SupervisionHighRiskSecurityMonitoring::destroy($params['id']); - } - - - /** - * @notes 获取工程监理--危险性较大的工程安全监控详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/04 09:22 - */ - 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['project_name'] = $project['project_name']; - $data['partial_project_text'] = $data->partial_project_text; - $data['is_report_text'] = $data->is_report_text; - $data['is_agree_text'] = $data->is_agree_text; - $data['is_accept_text'] = $data->is_accept_text; - $data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text; - $data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text; - $data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 工程监理--危险性较大的工程安全监控逻辑 + * Class SupervisionHighRiskSecurityMonitoringLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--危险性较大的工程安全监控 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/04 09:22 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionHighRiskSecurityMonitoring::create([ + 'project_id' => $params['project_id'], + 'partial_project' => $params['partial_project'], + 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, + 'project_characteristics' => $params['project_characteristics'], + 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, + 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, + 'is_report' => $params['is_report'], + 'is_agree' => $params['is_agree'], + 'is_accept' => $params['is_accept'], + 'is_accept_to_plan' => $params['is_accept_to_plan'], + 'check_user' => $params['check_user'], + 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, + 'problems_rectification' => $params['problems_rectification'], + 'responsible_person' => $params['responsible_person'], + 'exceed_the_control_value' => $params['exceed_the_control_value'], + 'exceed_the_warning_value' => $params['exceed_the_warning_value'], + 'control_measures' => $params['control_measures'], + '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/04 09:22 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionHighRiskSecurityMonitoring::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'partial_project' => $params['partial_project'], + 'attribution_date' => !empty($params['attribution_date']) ? strtotime($params['attribution_date']) : 0, + 'project_characteristics' => $params['project_characteristics'], + 'planned_construction_time' => !empty($params['planned_construction_time']) ? strtotime($params['planned_construction_time']) : 0, + 'actual_construction_time' => !empty($params['actual_construction_time']) ? strtotime($params['actual_construction_time']) : 0, + 'is_report' => $params['is_report'], + 'is_agree' => $params['is_agree'], + 'is_accept' => $params['is_accept'], + 'is_accept_to_plan' => $params['is_accept_to_plan'], + 'check_user' => $params['check_user'], + 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, + 'problems_rectification' => $params['problems_rectification'], + 'responsible_person' => $params['responsible_person'], + 'exceed_the_control_value' => $params['exceed_the_control_value'], + 'exceed_the_warning_value' => $params['exceed_the_warning_value'], + 'control_measures' => $params['control_measures'], + 'create_user' => $params['create_user'], + 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(), + '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 09:22 + */ + public static function delete(array $params): bool + { + return SupervisionHighRiskSecurityMonitoring::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--危险性较大的工程安全监控详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/04 09:22 + */ + 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(); + $admin = Admin::where('id', 'in', [$data['check_user'], $data['responsible_person']])->column('name', 'id'); + $data['project_name'] = $project['project_name']; + $data['partial_project_text'] = $data->partial_project_text; + $data['is_report_text'] = $data->is_report_text; + $data['is_agree_text'] = $data->is_agree_text; + $data['is_accept_text'] = $data->is_accept_text; + $data['is_accept_to_plan_text'] = $data->is_accept_to_plan_text; + $data['exceed_the_control_value_text'] = $data->exceed_the_control_value_text; + $data['exceed_the_warning_value_text'] = $data->exceed_the_warning_value_text; + $data['check_user_name'] = $admin[$data['check_user']] ?? ''; + $data['responsible_person_name'] = $admin[$data['responsible_person']] ?? ''; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php index b11bf5c97..dd39e60fc 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php @@ -11,124 +11,62 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment; -use app\common\logic\BaseLogic; -use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecord; -use app\common\model\supervision_project\SupervisionParticipatingUnits; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 大型机械设备及仪器台账逻辑 - * Class SupervisionLargeMechanicalEquipmentLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic -{ - - - /** - * @notes 添加大型机械设备及仪器台账 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/02 09:51 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - $res = SupervisionLargeMechanicalEquipment::create([ - 'project_id' => $params['project_id'], - 'sn' => data_unique_code('SBYQTZ'), - '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 - ]); - if(!empty($params['maintenance_record'])){ - foreach($params['maintenance_record'] as $v){ - SupervisionLargeMechanicalEquipmentMaintenanceRecord::create([ - 'large_mechanical_equipment_id' => $res->id, - 'reg_date' => !empty($v['reg_date']) ? strtotime($v['reg_date']) : 0, - '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{ + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipment; + use app\common\model\supervision_dangerous\SupervisionLargeMechanicalEquipmentMaintenanceRecord; + use app\common\model\supervision_project\SupervisionParticipatingUnits; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 大型机械设备及仪器台账逻辑 + * Class SupervisionLargeMechanicalEquipmentLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic + { + + + /** + * @notes 添加大型机械设备及仪器台账 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/02 09:51 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + $res = SupervisionLargeMechanicalEquipment::create([ + 'project_id' => $params['project_id'], + 'sn' => data_unique_code('SBYQTZ'), + '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 + ]); + if (!empty($params['maintenance_record'])) { + foreach ($params['maintenance_record'] as $v) { 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, 'month_warranty_file' => $v['month_warranty_file'], '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, ]); } - } - } - 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; + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + 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(); - $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; - return $data->toArray(); - } -} \ No newline at end of file + + + /** + * @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([ + '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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php index 1cbae36ba..95922f796 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php @@ -11,111 +11,114 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\supervision_dangerous; - - -use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign; -use app\common\logic\BaseLogic; -use app\common\model\supervision_project\SupervisionProject; -use think\facade\Db; - - -/** - * 工程监理--现场安全警示标志逻辑 - * Class SupervisionSafetyWarningSignLogic - * @package app\adminapi\logic\supervision_dangerous - */ -class SupervisionSafetyWarningSignLogic extends BaseLogic -{ - - - /** - * @notes 添加工程监理--现场安全警示标志 - * @param array $params - * @return bool - * @author likeadmin - * @date 2024/03/01 15:41 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - SupervisionSafetyWarningSign::create([ - 'project_id' => $params['project_id'], - 'check_user' => $params['check_user'], - 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, - 'check_area' => $params['check_area'], - 'problem_desc' => $params['problem_desc'], - 'remark' => $params['remark'], - '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/01 15:41 - */ - public static function edit(array $params): bool - { - Db::startTrans(); - try { - SupervisionSafetyWarningSign::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'check_user' => $params['check_user'], - 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, - 'check_area' => $params['check_area'], - 'problem_desc' => $params['problem_desc'], - 'remark' => $params['remark'], - '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 - * @return bool - * @author likeadmin - * @date 2024/03/01 15:41 - */ - public static function delete(array $params): bool - { - return SupervisionSafetyWarningSign::destroy($params['id']); - } - - - /** - * @notes 获取工程监理--现场安全警示标志详情 - * @param $params - * @return array - * @author likeadmin - * @date 2024/03/01 15:41 - */ - 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['project_name'] = $project['project_name']; - return $data->toArray(); - } -} \ No newline at end of file + + namespace app\adminapi\logic\supervision_dangerous; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\supervision_dangerous\SupervisionSafetyWarningSign; + use app\common\model\supervision_project\SupervisionProject; + use think\facade\Db; + + + /** + * 工程监理--现场安全警示标志逻辑 + * Class SupervisionSafetyWarningSignLogic + * @package app\adminapi\logic\supervision_dangerous + */ + class SupervisionSafetyWarningSignLogic extends BaseLogic + { + + + /** + * @notes 添加工程监理--现场安全警示标志 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + SupervisionSafetyWarningSign::create([ + 'project_id' => $params['project_id'], + 'check_user' => $params['check_user'], + 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, + 'check_area' => $params['check_area'], + 'problem_desc' => $params['problem_desc'], + 'remark' => $params['remark'], + '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/01 15:41 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionSafetyWarningSign::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'check_user' => $params['check_user'], + 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, + 'check_area' => $params['check_area'], + 'problem_desc' => $params['problem_desc'], + 'remark' => $params['remark'], + '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 + * @return bool + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public static function delete(array $params): bool + { + return SupervisionSafetyWarningSign::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--现场安全警示标志详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/01 15:41 + */ + 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(); + $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(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php b/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php index e39a153a2..30bab1d3b 100644 --- a/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php @@ -131,6 +131,7 @@ $data['project_name'] = $project['project_name']; $data['emcee_name'] = $admin[$data['emcee']] ?? ''; $data['recorder_name'] = $admin[$data['recorder']] ?? ''; + $data['attendees_name'] = implode(',', $attendees); return $data->toArray(); } } \ No newline at end of file