|
@@ -216,8 +216,9 @@ class WorkbenchLogic extends BaseLogic
|
|
|
array_multisort( $search_date); // 先按年龄排序,再按名字排
|
|
array_multisort( $search_date); // 先按年龄排序,再按名字排
|
|
|
foreach($search_date as $k=>$v){
|
|
foreach($search_date as $k=>$v){
|
|
|
$where = [];
|
|
$where = [];
|
|
|
|
|
+ $end_time = strtotime($v.' 23:59:59');
|
|
|
$where[] = ['lease_status','=',2];
|
|
$where[] = ['lease_status','=',2];
|
|
|
-// $where[] = ['lease_expiration_time','<',$v];
|
|
|
|
|
|
|
+ $where[] = ['create_time','<',$end_time];
|
|
|
$asset_number = AssetInfo::where($where)->count();
|
|
$asset_number = AssetInfo::where($where)->count();
|
|
|
$num[$k] = $asset_number;
|
|
$num[$k] = $asset_number;
|
|
|
}
|
|
}
|