From 5d9e02eae7c6e5880f3d68454dd07b7d95e7dc19 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Fri, 12 Apr 2024 15:46:48 +0800
Subject: [PATCH] update

---
 .../lists/marketing/MarketingBidResultDetailLists.php    | 3 +++
 .../logic/marketing/MarketingBidResultDetailLogic.php    | 3 +++
 .../marketing/MarketingBidResultDetailValidate.php       | 9 ++++++++-
 .../validate/marketing/MarketingBidResultValidate.php    | 4 ++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/marketing/MarketingBidResultDetailLists.php b/app/adminapi/lists/marketing/MarketingBidResultDetailLists.php
index 04f3c0d00..26d302822 100644
--- a/app/adminapi/lists/marketing/MarketingBidResultDetailLists.php
+++ b/app/adminapi/lists/marketing/MarketingBidResultDetailLists.php
@@ -18,6 +18,7 @@
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsSearchInterface;
 	use app\common\model\marketing\MarketingBidResultDetail;
+	use app\common\model\marketing\MarketingCompetitor;
 	
 	
 	/**
@@ -58,6 +59,8 @@
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
 				->select()->each(function ($data) {
+					$company = MarketingCompetitor::field('company_name')->where('id', $data['company'])->findOrEmpty();
+					$data['company_name'] = $company['company_name'];
 					$data['result_text'] = $data->result_text;
 				})
 				->toArray();
diff --git a/app/adminapi/logic/marketing/MarketingBidResultDetailLogic.php b/app/adminapi/logic/marketing/MarketingBidResultDetailLogic.php
index a1744b826..bf09e66ed 100644
--- a/app/adminapi/logic/marketing/MarketingBidResultDetailLogic.php
+++ b/app/adminapi/logic/marketing/MarketingBidResultDetailLogic.php
@@ -17,6 +17,7 @@
 	
 	use app\common\logic\BaseLogic;
 	use app\common\model\marketing\MarketingBidResultDetail;
+	use app\common\model\marketing\MarketingCompetitor;
 	use think\facade\Db;
 	
 	
@@ -116,6 +117,8 @@
 		public static function detail($params): array
 		{
 			$data = MarketingBidResultDetail::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
+			$company = MarketingCompetitor::field('company_name')->where('id', $data['company'])->findOrEmpty();
+			$data['company_name'] = $company['company_name'];
 			$data['result_text'] = $data->result_text;
 			return $data->toArray();
 		}
diff --git a/app/adminapi/validate/marketing/MarketingBidResultDetailValidate.php b/app/adminapi/validate/marketing/MarketingBidResultDetailValidate.php
index e49acf956..4c642a069 100644
--- a/app/adminapi/validate/marketing/MarketingBidResultDetailValidate.php
+++ b/app/adminapi/validate/marketing/MarketingBidResultDetailValidate.php
@@ -17,6 +17,7 @@
 	
 	use app\common\model\marketing\MarketingBidResult;
 	use app\common\model\marketing\MarketingBidResultDetail;
+	use app\common\model\marketing\MarketingCompetitor;
 	use app\common\validate\BaseValidate;
 	
 	
@@ -35,7 +36,7 @@
 		protected $rule = [
 			'id' => 'require|checkData',
 			'bid_result_id' => 'require|checkBidResult',
-			'company' => 'require',
+			'company' => 'require|checkCompany',
 			'quotation_one' => 'float|egt:0',
 			'quotation_two' => 'float|egt:0',
 			'quotation_three' => 'float|egt:0',
@@ -120,4 +121,10 @@
 			$data = MarketingBidResult::where('id', $value)->findOrEmpty();
 			return $data->isEmpty() ? '投标信息数据不存在' : true;
 		}
+		
+		public function checkCompany($value): bool|string
+		{
+			$data = MarketingCompetitor::where('id', $value)->findOrEmpty();
+			return $data->isEmpty() ? '投标单位数据不存在' : true;
+		}
 	}
\ No newline at end of file
diff --git a/app/adminapi/validate/marketing/MarketingBidResultValidate.php b/app/adminapi/validate/marketing/MarketingBidResultValidate.php
index 661b7b27c..7ca454217 100644
--- a/app/adminapi/validate/marketing/MarketingBidResultValidate.php
+++ b/app/adminapi/validate/marketing/MarketingBidResultValidate.php
@@ -19,6 +19,7 @@
 	use app\common\model\marketing\MarketingBidInfo;
 	use app\common\model\marketing\MarketingBidResult;
 	use app\common\model\marketing\MarketingBidResultDetail;
+	use app\common\model\marketing\MarketingCompetitor;
 	use app\common\validate\BaseValidate;
 	
 	
@@ -145,6 +146,9 @@
 				}
 				if (empty($v['company'])) {
 					return '参标单位列表第' . ($k + 1) . '行投标单位为空';
+				} else {
+					$company = MarketingCompetitor::where('id', $v['company'])->findOrEmpty();
+					if ($company->isEmpty()) return '参标单位列表第' . ($k + 1) . '行投标单位信息不存在';
 				}
 			}
 			return true;