This commit is contained in:
weiz 2024-03-25 13:43:08 +08:00
parent 3abe30b2fc
commit bc70ca1ed0
2 changed files with 251 additions and 233 deletions

View File

@ -61,6 +61,23 @@ class ProjectSettlementController extends BaseAdminController
return $this->fail(ProjectSettlementLogic::getError());
}
public function edit()
{
$params = (new ProjectSettlementValidate())->post()->goCheck('edit');
$result = ProjectSettlementLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}
return $this->fail(ProjectSettlementLogic::getError());
}
public function delete()
{
$params = (new ProjectSettlementValidate())->post()->goCheck('delete');
ProjectSettlementLogic::delete($params);
return $this->success('编辑成功', [], 1, 1);
}
/**
* @notes 获取甲方结算详情

View File

@ -15,13 +15,13 @@
namespace app\adminapi\logic\project;
use app\common\logic\BaseLogic;
use app\common\model\contract\Contract;
use app\common\model\contract\ContractNegotiation;
use app\common\model\custom\Custom;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\model\project\ProjectSettlement;
use app\common\logic\BaseLogic;
use think\facade\Db;
@ -45,7 +45,7 @@ class ProjectSettlementLogic extends BaseLogic
{
Db::startTrans();
try {
$res = ProjectSettlement::create([
ProjectSettlement::create([
'settlement_code' => data_unique_code('甲方结算'),
'project_id' => $params['project_id'],
'contract_id' => $params['contract_id'],
@ -137,7 +137,8 @@ class ProjectSettlementLogic extends BaseLogic
return $data;
}
public static function approve($params,$admin_id): bool{
public static function approve($params, $admin_id): bool
{
$data = ProjectSettlement::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {