|
|
@@ -209,25 +209,18 @@ class SurveyController extends Controller {
|
|
|
}
|
|
|
|
|
|
$selects = ArrayHelper::toArray(Config::find()->where(['group' => 'industry','type' => 'select'])->all());
|
|
|
-
|
|
|
$list = [];
|
|
|
-
|
|
|
if($type == 'special'){
|
|
|
foreach ($survey as $key=>$value) {
|
|
|
$filter = explode(';',$value['filter']);//先判断第一层and关系
|
|
|
$is_match = [];
|
|
|
-
|
|
|
foreach ($filter as $key1 => $value1){
|
|
|
if(!empty($value1)){
|
|
|
if(strpos($value1,'|') !== false){//如果有存在判断大小
|
|
|
$filter2 = explode('|',$value1);
|
|
|
- if($value['id'] == 1144 && $filter2[0] == 'shebao'){
|
|
|
- var_dump($data , $filter2[2]);die;
|
|
|
- }
|
|
|
if(array_key_exists($filter2[0],$data) && !empty($data[$filter2[0]]) && $data[$filter2[0]] != '请选择'){
|
|
|
switch ($filter2[1]){
|
|
|
case '>=':
|
|
|
-
|
|
|
if($data[$filter2[0]] >= $filter2[2]){
|
|
|
$is_match[$key1] = true;
|
|
|
}else{
|
|
|
@@ -288,11 +281,10 @@ class SurveyController extends Controller {
|
|
|
$cengci = [];
|
|
|
$level = [];
|
|
|
foreach($list as $k => $v){
|
|
|
-
|
|
|
if(!in_array($v['level'],$level)){
|
|
|
$cengci[] = [
|
|
|
'id' => $v['id'],
|
|
|
- 'title' => $v['level'],
|
|
|
+ 'title' => $v['title'],
|
|
|
'content' => '',
|
|
|
'level' => $v['level'],
|
|
|
'policy' => []
|
sandm