From e863b42299aba268379cb7c06f8588aa050dc4af Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 24 Jul 2023 21:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pdf=E5=88=A4=E6=96=AD,?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/AccountLogController.php | 2 +-
app/api/controller/CompanyController.php | 1 +
app/api/controller/JunziqianController.php | 4 ++++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/api/controller/AccountLogController.php b/app/api/controller/AccountLogController.php
index 278cb3d87..2e08527ce 100755
--- a/app/api/controller/AccountLogController.php
+++ b/app/api/controller/AccountLogController.php
@@ -76,6 +76,6 @@ class AccountLogController extends BaseApiController
unset($data[$k]);
}
}
- return $this->success('ok',$data);
+ return $this->success('ok',array_reverse($data));
}
}
diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index d5b45f94c..a1bd20e9b 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -27,6 +27,7 @@ class CompanyController extends BaseApiController
$companies = $query->page($page)->limit($limit)->select()->each(function ($company) {
$company['other_contacts'] = json_decode($company['other_contacts'], 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();
return $this->success('', ['count' => $count, 'data' => $companies]);
}
diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index 59fefe1b6..5cd05adbd 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -190,6 +190,10 @@ class JunziqianController extends BaseApiController
public function download_file($applyNo){
$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(
"applyNo" => $applyNo, //TODO +