|
@@ -159,7 +159,7 @@ class ViolationProduct extends Controller
|
|
|
$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 . '00:00:00'):'0';
|
|
|
$all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59'):'0';
|
|
$all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59'):'0';
|
|
|
$allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp();// 明天的开始时间(允许开始采集时间校验)
|
|
$allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp();// 明天的开始时间(允许开始采集时间校验)
|
|
|
- if ($all_data['sampling_start_time'] !='' && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
|
|
|
|
|
|
|
+ if ($all_data['sampling_start_time'] && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
|
|
|
//查询是否存在
|
|
//查询是否存在
|
|
|
$map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
|
|
$map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
|
|
|
$data = $ViolationProductModel->where($map)->first();
|
|
$data = $ViolationProductModel->where($map)->first();
|
|
@@ -217,7 +217,7 @@ class ViolationProduct extends Controller
|
|
|
//如果修改采集周期,则校验采集时间是否在明天以后
|
|
//如果修改采集周期,则校验采集时间是否在明天以后
|
|
|
if ($sampling_cycle != $ViolationProduct->sampling_cycle) {
|
|
if ($sampling_cycle != $ViolationProduct->sampling_cycle) {
|
|
|
$allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp(); // 明天的开始时间(允许开始采集时间校验)
|
|
$allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp(); // 明天的开始时间(允许开始采集时间校验)
|
|
|
- if ($all_data['sampling_start_time'] !='0' && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
|
|
|
|
|
|
|
+ if ($all_data['sampling_start_time'] && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
|
|
|
}
|
|
}
|
|
|
$result = $ViolationProductModel->editViolationProduct_content($ViolationProduct, $all_data);
|
|
$result = $ViolationProductModel->editViolationProduct_content($ViolationProduct, $all_data);
|
|
|
// 如果操作失败
|
|
// 如果操作失败
|