|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
use App\Http\Requests\Admin\BookStock as Request;
|
|
|
use App\Models\BookStock as Model;
|
|
|
-
|
|
|
+use Illuminate\Support\Carbon;
|
|
|
/**
|
|
|
* BookStock管理
|
|
|
*
|
|
@@ -26,12 +26,16 @@ class BookStock extends Auth{
|
|
|
$name = request('name','');
|
|
|
$batchNo = request('batch_no','');
|
|
|
$author = request('author','');
|
|
|
+ $startTime = request('start_time','');
|
|
|
+ $endTime = request('end_time','');
|
|
|
// 查询条件
|
|
|
$map = [];
|
|
|
// 编码ID
|
|
|
if( $name ) $map[] = ['name','=',$name];
|
|
|
if( $batchNo ) $map[] = ['id','=',$Model->codeToId($batchNo)];
|
|
|
if( $author ) $map[] = ['author','=',$author];
|
|
|
+ if( $startTime ) $map[] = ['insert_time','>=',Carbon::createFromFormat('Y-m-d',$startTime)->startOfDay()->getTimestamp()];
|
|
|
+ if( $endTime ) $map[] = ['insert_time','<=',Carbon::createFromFormat('Y-m-d',$endTime)->endOfDay()->getTimestamp()];
|
|
|
// 查询数据
|
|
|
$list = $Model->query()->where($map)->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
|
|
|
// 循环处理数据
|