|
|
@@ -185,7 +185,7 @@ class Product extends Controller
|
|
|
$sampling_start_time = request('sampling_start_time', '');
|
|
|
$sampling_end_time = request('sampling_end_time', '');
|
|
|
$all_data['sampling_cycle'] = $sampling_cycle;
|
|
|
- $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '00:00:00') : '0';
|
|
|
+ $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '23:59:59') : '0';
|
|
|
$all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59') : '0';
|
|
|
$all_data['minimum_order_quantity'] = $minimum_order_quantity;
|
|
|
if ($all_data['sampling_start_time'] && $all_data['sampling_start_time'] < time()) return json_send(['code' => 'error', 'msg' => '采集开始时间必须大于当前时间']);
|
|
|
@@ -242,7 +242,7 @@ class Product extends Controller
|
|
|
$sampling_start_time = request('sampling_start_time', '');
|
|
|
$sampling_end_time = request('sampling_end_time', '');
|
|
|
$all_data['sampling_cycle'] = $sampling_cycle;
|
|
|
- $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '00:00:00') : '0';
|
|
|
+ $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '23:59:59') : '0';
|
|
|
$all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59') : '0';
|
|
|
$all_data['minimum_order_quantity'] = $minimum_order_quantity;
|
|
|
if ($all_data['sampling_start_time'] && $all_data['sampling_start_time'] < time()) return json_send(['code' => 'error', 'msg' => '采集开始时间必须大于当前时间']);
|