|
|
|
@ -190,6 +190,11 @@ class PlanController extends Controller
|
|
|
|
}
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if($v->type==0){
|
|
|
|
|
|
|
|
$list[$k]->plan_type_name = '';
|
|
|
|
|
|
|
|
$list[$k]->plan_type_id = null;
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
foreach ($plan_model as $k1 => $v1) {
|
|
|
|
foreach ($plan_model as $k1 => $v1) {
|
|
|
|
if ($v1->model_id == $v->model_id and $v1->time == $v->time) {
|
|
|
|
if ($v1->model_id == $v->model_id and $v1->time == $v->time) {
|
|
|
|
$list[$k]->plan_type_name = $v1->plan_type_name;
|
|
|
|
$list[$k]->plan_type_name = $v1->plan_type_name;
|
|
|
|
|