|
@@ -219,23 +219,6 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
|
'remark' => $params['remark'] ?? '',
|
|
'remark' => $params['remark'] ?? '',
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
- $assetInfo = AssetInfo::find($params['a_id']);
|
|
|
|
|
- $updateAssetData['id'] = $params['a_id'];
|
|
|
|
|
- $updateFlag = false ;
|
|
|
|
|
- if($assetInfo['lease_status']==2){
|
|
|
|
|
- if(strtotime($params['lease_end_time']) > strtotime($assetInfo['lease_expiration_time'])){
|
|
|
|
|
- $updateAssetData['lease_expiration_time'] = $params['lease_end_time'];
|
|
|
|
|
- $updateFlag = true ;
|
|
|
|
|
- }
|
|
|
|
|
- }else{
|
|
|
|
|
- $updateAssetData['lease_expiration_time'] = $params['lease_end_time'];
|
|
|
|
|
- $updateAssetData['lease_status'] = 2;
|
|
|
|
|
- $updateFlag = true ;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if($updateFlag){
|
|
|
|
|
- AssetInfo::update($updateAssetData);
|
|
|
|
|
- }
|
|
|
|
|
return ['code' => 200, 'msg' => '新增租赁信息成功!'];
|
|
return ['code' => 200, 'msg' => '新增租赁信息成功!'];
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -390,6 +373,26 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
|
|
|
|
|
|
AssetLeaseInfo::update($updateData);
|
|
AssetLeaseInfo::update($updateData);
|
|
|
|
|
|
|
|
|
|
+ if($approval_status == 5){
|
|
|
|
|
+ $leaseAssetInfo = AssetLeaseInfo::find($id);
|
|
|
|
|
+ $assetInfo = AssetInfo::find($leaseAssetInfo['a_id']);
|
|
|
|
|
+ $updateAssetData['id'] = $assetInfo['id'];
|
|
|
|
|
+ $updateFlag = false ;
|
|
|
|
|
+ if($assetInfo['lease_status']==2){
|
|
|
|
|
+ if(strtotime($leaseAssetInfo['lease_end_time']) > strtotime($assetInfo['lease_expiration_time'])){
|
|
|
|
|
+ $updateAssetData['lease_expiration_time'] = $leaseAssetInfo['lease_end_time'];
|
|
|
|
|
+ $updateFlag = true ;
|
|
|
|
|
+ }
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $updateAssetData['lease_expiration_time'] = $leaseAssetInfo['lease_end_time'];
|
|
|
|
|
+ $updateAssetData['lease_status'] = 2;
|
|
|
|
|
+ $updateFlag = true ;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if($updateFlag){
|
|
|
|
|
+ AssetInfo::update($updateAssetData);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return true ;
|
|
return true ;
|
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
|
self::setError($e->getMessage());
|
|
self::setError($e->getMessage());
|