|
|
@@ -106,9 +106,9 @@ class AssetServerService extends Service
|
|
|
if(empty($data['borrow_days'])) return [false, '租借天数不能为空'];
|
|
|
// if(empty($data['borrow_start_date']) || empty($data['borrow_start_date_lt'])) return [false, '借用开始不能为空'];
|
|
|
// if(empty($data['borrow_end_date']) || empty($data['borrow_end_date_lt'])) return [false, '借用结束不能为空'];
|
|
|
- list($borrow_start_date,$borrow_start_date_lt) = $this->getE8AndUTC();
|
|
|
+ list($borrow_start_date_lt,$borrow_start_date) = $this->getE8AndUTC();
|
|
|
$borrow_end_date = date("Y-m-d H:i:s", strtotime("+{$data['borrow_days']} days", strtotime($borrow_start_date)));
|
|
|
- list($borrow_end_date,$borrow_end_date_lt) = $this->getE8AndUTC($borrow_end_date);
|
|
|
+ list($borrow_end_date_lt,$borrow_end_date) = $this->getE8AndUTC($borrow_end_date);
|
|
|
if(empty($data['borrow_person']) || empty($data['borrow_person_show'])) return [false, '借用人不能为空'];
|
|
|
|
|
|
$url = config("asset.create_fixed_borrow");
|
|
|
@@ -175,7 +175,7 @@ class AssetServerService extends Service
|
|
|
if(empty($data['id'])) return [false, 'ID不能为空'];
|
|
|
if(empty($data['ssbm']) || empty($data['ssbm_show'])) return [false, '部门不能为空'];
|
|
|
if(empty($data['ssfb']) || empty($data['ssfb_show'])) return [false, '分部不能为空'];
|
|
|
- list($return_date,$return_date_lt) = $this->getE8AndUTC();
|
|
|
+ list($return_date_lt,$return_date) = $this->getE8AndUTC();
|
|
|
// if(empty($data['return_date']) || empty($data['return_date_lt'])) return [false, '归还开始不能为空'];
|
|
|
if(empty($data['return_person']) || empty($data['return_person_show'])) return [false, '归还人不能为空'];
|
|
|
|
cqpCow