diff --git a/app/api/controller/Home/Home.php b/app/api/controller/Home/Home.php index 356bbaa..7bb13ac 100644 --- a/app/api/controller/Home/Home.php +++ b/app/api/controller/Home/Home.php @@ -5,6 +5,7 @@ namespace app\api\controller\Home; use app\BaseController; use app\common\model\Home\HomeEnv as ModelHomeEnv; use app\common\model\Home\HomeWorks as ModelHomeWorks; +use app\common\model\HonoraryAchievement\JointAchievement as ModelJointAchievement; use app\common\model\AboutUs\TeachingEnvir\TeachingEnvirType as ModelTeachingEnvirType; use app\common\model\ExaminationInformation\InfoArticle as ModelInfoArticle; use app\common\model\HonoraryAchievement\SchoolCategory as ModelSchoolCategory; @@ -32,9 +33,6 @@ class Home extends BaseController $params = $request->param(); $con = []; - // 获取资讯文章类型列表 - $teaching_envir_type = self::getTeachingEnvirTypeList(); - // 资讯文章列表 $info_article_list = self::getHomeInfoArticleList(); @@ -44,6 +42,12 @@ class Home extends BaseController // 录取院校列表 $school_category_list = self::getHomeSchoolCategoryList(); + // 联考成绩列表 + $joint_achievement = self::getJointAchievementList(); + + // 作品 + $works_list = self::getHomeWorksList(); + // 名师 $teacher_list = self::getHomeTeachersList(); @@ -52,10 +56,11 @@ class Home extends BaseController $query = [ - 'teaching_envir_type' => $teaching_envir_type, 'info_article_list' => $info_article_list, 'home_env_img_list' => $home_env_img_list, 'school_category_list' => $school_category_list, + 'joint_achievement' => $joint_achievement, + 'works_list' => $works_list, 'teacher_list' => $teacher_list, 'classes_list' => $classes_list, ]; @@ -66,20 +71,6 @@ class Home extends BaseController } - /** - * 获取资讯文章类型列表 - */ - public function getTeachingEnvirTypeList() - { - $select = ModelTeachingEnvirType::field(['teaching_envir_type_id', 'teaching_envir_type_name' => 'name']) - ->where('teaching_envir_type_parent_guid', "0") - ->order('teaching_envir_type_order') - ->select(); - - return $select; - } - - /** * 获取资讯文章列表 */ @@ -141,6 +132,26 @@ class Home extends BaseController return $query; } + + /** + * 获取联考成绩列表 + */ + public function getJointAchievementList() + { + $query = ModelJointAchievement::where() + ->field([ + 'joint_achievement_id', + 'joint_achievement_title', + 'joint_achievement_cover', + 'joint_achievement_sort', + ]) + ->where('joint_achievement_status', 2) + ->order('joint_achievement_sort', 'asc'); + + return $query; + } + + /** * 获取首页作品列表 */