mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增标书结果接口

Browse Source
This commit is contained in:
yaooo 2023-12-11 16:29:55 +08:00
parent 5fe1b9e5c2
commit 03a1fafe1d
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/adminapi/logic/bid/BidResultLogic.php
View File

@ -41,14 +41,14 @@ class BidResultLogic extends BaseLogic
Db::startTrans();
try {
BidResult::create([
'bid_document_examination_id' => $params['bid_document_examination_id'],
'project_id' => $params['project_id'],
'is_successful' => $params['is_successful'],
'bidder' => $params['bidder'],
'bidder_amount' => $params['bidder_amount'],
'bidder_amount_daxie' => $params['bidder_amount_daxie'],
'bid_summary' => $params['bid_summary'],
'annex' => $params['annex']
'bid_document_examination_id' => $params['bid_document_examination_id'] ?? 0,
'project_id' => $params['project_id'] ?? 0,
'is_successful' => $params['is_successful'] ?? 0,
'bidder' => $params['bidder'] ?? '',
'bidder_amount' => $params['bidder_amount'] ?? 0,
'bidder_amount_daxie' => $params['bidder_amount_daxie'] ?? '',
'bid_summary' => $params['bid_summary'] ?? '',
'annex' => $params['annex'] ?? '',
]);
Db::commit();
@ -73,14 +73,14 @@ class BidResultLogic extends BaseLogic
Db::startTrans();
try {
BidResult::where('id', $params['id'])->update([
'bid_document_examination_id' => $params['bid_document_examination_id'],
'project_id' => $params['project_id'],
'is_successful' => $params['is_successful'],
'bidder' => $params['bidder'],
'bidder_amount' => $params['bidder_amount'],
'bidder_amount_daxie' => $params['bidder_amount_daxie'],
'bid_summary' => $params['bid_summary'],
'annex' => $params['annex']
'bid_document_examination_id' => $params['bid_document_examination_id'] ?? 0,
'project_id' => $params['project_id'] ?? 0,
'is_successful' => $params['is_successful'] ?? 0,
'bidder' => $params['bidder'] ?? '',
'bidder_amount' => $params['bidder_amount'] ?? 0,
'bidder_amount_daxie' => $params['bidder_amount_daxie'] ?? '',
'bid_summary' => $params['bid_summary'] ?? '',
'annex' => $params['annex'] ?? '',
]);
Db::commit();
@ -115,6 +115,9 @@ class BidResultLogic extends BaseLogic
*/
public static function detail($params): array
{
return BidResult::findOrEmpty($params['id'])->toArray();
$bidResult = BidResult::findOrEmpty($params['id']);
$bidResult->project = $bidResult->project;
$bidResult->examination = $bidResult->examination;
return $bidResult->toArray();
}
}

7
app/adminapi/validate/bid/BidResultValidate.php
View File

@ -32,6 +32,11 @@ class BidResultValidate extends BaseValidate
*/
protected $rule = [
'id' => 'require',
'project_id' => 'require',
'bid_document_examination_id'=> 'require',
'is_successful' => 'require',
'bidder' => 'require',
'bidder_amount' => 'require',
];
@ -64,7 +69,7 @@ class BidResultValidate extends BaseValidate
*/
public function sceneEdit()
{
return $this->only(['id']);
return $this->only(['id', 'is_successful', 'bidder', 'bidder_amount']);
}

12
app/common/model/bid/BidResult.php
View File

@ -16,7 +16,7 @@ namespace app\common\model\bid;
use app\common\model\BaseModel;
use think\model\concern\SoftDelete;
/**
@ -27,8 +27,18 @@ use app\common\model\BaseModel;
class BidResult extends BaseModel
{
use SoftDelete;
protected $name = 'bid_result';
protected $deleteTime = 'delete_time';
public function project()
{
return $this->belongsTo(\app\common\model\project\Project::class, 'project_id');
}
public function examination()
{
return $this->belongsTo(\app\common\model\bid\BidDocumentExamination::class, 'bid_document_examination_id');
}
}