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-26 09:35:53 +08:00
parent 288e18be1f
commit bb40f767fe
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/adminapi/controller/CompanyController.php
View File

@ -140,16 +140,18 @@ class CompanyController extends BaseAdminController
} }
//判断是否是租赁合同 //判断是否是租赁合同
//如果是租赁合同则必须传递租赁数量参数 //如果是租赁合同则必须传递租赁数量参数
// if($params['contract_type'] == 29) { // if($params['contract_type'] == 29) {
// if(empty($params['num'])){ // if(empty($params['num'])){
// return $this->fail('缺少必要参数'); // return $this->fail('缺少必要参数');
// } // }
// } // }
$area_manager = Company::where('id', $params['party_a'])->value('area_manager');
$params['area_manager'] = $area_manager;
$params['type'] = 1; $params['type'] = 1;
$params['party_b'] = $params['id']; $params['party_b'] = $params['id'];
unset($params['id']); unset($params['id']);
$result = ContractLogic::initiate_contract($params); $result = ContractLogic::initiate_contract($params);
if ($result['code']==1) { if ($result['code'] == 1) {
return $this->success($result['msg'], $result['data']); return $this->success($result['msg'], $result['data']);
} }
return $this->fail(ContractLogic::getError()); return $this->fail(ContractLogic::getError());
@ -191,7 +193,7 @@ class CompanyController extends BaseAdminController
'business_license' => 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/561f8202305171526091317.png', //$qualification['business_license'], 'business_license' => 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/561f8202305171526091317.png', //$qualification['business_license'],
'master_name' => $company['master_name'], 'master_name' => $company['master_name'],
'master_email' => $company['master_email'], 'master_email' => $company['master_email'],
'id'=>$company['id'], 'id' => $company['id'],
]; ];
$res = app(JunziqianController::class)->EnterpriseCertification($data); $res = app(JunziqianController::class)->EnterpriseCertification($data);
if ($res->success == true) { if ($res->success == true) {

2
app/adminapi/lists/CompanyLists.php
View File

@ -110,7 +110,7 @@ class CompanyLists extends BaseAdminDataLists implements ListsSearchInterface
public function list_two(): array public function list_two(): array
{ {
return Company::where('company_type',30) return Company::where('company_type','in',[30,16])
->field(['is_authentication','id', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'deposit', 'deposit_time', 'qualification', 'status']) ->field(['is_authentication','id', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'deposit', 'deposit_time', 'qualification', 'status'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])