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

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

Browse Source 
Reviewed-on: #24
This commit is contained in:
weiz 2023-12-12 17:47:14 +08:00
commit f7d7b6990d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/controller/custom/CustomerDemandController.php
View File

@ -122,9 +122,10 @@ class CustomerDemandController extends BaseAdminController
->select()->each(function($item){
$item['importance_text'] = $item->importance_text;
$item['recording_time'] = date('Y-m-d H:i:s',$item['recording_time']);
$project = Project::field('name,custom_id')->where('id',$item['project_id'])->findOrEmpty();
$project = Project::field('name,project_code,custom_id')->where('id',$item['project_id'])->findOrEmpty();
$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
$item['project_name'] = $project['name'];
$item['project_code'] = $project['project_code'];
$item['custom_name'] = $custom['name'];
return $item;
})->toArray();