Commit fefd72d6 authored by yinxiaoling's avatar yinxiaoling

呼叫设置验证修改#号分割,不能为空

parent 971f806f
...@@ -55,8 +55,10 @@ class StrategySetController extends Controller ...@@ -55,8 +55,10 @@ class StrategySetController extends Controller
return $this->errorWithInfo('表单验证失败', 401); return $this->errorWithInfo('表单验证失败', 401);
} }
$params = $request->all(); $params = $request->all();
if ($params['frequency_type'] == 2){ //一天两次时间、项目格式验证,#号分割 if ($params['day_type'] == 1 || $params['frequency_type'] == 2){ //日期前一天和当天,一天两次时间、项目格式验证,#号分割
if (substr_count($params['call_time_set'], '#') != 1 || substr_count($params['project_sn'], '#') != 1){ $checkCallTimeSet = explode("#", $params['call_time_set']);
$checkProjectSn = explode("#", $params['project_sn']);
if (!isset($checkCallTimeSet[1]) || empty($checkCallTimeSet[1]) || !isset($checkProjectSn[1]) || empty($checkProjectSn[1])){
return $this->errorWithInfo('呼叫设置验证失败', 401); return $this->errorWithInfo('呼叫设置验证失败', 401);
} }
} }
......
...@@ -243,9 +243,9 @@ class StrategyService ...@@ -243,9 +243,9 @@ class StrategyService
'import_date'=>$v->created_at, 'import_date'=>$v->created_at,
'parent_sn'=>$strategyInfo['parent_sn'], 'parent_sn'=>$strategyInfo['parent_sn'],
'call_number'=>$strategyInfo['call_number'], 'call_number'=>$strategyInfo['call_number'],
'project_sn'=>$project_sn[0],//$strategyInfo['project_sn'], 'project_sn'=>isset($project_sn[0]) ? $project_sn[0] : '',//$strategyInfo['project_sn'],
'call_date'=>$i, 'call_date'=>$i,
'call_time'=>$call_time[0],//$strategyInfo['call_time'], 'call_time'=>isset($call_time[0]) ? $call_time[0] : '',//$strategyInfo['call_time'],
'created_at'=>$now 'created_at'=>$now
]; ];
...@@ -271,9 +271,9 @@ class StrategyService ...@@ -271,9 +271,9 @@ class StrategyService
'import_date'=>$v->created_at, 'import_date'=>$v->created_at,
'parent_sn'=>$strategyInfo['parent_sn'], 'parent_sn'=>$strategyInfo['parent_sn'],
'call_number'=>$strategyInfo['call_number'], 'call_number'=>$strategyInfo['call_number'],
'project_sn'=>$project_sn[0], 'project_sn'=>isset($project_sn[0]) ? $project_sn[0] : '',
'call_date'=>$yesterday, 'call_date'=>$yesterday,
'call_time'=>$call_time[0], 'call_time'=>isset($call_time[0]) ? $call_time[0] : '',
'created_at'=>$now 'created_at'=>$now
]; ];
...@@ -285,9 +285,9 @@ class StrategyService ...@@ -285,9 +285,9 @@ class StrategyService
'import_date'=>$v->created_at, 'import_date'=>$v->created_at,
'parent_sn'=>$strategyInfo['parent_sn'], 'parent_sn'=>$strategyInfo['parent_sn'],
'call_number'=>$strategyInfo['call_number'], 'call_number'=>$strategyInfo['call_number'],
'project_sn'=>$project_sn[1], 'project_sn'=>isset($project_sn[1]) ? $project_sn[1] : '',
'call_date'=>$v['duty_date'], 'call_date'=>$v['duty_date'],
'call_time'=>$call_time[1], 'call_time'=>isset($call_time[1]) ? $call_time[1] : '',
'created_at'=>$now 'created_at'=>$now
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment