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

Merge branch 'dev' into chenbo_dev

Browse Source
This commit is contained in:
chenbo 2023-09-07 16:20:58 +08:00
commit 1959359a45
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/adminapi/controller/contract/VehicleContractController.php
View File

@ -44,8 +44,17 @@ class VehicleContractController extends BaseAdminController
'status' => 1,
'cars_info' => $params['cars']
]);
VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'cars_info' => $params['cars'],'status'=>1]);
}else{
//更新物流系统
curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
'id' => $vehicle_contract['contract_logistic_id'],
'file' => $params['file'],
'status' => 1,
]);
VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'status'=>1]);
}
VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'cars_info' => $params['cars'],'status'=>1]);
}catch (\Exception $e){
return $this->fail($e->getMessage());
}

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

@ -20,6 +20,7 @@ use app\common\model\task_scheduling\TaskScheduling;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\Company;
use think\db\Where;
/**
* 任务公司排期列表
@ -39,7 +40,7 @@ class TaskSchedulingLists extends BaseAdminDataLists implements ListsSearchInter
public function setSearch(): array
{
return [
'=' => ['create_user_id', 'company_id', 'company_type', 'status'],
'=' => ['company_type', 'status'],
];
}
@ -55,20 +56,24 @@ class TaskSchedulingLists extends BaseAdminDataLists implements ListsSearchInter
*/
public function lists(): array
{
if(isset($params['company_id']) && $params['company_id']!=''){
$arr= Company::where('company_name','like','%'.$params['company_id'].'%')->column('id');
if($arr){
$where[]=['party_a|party_b','in',$arr];
}
}
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];
}
}
$params = $this->request->param();
$where = [];
if (isset($params['company_id']) && $params['company_id'] != '') {
$arr = Company::where('company_name', 'like', '%' . $params['company_id'] . '%')->column('id');
if ($arr) {
$where[] = ['company_id', 'in', $arr];
}
}
if ($this->adminInfo['root'] != 1) {
$arr = Company::where('area_manager', $this->adminId)->column('id');
if ($arr) {
$where[] = ['company_id', 'in', $arr];
}
}
return TaskScheduling::where($this->searchWhere)
->with(['admin','company','company_type'])
->where($where)
->with(['admin', 'company', 'company_type'])
// ->field(['id', 'create_user_id', 'company_id', 'company_type', 'status'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
@ -87,5 +92,4 @@ class TaskSchedulingLists extends BaseAdminDataLists implements ListsSearchInter
{
return TaskScheduling::where($this->searchWhere)->count();
}
}
}