From c8357a6bd1a056c1634082bc2412e7f0a6b516ca Mon Sep 17 00:00:00 2001 From: weiz Date: Wed, 17 Jan 2024 18:09:02 +0800 Subject: [PATCH] update --- .../lists/project/ProjectSubcontractSettlementLists.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/adminapi/lists/project/ProjectSubcontractSettlementLists.php b/app/adminapi/lists/project/ProjectSubcontractSettlementLists.php index 795aaae9a..d9b652b99 100644 --- a/app/adminapi/lists/project/ProjectSubcontractSettlementLists.php +++ b/app/adminapi/lists/project/ProjectSubcontractSettlementLists.php @@ -17,8 +17,7 @@ namespace app\adminapi\lists\project; use app\adminapi\lists\BaseAdminDataLists; use app\common\model\auth\Admin; -use app\common\model\contract\Contract; -use app\common\model\contract\ProcurementContract; +use app\common\model\contract\SubcontractingContract; use app\common\model\project\Project; use app\common\model\project\ProjectSubcontractSettlement; use app\common\lists\ListsSearchInterface; @@ -66,12 +65,12 @@ class ProjectSubcontractSettlementLists extends BaseAdminDataLists implements Li ->order(['id' => 'desc']) ->select()->each(function($item){ $project = Project::field('name')->where('id',$item['project_id'])->findOrEmpty(); - $contract = ProcurementContract::field('supplier_id,contract_amount,contract_no')->where('id',$item['contract_id'])->findOrEmpty(); + $contract = SubcontractingContract::field('supplier_id,contract_amount,contract_no')->where('id',$item['contract_id'])->findOrEmpty(); $supplier = Supplier::field('supplier_code,supplier_name')->where('id',$contract['supplier_id'])->findOrEmpty(); $admin = Admin::field('name')->where('id',$item['add_user'])->findOrEmpty(); $item['supplier_name'] = $supplier['supplier_name']; $item['project_name'] = $project['name']; - $item['contract_code'] = $contract['contract_code']; + $item['contract_code'] = $contract['contract_no']; $item['contract_amount'] = $contract['contract_amount']; $item['add_user_name'] = $admin['name']; unset($item['project_id'],$item['contract_id'],$item['add_user']);