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

修改pdf判断,修改显示

Browse Source
This commit is contained in:
mkm 2023-07-24 21:03:18 +08:00
parent 12ef9ee7d7
commit e863b42299
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/AccountLogController.php
View File

@ -76,6 +76,6 @@ class AccountLogController extends BaseApiController
unset($data[$k]); unset($data[$k]);
} }
} }
return $this->success('ok',$data); return $this->success('ok',array_reverse($data));
} }
} }

1
app/api/controller/CompanyController.php
View File

@ -27,6 +27,7 @@ class CompanyController extends BaseApiController
$companies = $query->page($page)->limit($limit)->select()->each(function ($company) { $companies = $query->page($page)->limit($limit)->select()->each(function ($company) {
$company['other_contacts'] = json_decode($company['other_contacts'], true); $company['other_contacts'] = json_decode($company['other_contacts'], true);
$company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : ''; $company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : '';
$company['company_type_name'] = Db::name('dict_data')->where('id', $company['company_type'])->value('name');
})->toArray(); })->toArray();
return $this->success('', ['count' => $count, 'data' => $companies]); return $this->success('', ['count' => $count, 'data' => $companies]);
} }

4
app/api/controller/JunziqianController.php
View File

@ -190,6 +190,10 @@ class JunziqianController extends BaseApiController
public function download_file($applyNo){ public function download_file($applyNo){
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
$find=Db::name('contract')->where('contract_no',$applyNo)->value('contract_url');
if($find){
return $this->success('获取成功', ['url' => 'https://worker-task.lihaink.cn'.$find]);
}
//初始化请求参数 //初始化请求参数
$request=array( $request=array(
"applyNo" => $applyNo, //TODO + "applyNo" => $applyNo, //TODO +