From e37557fe71b722212fcfaaa9c2db4a246c9dcf10 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Fri, 12 Apr 2024 10:04:30 +0800 Subject: [PATCH] update --- .../MarketingBidEvaluationController.php | 7 +- .../marketing/MarketingBidInfoController.php | 108 +++++++++++ ...MarketingBusinessOpportunityController.php | 7 +- .../marketing/MarketingBidEvaluationLists.php | 15 +- .../lists/marketing/MarketingBidInfoLists.php | 111 ++++++++++++ .../marketing/MarketingBidEvaluationLogic.php | 14 +- .../logic/marketing/MarketingBidInfoLogic.php | 168 ++++++++++++++++++ .../MarketingBusinessOpportunityLogic.php | 6 + .../marketing/MarketingBidInfoValidate.php | 164 +++++++++++++++++ .../model/marketing/MarketingBidInfo.php | 49 +++++ .../MarketingBusinessOpportunity.php | 2 +- 11 files changed, 637 insertions(+), 14 deletions(-) create mode 100644 app/adminapi/controller/marketing/MarketingBidInfoController.php create mode 100644 app/adminapi/lists/marketing/MarketingBidInfoLists.php create mode 100644 app/adminapi/logic/marketing/MarketingBidInfoLogic.php create mode 100644 app/adminapi/validate/marketing/MarketingBidInfoValidate.php create mode 100644 app/common/model/marketing/MarketingBidInfo.php diff --git a/app/adminapi/controller/marketing/MarketingBidEvaluationController.php b/app/adminapi/controller/marketing/MarketingBidEvaluationController.php index 54b8d54fc..1a57fd0a0 100644 --- a/app/adminapi/controller/marketing/MarketingBidEvaluationController.php +++ b/app/adminapi/controller/marketing/MarketingBidEvaluationController.php @@ -102,8 +102,11 @@ public function delete() { $params = (new MarketingBidEvaluationValidate())->post()->goCheck('delete'); - MarketingBidEvaluationLogic::delete($params); - return $this->success('删除成功', [], 1, 1); + $result = MarketingBidEvaluationLogic::delete($params); + if (true === $result) { + return $this->success('删除成功', [], 1, 1); + } + return $this->fail(MarketingBidEvaluationLogic::getError()); } diff --git a/app/adminapi/controller/marketing/MarketingBidInfoController.php b/app/adminapi/controller/marketing/MarketingBidInfoController.php new file mode 100644 index 000000000..8c13beca7 --- /dev/null +++ b/app/adminapi/controller/marketing/MarketingBidInfoController.php @@ -0,0 +1,108 @@ +dataLists(new MarketingBidInfoLists()); + } + + + /** + * @notes 添加市场经营--投标管理--投标信息 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function add() + { + $params = (new MarketingBidInfoValidate())->post()->goCheck('add'); + $result = MarketingBidInfoLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(MarketingBidInfoLogic::getError()); + } + + + /** + * @notes 编辑市场经营--投标管理--投标信息 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function edit() + { + $params = (new MarketingBidInfoValidate())->post()->goCheck('edit'); + $result = MarketingBidInfoLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(MarketingBidInfoLogic::getError()); + } + + + /** + * @notes 删除市场经营--投标管理--投标信息 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function delete() + { + $params = (new MarketingBidInfoValidate())->post()->goCheck('delete'); + MarketingBidInfoLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取市场经营--投标管理--投标信息详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function detail() + { + $params = (new MarketingBidInfoValidate())->goCheck('detail'); + $result = MarketingBidInfoLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/marketing/MarketingBusinessOpportunityController.php b/app/adminapi/controller/marketing/MarketingBusinessOpportunityController.php index c640a9151..3bdc6d1bb 100644 --- a/app/adminapi/controller/marketing/MarketingBusinessOpportunityController.php +++ b/app/adminapi/controller/marketing/MarketingBusinessOpportunityController.php @@ -88,8 +88,11 @@ public function delete() { $params = (new MarketingBusinessOpportunityValidate())->post()->goCheck('delete'); - MarketingBusinessOpportunityLogic::delete($params); - return $this->success('删除成功', [], 1, 1); + $result = MarketingBusinessOpportunityLogic::delete($params); + if (true === $result) { + return $this->success('删除成功', [], 1, 1); + } + return $this->fail(MarketingBusinessOpportunityLogic::getError()); } public function datas(): \think\response\Json diff --git a/app/adminapi/lists/marketing/MarketingBidEvaluationLists.php b/app/adminapi/lists/marketing/MarketingBidEvaluationLists.php index 3d2bbb391..2840ae63f 100644 --- a/app/adminapi/lists/marketing/MarketingBidEvaluationLists.php +++ b/app/adminapi/lists/marketing/MarketingBidEvaluationLists.php @@ -66,9 +66,9 @@ ->select()->each(function ($data) { $business_opportunity = MarketingBusinessOpportunity::withoutField('bid_date,contacts,annex,approve_id,create_time,update_time,delete_time')->where('id', $data['business_opportunity_id'])->findOrEmpty(); $data['business_opportunity'] = $business_opportunity->toArray(); - $construct_company = MarketingCustom::field('name')->where('id', $data['construct_company'])->findOrEmpty(); - $admin = Admin::where('id', 'in', [$data['head'], $data['leader']])->column('name', 'id'); - $dept = Dept::field('name')->where('id', $data['dept'])->findOrEmpty(); + $construct_company = MarketingCustom::field('name')->where('id', $business_opportunity['construct_company'])->findOrEmpty(); + $admin = Admin::where('id', 'in', [$business_opportunity['head'], $business_opportunity['leader']])->column('name', 'id'); + $dept = Dept::field('name')->where('id', $business_opportunity['dept'])->findOrEmpty(); $data['business_opportunity']['construct_company_name'] = $construct_company?->name; $data['business_opportunity']['business_nature_text'] = $business_opportunity->business_nature_text; $data['business_opportunity']['industry_nature_text'] = $business_opportunity->industry_nature_text; @@ -85,8 +85,13 @@ $data['reg_status'] = 0; $data['reg_status_text'] = '未报名'; } else { - $data['reg_status'] = 1; - $data['reg_status_text'] = '已报名'; + if ($data['review_status'] == 0 && $data['reg_result'] == 0) { + $data['reg_status'] = 1; + $data['reg_status_text'] = '报名通过'; + } else { + $data['reg_status'] = 2; + $data['reg_status_text'] = '报名不通过'; + } } if (!empty($data['approve_id'])) { $approve = FlowApprove::field('check_status')->where('content_id', $data['id'])->where('content_model', 'app\common\model\marketing\MarketingBidEvaluation')->findOrEmpty(); diff --git a/app/adminapi/lists/marketing/MarketingBidInfoLists.php b/app/adminapi/lists/marketing/MarketingBidInfoLists.php new file mode 100644 index 000000000..d517f3510 --- /dev/null +++ b/app/adminapi/lists/marketing/MarketingBidInfoLists.php @@ -0,0 +1,111 @@ + ['bid_evaluation_id', 'general_manager', 'bid_head'], + ]; + } + + + /** + * @notes 获取市场经营--投标管理--投标信息列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function lists(): array + { + return MarketingBidInfo::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function ($data) { + //投标审查信息 + $bid_evaluation = MarketingBidEvaluation::withoutField('annex,create_time,update_time,delete_time')->where('id', $data['bid_evaluation_id'])->findOrEmpty(); + $data['bid_evaluation'] = $bid_evaluation; + $data['bid_evaluation']['bid_type_text'] = $bid_evaluation->bid_type_text; + $data['bid_evaluation']['bid_nature_text'] = $bid_evaluation->bid_nature_text; + //业务机会信息 + $business_opportunity = MarketingBusinessOpportunity::withoutField('bid_date,contacts,annex,approve_id,create_time,update_time,delete_time')->where('id', $bid_evaluation['business_opportunity_id'])->findOrEmpty(); + $construct_company = MarketingCustom::field('name')->where('id', $business_opportunity['construct_company'])->findOrEmpty(); + $business_opportunity_admin = Admin::where('id', 'in', [$business_opportunity['head'], $business_opportunity['leader']])->column('name', 'id'); + $business_opportunity_dept = Dept::field('name')->where('id', $business_opportunity['dept'])->findOrEmpty(); + $data['business_opportunity'] = $business_opportunity; + $data['business_opportunity']['construct_company_name'] = $construct_company?->name; + $data['business_opportunity']['business_nature_text'] = $business_opportunity->business_nature_text; + $data['business_opportunity']['industry_nature_text'] = $business_opportunity->industry_nature_text; + $data['business_opportunity']['info_sources_text'] = $business_opportunity->info_sources_text; + $data['business_opportunity']['fund_sources_text'] = $business_opportunity->fund_sources_text; + $data['business_opportunity']['const_area_text'] = $business_opportunity->const_area_text; + $data['business_opportunity']['status_text'] = $business_opportunity->status_text; + $data['business_opportunity']['dept_name'] = $business_opportunity_dept?->name; + $data['business_opportunity']['head_name'] = $business_opportunity_admin[$data['head']] ?? ''; + $data['business_opportunity']['leader_name'] = $business_opportunity_admin[$data['leader']] ?? ''; + //投标信息 + $admin = Admin::where('id', 'in', [$data['general_manager'], $data['bid_head'], $data['technology_head'], $data['business_head'], $data['other_user']])->column('name', 'id'); + $data['general_manager_name'] = $admin[$data['general_manager']] ?? ''; + $data['bid_head_name'] = $admin[$data['bid_head']] ?? ''; + $data['technology_head_name'] = $admin[$data['technology_head']] ?? ''; + $data['business_head_name'] = $admin[$data['business_head']] ?? ''; + $data['other_user_name'] = $admin[$data['other_user']] ?? ''; + $data['bid_status_text'] = $data->bid_status_text; + }) + ->toArray(); + } + + + /** + * @notes 获取市场经营--投标管理--投标信息数量 + * @return int + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function count(): int + { + return MarketingBidInfo::where($this->searchWhere)->count(); + } + + } \ No newline at end of file diff --git a/app/adminapi/logic/marketing/MarketingBidEvaluationLogic.php b/app/adminapi/logic/marketing/MarketingBidEvaluationLogic.php index 835267052..17fd575db 100644 --- a/app/adminapi/logic/marketing/MarketingBidEvaluationLogic.php +++ b/app/adminapi/logic/marketing/MarketingBidEvaluationLogic.php @@ -19,6 +19,7 @@ use app\common\model\auth\Admin; use app\common\model\dept\Dept; use app\common\model\marketing\MarketingBidEvaluation; + use app\common\model\marketing\MarketingBidInfo; use app\common\model\marketing\MarketingBusinessOpportunity; use app\common\model\marketing\MarketingCustom; use app\common\model\oa\FlowApprove; @@ -147,6 +148,11 @@ */ public static function delete(array $params): bool { + $bid_info = MarketingBidInfo::where('bid_evaluation_id', 'in', $params['id'])->findOrEmpty(); + if (!$bid_info->isEmpty()) { + self::setError('此数据关联了投标信息内容,需删除投标信息内容'); + return false; + } return MarketingBidEvaluation::destroy($params['id']); } @@ -162,10 +168,10 @@ { $data = MarketingBidEvaluation::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); $business_opportunity = MarketingBusinessOpportunity::withoutField('bid_date,contacts,annex,approve_id,create_time,update_time,delete_time')->where('id', $data['business_opportunity_id'])->findOrEmpty(); - $data['business_opportunity'] = $business_opportunity->toArray(); - $construct_company = MarketingCustom::field('name')->where('id', $data['construct_company'])->findOrEmpty(); - $admin = Admin::where('id', 'in', [$data['head'], $data['leader']])->column('name', 'id'); - $dept = Dept::field('name')->where('id', $data['dept'])->findOrEmpty(); + $data['business_opportunity'] = $business_opportunity; + $construct_company = MarketingCustom::field('name')->where('id', $business_opportunity['construct_company'])->findOrEmpty(); + $admin = Admin::where('id', 'in', [$business_opportunity['head'], $business_opportunity['leader']])->column('name', 'id'); + $dept = Dept::field('name')->where('id', $business_opportunity['dept'])->findOrEmpty(); $data['business_opportunity']['construct_company_name'] = $construct_company?->name; $data['business_opportunity']['business_nature_text'] = $business_opportunity->business_nature_text; $data['business_opportunity']['industry_nature_text'] = $business_opportunity->industry_nature_text; diff --git a/app/adminapi/logic/marketing/MarketingBidInfoLogic.php b/app/adminapi/logic/marketing/MarketingBidInfoLogic.php new file mode 100644 index 000000000..febdb6c51 --- /dev/null +++ b/app/adminapi/logic/marketing/MarketingBidInfoLogic.php @@ -0,0 +1,168 @@ +findOrEmpty(); + Db::startTrans(); + try { + MarketingBidInfo::create([ + 'bid_evaluation_id' => $params['bid_evaluation_id'], + 'margin_end_date' => !empty($params['margin_end_date']) ? strtotime($params['margin_end_date']) : 0, + 'expected_return_date' => !empty($params['expected_return_date']) ? strtotime($params['expected_return_date']) : 0, + 'service_charge' => $params['service_charge'] ?? 0, + 'publish_website' => $params['publish_website'] ?? '', + 'general_manager' => $params['general_manager'], + 'bid_quotation' => $params['bid_quotation'] ?? 0, + 'bid_rate' => $params['bid_rate'] ?? 0, + 'bid_head' => $params['bid_head'] ?? 0, + 'technology_head' => $params['technology_head'] ?? 0, + 'business_head' => $params['business_head'] ?? 0, + 'other_user' => $params['other_user'] ?? 0, + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'bid_status' => 0, + ]); + MarketingBusinessOpportunity::where('id', $bid_evaluation['business_opportunity_id'])->update(['status' => 2]); + 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/04/12 09:23 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + MarketingBidInfo::where('id', $params['id'])->update([ + 'bid_evaluation_id' => $params['bid_evaluation_id'], + 'margin_end_date' => !empty($params['margin_end_date']) ? strtotime($params['margin_end_date']) : 0, + 'expected_return_date' => !empty($params['expected_return_date']) ? strtotime($params['expected_return_date']) : 0, + 'service_charge' => $params['service_charge'] ?? 0, + 'publish_website' => $params['publish_website'] ?? '', + 'general_manager' => $params['general_manager'], + 'bid_quotation' => $params['bid_quotation'] ?? 0, + 'bid_rate' => $params['bid_rate'] ?? 0, + 'bid_head' => $params['bid_head'] ?? 0, + 'technology_head' => $params['technology_head'] ?? 0, + 'business_head' => $params['business_head'] ?? 0, + 'other_user' => $params['other_user'] ?? 0, + '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/04/12 09:23 + */ + public static function delete(array $params): bool + { + return MarketingBidInfo::destroy($params['id']); + } + + + /** + * @notes 获取市场经营--投标管理--投标信息详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public static function detail($params): array + { + $data = MarketingBidInfo::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + //投标审查信息 + $bid_evaluation = MarketingBidEvaluation::withoutField('annex,create_time,update_time,delete_time')->where('id', $data['bid_evaluation_id'])->findOrEmpty(); + $data['bid_evaluation'] = $bid_evaluation; + $data['bid_evaluation']['bid_type_text'] = $bid_evaluation->bid_type_text; + $data['bid_evaluation']['bid_nature_text'] = $bid_evaluation->bid_nature_text; + //业务机会信息 + $business_opportunity = MarketingBusinessOpportunity::withoutField('bid_date,contacts,annex,approve_id,create_time,update_time,delete_time')->where('id', $bid_evaluation['business_opportunity_id'])->findOrEmpty(); + $construct_company = MarketingCustom::field('name')->where('id', $business_opportunity['construct_company'])->findOrEmpty(); + $business_opportunity_admin = Admin::where('id', 'in', [$business_opportunity['head'], $business_opportunity['leader']])->column('name', 'id'); + $business_opportunity_dept = Dept::field('name')->where('id', $business_opportunity['dept'])->findOrEmpty(); + $data['business_opportunity'] = $business_opportunity; + $data['business_opportunity']['construct_company_name'] = $construct_company?->name; + $data['business_opportunity']['business_nature_text'] = $business_opportunity->business_nature_text; + $data['business_opportunity']['industry_nature_text'] = $business_opportunity->industry_nature_text; + $data['business_opportunity']['info_sources_text'] = $business_opportunity->info_sources_text; + $data['business_opportunity']['fund_sources_text'] = $business_opportunity->fund_sources_text; + $data['business_opportunity']['const_area_text'] = $business_opportunity->const_area_text; + $data['business_opportunity']['status_text'] = $business_opportunity->status_text; + $data['business_opportunity']['dept_name'] = $business_opportunity_dept?->name; + $data['business_opportunity']['head_name'] = $business_opportunity_admin[$data['head']] ?? ''; + $data['business_opportunity']['leader_name'] = $business_opportunity_admin[$data['leader']] ?? ''; + //投标信息 + $admin = Admin::where('id', 'in', [$data['general_manager'], $data['bid_head'], $data['technology_head'], $data['business_head'], $data['other_user']])->column('name', 'id'); + $data['general_manager_name'] = $admin[$data['general_manager']] ?? ''; + $data['bid_head_name'] = $admin[$data['bid_head']] ?? ''; + $data['technology_head_name'] = $admin[$data['technology_head']] ?? ''; + $data['business_head_name'] = $admin[$data['business_head']] ?? ''; + $data['other_user_name'] = $admin[$data['other_user']] ?? ''; + $data['bid_status_text'] = $data->bid_status_text; + return $data->toArray(); + } + } \ No newline at end of file diff --git a/app/adminapi/logic/marketing/MarketingBusinessOpportunityLogic.php b/app/adminapi/logic/marketing/MarketingBusinessOpportunityLogic.php index a3cb950b3..bf0e4134a 100644 --- a/app/adminapi/logic/marketing/MarketingBusinessOpportunityLogic.php +++ b/app/adminapi/logic/marketing/MarketingBusinessOpportunityLogic.php @@ -18,6 +18,7 @@ use app\common\logic\BaseLogic; use app\common\model\auth\Admin; use app\common\model\dept\Dept; + use app\common\model\marketing\MarketingBidEvaluation; use app\common\model\marketing\MarketingBusinessOpportunity; use app\common\model\marketing\MarketingCustom; use app\common\model\oa\FlowApprove; @@ -127,6 +128,11 @@ */ public static function delete(array $params): bool { + $bid_evaluation = MarketingBidEvaluation::where('business_opportunity_id', 'in', $params['id'])->findOrEmpty(); + if (!$bid_evaluation->isEmpty()) { + self::setError('此数据关联了投标评审内容,需删除投标评审内容'); + return false; + } return MarketingBusinessOpportunity::destroy($params['id']); } diff --git a/app/adminapi/validate/marketing/MarketingBidInfoValidate.php b/app/adminapi/validate/marketing/MarketingBidInfoValidate.php new file mode 100644 index 000000000..f3f1d03cb --- /dev/null +++ b/app/adminapi/validate/marketing/MarketingBidInfoValidate.php @@ -0,0 +1,164 @@ + 'require|checkData', + 'bid_evaluation_id' => 'require|checkBidEvaluation', + 'margin_end_date' => 'dateFormat:Y-m-d', + 'expected_return_date' => 'dateFormat:Y-m-d', + 'service_charge' => 'float|egt:0', + 'publish_website' => 'url', + 'general_manager' => 'require|checkGeneralManager', + 'bid_quotation' => 'float|egt:0', + 'bid_rate' => 'float|egt:0', + 'bid_head' => 'require|checkBidHead', + 'technology_head' => 'checkTechnologyHead', + 'business_head' => 'checkBusinessHead', + 'other_user' => 'checkOtherUser', + 'annex' => 'checkAnnex', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'bid_evaluation_id' => '投标审查id', + 'margin_end_date' => '保证金递交截止日期', + 'expected_return_date' => '预计归还日期', + 'service_charge' => '中标服务费', + 'publish_website' => '发布网址', + 'general_manager' => '拟派总监/经理', + 'bid_quotation' => '拟投标报价', + 'bid_rate' => '拟投标费率', + 'bid_head' => '投标负责人', + 'technology_head' => '技术标负责人', + 'business_head' => '商务标负责人', + 'other_user' => '其他拟派人员', + 'remark' => '备注', + ]; + + + /** + * @notes 添加场景 + * @return MarketingBidInfoValidate + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return MarketingBidInfoValidate + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function sceneEdit() + { + } + + + /** + * @notes 删除场景 + * @return MarketingBidInfoValidate + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function sceneDelete() + { + return $this->only(['id'])->remove('id', 'checkData'); + } + + + /** + * @notes 详情场景 + * @return MarketingBidInfoValidate + * @author likeadmin + * @date 2024/04/12 09:23 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = MarketingBidInfo::where('id', $value)->findOrEmpty(); + return $data->isEmpty() ? '数据不存在' : true; + } + + public function checkBidEvaluation($value): bool|string + { + $data = MarketingBidEvaluation::where('id', $value)->findOrEmpty(); + return $data->isEmpty() ? '投标评审数据不存在' : true; + } + + public function checkGeneralManager($value): bool|string + { + $data = Admin::where('id', $value)->findOrEmpty(); + return $data->isEmpty() ? '拟派总监/经理数据不存在' : true; + } + + public function checkBidHead($value): bool|string + { + $data = Admin::where('id', $value)->findOrEmpty(); + return $data->isEmpty() ? '投标负责人数据不存在' : true; + } + + public function checkTechnologyHead($value): bool|string + { + $data = Admin::where('id', $value)->findOrEmpty(); + return $data->isEmpty() ? '技术标负责人数据不存在' : true; + } + + public function checkBusinessHead($value): bool|string + { + $data = Admin::where('id', $value)->findOrEmpty(); + return $data->isEmpty() ? '商务标负责人数据不存在' : true; + } + + public function checkOtherUser($value): bool|string + { + $data = Admin::where('id', $value)->findOrEmpty(); + return $data->isEmpty() ? '其他拟派人员数据不存在' : true; + } + + } \ No newline at end of file diff --git a/app/common/model/marketing/MarketingBidInfo.php b/app/common/model/marketing/MarketingBidInfo.php new file mode 100644 index 000000000..1cbddad6e --- /dev/null +++ b/app/common/model/marketing/MarketingBidInfo.php @@ -0,0 +1,49 @@ + '未开标', 1 => '已中标', 2 => '未中标']; + return $arr[$data['review_status']]; + } + } \ No newline at end of file diff --git a/app/common/model/marketing/MarketingBusinessOpportunity.php b/app/common/model/marketing/MarketingBusinessOpportunity.php index 7d43803ea..1625880bf 100644 --- a/app/common/model/marketing/MarketingBusinessOpportunity.php +++ b/app/common/model/marketing/MarketingBusinessOpportunity.php @@ -64,7 +64,7 @@ public function getStatusTextAttr($value, $data): string { - $arr = [0 => '未启动投标', 1 => '参与投标']; + $arr = [0 => '未启动投标', 1 => '参与投标', 2 => '未开标']; return $arr[$data['status']]; }