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

更新

Browse Source
This commit is contained in:
mkm 2023-08-12 11:12:32 +08:00
parent 99e9ed7e8b
commit 6b20b68f9d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/adminapi/lists/task_scheduling/TaskSchedulingLists.php
View File

@ -61,14 +61,14 @@ class TaskSchedulingLists extends BaseAdminDataLists implements ListsSearchInter
$where[]=['party_a|party_b','in',$arr];
}
}
if(isset($params['area_manager']) && $params['area_manager']!=''){
$arr= Admin::where('name','like','%'.$params['area_manager'].'%')->column('id');
if(isset($params['create_user_id']) && $params['create_user_id']!=''){
$arr= Admin::where('name','like','%'.$params['create_user_id'].'%')->column('id');
if($arr){
$where[]=['area_manager','in',$arr];
}
}
return TaskScheduling::where($this->searchWhere)
->with(['admin','company','company_type_name'])
->with(['admin','company','company_type'])
->field(['id', 'create_user_id', 'template_id', 'company_id', 'company_type', 'status'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])

2
app/common/model/Company.php
View File

@ -60,7 +60,7 @@ class Company extends BaseModel
public function getContractAttr()
{
$find=Contract::where('party_a', $this->id)->field('check_status,status')->find();
$find=Contract::where('party_a|party_b', $this->id)->field('check_status,status')->find();
if($find){
return $find->toArray();
}else{

4
app/common/model/task_scheduling/TaskScheduling.php
View File

@ -37,9 +37,9 @@ class TaskScheduling extends BaseModel
{
return $this->hasOne(Admin::class, 'id', 'create_user_id')->bind(['admin_name'=>'name']);
}
public function companyTypeName()
public function companyType()
{
return $this->hasOne(DictData::class, 'id', 'company_type')->bind(['company_type'=>'name']);
return $this->hasOne(DictData::class, 'id', 'company_type')->bind(['company_type_name'=>'name']);
}
public function template()
{