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 14:26:50 +08:00
parent d897fce646
commit a66bf95215
3 changed files with 178 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/adminapi/logic/project/ProjectSubcontractSettlementLogic.php
View File

@ -14,13 +14,13 @@
namespace app\adminapi\logic\project;
use app\common\logic\BaseLogic;
use app\common\model\contract\SubcontractingContract;
use app\common\model\contract\SubcontractingContractDetail;
use app\common\model\contract\SubcontractingContractNegotiation;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\model\project\ProjectSubcontractSettlement;
use app\common\logic\BaseLogic;
use app\common\model\supplier\Supplier;
use think\facade\Db;
@ -131,7 +131,7 @@ class ProjectSubcontractSettlementLogic extends BaseLogic
//合同金额
$data['contract_amount'] = SubcontractingContractDetail::where('contract_id', $data['contract_id'])->sum('amount_including_tax');
//合同洽商金额
$data['negotiation_amount'] = SubcontractingContractNegotiation::where('contract_id',$data['contract_id'])->sum('negotiation_amount');
$data['negotiation_amount'] = SubcontractingContractNegotiation::where('subcontracting_contract_id', $data['contract_id'])->sum('negotiation_amount');
//结算差异
$data['settlement_difference'] = bcsub(($data['contract_amount'] + $data['negotiation_amount']), $data['settlement_amount']);
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
@ -139,7 +139,8 @@ class ProjectSubcontractSettlementLogic extends BaseLogic
return $data;
}
public static function approve($params,$admin_id): bool{
public static function approve($params, $admin_id): bool
{
$data = ProjectSubcontractSettlement::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {

10
app/adminapi/validate/project/ProjectSubcontractSettlementValidate.php
View File

@ -137,14 +137,4 @@
return true;
}
public function checkAnnex($value): bool|string
{
if (!empty($value) && $value != '') {
if (!is_array($value)) {
return '附件格式错误';
}
}
return true;
}
}

6
app/common/model/project/ProjectSubcontractSettlement.php
View File

@ -27,14 +27,10 @@ use think\model\concern\SoftDelete;
class ProjectSubcontractSettlement extends BaseModel
{
use SoftDelete;
protected $name = 'project_subcontract_settlement';
protected $deleteTime = 'delete_time';
public function getAnnexAttr($value)
{
return !empty($value) ? json_decode($value,true) : '';
}
public function getSettlementDateAttr($value): string
{
return !empty($value) ? date('Y-m-d', $value) : '';