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

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

Browse Source 
Reviewed-on: #108
This commit is contained in:
weiz 2024-01-03 13:40:00 +08:00
commit f8f6916b89
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/custom/CustomServiceLists.php
View File

@ -64,7 +64,7 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
$project_ids = Project::where('custom_id',$params['custom_id'])->column('id');
$where[] = ['project_id','in',$project_ids];
}
return CustomService::field('id,project_id,custom_id,contract_id,name,receiver,date,classification,processing_result,urgency,processed_user,is_solve,done_date,score')
return CustomService::field('id,project_id,contract_id,name,receiver,date,classification,processing_result,urgency,processed_user,is_solve,done_date,score')
->where($this->searchWhere)->where($where)->limit($this->limitOffset, $this->limitLength)->order(['id' => 'desc'])
->select()->each(function($item){
$item['classification'] = $item->classification_text;

2
app/adminapi/logic/custom/CustomServiceLogic.php
View File

@ -124,7 +124,7 @@ class CustomServiceLogic extends BaseLogic
*/
public static function detail($params): array
{
$field = 'id,org_id,dept_id,project_id,custom_id,contract_id,date,classification,urgency,receiver,processed_user,name,description,notes,annex,processing_result,processing_process,processing_hours,done_date,score,is_solve,feedback';
$field = 'id,org_id,dept_id,project_id,contract_id,date,classification,urgency,receiver,processed_user,name,description,notes,annex,processing_result,processing_process,processing_hours,done_date,score,is_solve,feedback';
$data = CustomService::field($field)->findOrEmpty($params['id']);
$org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty();
$dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty();