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

Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem

Browse Source
This commit is contained in:
mkm 2023-08-24 16:44:50 +08:00
commit cc7e7943e0
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,9 +139,9 @@ class CompanyController extends BaseAdminController
$params['party_a'] = $this->adminInfo['company_id']; $params['party_a'] = $this->adminInfo['company_id'];
} }
//判断是否是租赁合同 //判断是否是租赁合同
//如果是租赁合同则必须传递租赁数量、租赁开始时间、租赁结束时间三个参数 //如果是租赁合同则必须传递租赁数量参数
if($params['contract_type'] == 29) { if($params['contract_type'] == 29) {
if(empty($params['num']) || empty($params['start_time']) || empty($params['end_time'])){ if(empty($params['num'])){
return $this->fail('缺少必要参数'); return $this->fail('缺少必要参数');
} }
} }

2
app/common/logic/contract/ContractLogic.php
View File

@ -219,8 +219,6 @@ class ContractLogic extends BaseLogic
'party_a' => $data['party_a'], 'party_a' => $data['party_a'],
'party_b' => $data['party_b'], 'party_b' => $data['party_b'],
'num' => $data['num'], 'num' => $data['num'],
'start_time' => strtotime($data['start_time']),
'end_time' => strtotime($data['start_time']),
'rent_type' => 1 'rent_type' => 1
]); ]);
} }