1

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -60,6 +60,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
 
         $parms =  $this->request->get();
         $where = [] ;
+        $flag = false;
         if(!empty($parms))
         {
             if(isset($parms['name'])) {
@@ -92,6 +93,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
                 $today = date('Y-m-d');
                 $expiration_date = date('Y-m-d', strtotime($today . ' +30 day'));
                 if ($parms['expiration_flag']) {
+                    $flag = true;
                     $where[] = ['lease_end_time', '<=', $expiration_date];
                     $where[] = ['approval_status','=','5'];
                 }
@@ -147,6 +149,14 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
         foreach($lists as &$v){
             $v['first_name'] = adminModel::where(['id'=>$v['first_uid']])->value('name') ?? '';
             $v['second_name'] = adminModel::where(['id'=>$v['second_uid']])->value('name') ?? '' ;
+            if($flag){
+                $startTime = strtotime(date('Y-m-d'));
+                $endTime = strtotime($v['lease_end_time']);
+
+                $diff = $startTime-$endTime;
+                $day = $diff/86400;
+                $v['diff_day'] = $day;
+            }
         }
 
         return $lists;

app/adminapi/logic/WorkbenchLogic.php

@@ -19,6 +19,7 @@ use app\common\logic\BaseLogic;
 use app\common\service\ConfigService;
 use app\common\service\FileService;
 use app\common\model\asset\AssetInfo;
+use app\common\model\asset\AssetLeaseInfo;
 use function Qiniu\arraySort;
 
 
@@ -219,7 +220,7 @@ class WorkbenchLogic extends BaseLogic
             $end_time = strtotime($v.' 23:59:59');
             $where[] = ['lease_status','=',2];
             $where[] = ['create_time','<',$end_time];
-            $asset_number = AssetInfo::where($where)->count();
+            $asset_number = AssetLeaseInfo::where($where)->count();
             $num[$k] = $asset_number;
         }
         return [