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

update

Browse Source
This commit is contained in:
weiz 2024-03-21 17:39:01 +08:00
parent cf798307a0
commit 913d9be8b1
2 changed files with 273 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/contract/SubcontractingContractNegotiationController.php
View File

@ -54,7 +54,7 @@ class SubcontractingContractNegotiationController extends BaseAdminController
public function add() public function add()
{ {
$params = (new SubcontractingContractNegotiationValidate())->post()->goCheck('add'); $params = (new SubcontractingContractNegotiationValidate())->post()->goCheck('add');
$result = SubcontractingContractNegotiationLogic::add($params,$this->adminId); $result = SubcontractingContractNegotiationLogic::add($params);
if (true === $result) { if (true === $result) {
return $this->success('添加成功', [], 1, 1); return $this->success('添加成功', [], 1, 1);
} }

7
app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
View File

@ -15,9 +15,9 @@
namespace app\adminapi\logic\contract; namespace app\adminapi\logic\contract;
use app\common\logic\BaseLogic;
use app\common\model\contract\SubcontractingContract; use app\common\model\contract\SubcontractingContract;
use app\common\model\contract\SubcontractingContractNegotiation; use app\common\model\contract\SubcontractingContractNegotiation;
use app\common\logic\BaseLogic;
use app\common\model\oa\FlowApprove; use app\common\model\oa\FlowApprove;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\model\supplier\Supplier; use app\common\model\supplier\Supplier;
@ -39,7 +39,7 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
* @author likeadmin * @author likeadmin
* @date 2023/12/12 17:21 * @date 2023/12/12 17:21
*/ */
public static function add(array $params,$admin_id): bool public static function add(array $params): bool
{ {
$subcontracting_contract = SubcontractingContract::field('project_id')->where('id', $params['subcontracting_contract_id'])->findOrEmpty(); $subcontracting_contract = SubcontractingContract::field('project_id')->where('id', $params['subcontracting_contract_id'])->findOrEmpty();
Db::startTrans(); Db::startTrans();
@ -145,7 +145,8 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
return $data->toArray(); return $data->toArray();
} }
public static function approve($params,$admin_id): bool{ public static function approve($params, $admin_id): bool
{
$data = SubcontractingContractNegotiation::where('id', $params['id'])->findOrEmpty(); $data = SubcontractingContractNegotiation::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) { if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {