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

Merge pull request 'update' (#189) from zhangwei into dev

Browse Source 
Reviewed-on: #189
This commit is contained in:
weiz 2024-01-17 17:52:02 +08:00
commit 4e85e98bf6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/controller/project/ProjectController.php
View File

@ -122,7 +122,7 @@ class ProjectController extends BaseAdminController
return $this->fail('项目数据不存在'); return $this->fail('项目数据不存在');
} }
$data = Contract::field('id,customer_id,contract_name,contract_code,contract_type,contract_status,business_director,contract_date,amount,amount_daxie') $data = Contract::field('id,customer_id,contract_name,contract_code,contract_type,contract_status,business_director,contract_date,amount,amount_daxie')
->where('customer_id',$project['custom_id']) ->where('project_id',$project['id'])
->select()->each(function($item)use($project){ ->select()->each(function($item)use($project){
$item['contract_type_text'] = $item->contract_type_text; $item['contract_type_text'] = $item->contract_type_text;
$item['contract_status_text'] = $item->contract_status_text; $item['contract_status_text'] = $item->contract_status_text;
@ -134,7 +134,7 @@ class ProjectController extends BaseAdminController
$item['business_director_name'] = $admin['name']; $item['business_director_name'] = $admin['name'];
return $item; return $item;
})->toArray(); })->toArray();
$count = Contract::field('id')->where('customer_id',$project['custom_id'])->count(); $count = Contract::field('id')->where('project_id',$project['id'])->count();
$result = [ $result = [
'count' => $count, 'count' => $count,
'page_no' => $pageNo, 'page_no' => $pageNo,