file:新增首页是否展示

2023-05-05 11:22:19 +08:00 · 2023-05-05 11:22:19 +08:00 · d0a77d3cee
commit d0a77d3cee
parent 9a6fd702a1
11 changed files with 51 additions and 59 deletions
--- a/app/admin/controller/Enrol/Classes.php
+++ b/app/admin/controller/Enrol/Classes.php
@ -25,7 +25,7 @@ class Classes extends BaseController
        $params = $request->param();
        $con = [];

-        $con = Tool::getOptionalQuery(['classes_name', 'LIKE'],);
+        $con = Tool::getOptionalQuery(['classes_name', 'LIKE'],['classes_status', '='],);

        $query = ModelClasses::where($con)
            ->field([
@ -35,6 +35,7 @@ class Classes extends BaseController
                'classes_cover',
                'classes_desc',
                'classes_content',
+                'classes_status',
                'classes_sort'
            ])
            ->order('classes_sort', 'asc');
@ -59,6 +60,7 @@ class Classes extends BaseController
            'classes_name',
            'classes_cover',
            'classes_desc',
+            'classes_status',
            'classes_sort',
            'classes_content'
        ])->save($params);
@ -82,6 +84,7 @@ class Classes extends BaseController
            'classes_name',
            'classes_cover',
            'classes_desc',
+            'classes_status',
            'classes_sort',
            'classes_content'
        ]);
@ -110,14 +113,8 @@ class Classes extends BaseController
    public function exportExcel(Request $request)
    {
        $params = $request->param();
-        $select = ModelClasses::field([
-            'classes_name',
-            'classes_cover',
-            'classes_desc',
-            'classes_sort'
-        ])
-            ->order('classes_sort', 'asc')
-            ->select();
+        $params['limit'] = 10000;
+        $select = self::getClassesList($request)['data'];
        return ModelClasses::exportExcel($select);
    }

@ -127,10 +124,9 @@ class Classes extends BaseController
    public function downloadTemplate(Request $request)
    {
        $params = $request->param();
-        $data[] = array_values(ModelClasses::EXCELFIELD);
-        $data[] = ["冲刺班", "各大院校名师亲自指导", 1];
+        $data = array_values(ModelClasses::EXCELFIELD);
        $excel = (new Excel())->exporTsheet($data);
-        $excel->save('班型导入模板.xlsx');
+        $excel->save('资讯文章导入模板.xlsx');
    }

    /**
--- a/app/admin/controller/Enrol/EnrolAq.php
+++ b/app/admin/controller/Enrol/EnrolAq.php
@ -116,15 +116,8 @@ class EnrolAq extends BaseController
    public function exportExcel(Request $request)
    {
        $params = $request->param();
-        $select = ModelEnrolAq::field([
-            'enrol_aq_question',
-            'enrol_aq_answer',
-            'enrol_aq_sort',
-            'enrol_aq_status',
-            'enrol_aq_answer_status'
-        ])
-            ->order('enrol_aq_sort', 'asc')
-            ->select();
+        $params['limit'] = 10000;
+        $select = self::getEnrolAqList($request)['data'];
        return ModelEnrolAq::exportExcel($select);
    }
 }
--- a/app/admin/controller/ExaminationInformation/InfoArticle.php
+++ b/app/admin/controller/ExaminationInformation/InfoArticle.php
@ -25,7 +25,7 @@ class InfoArticle extends BaseController
        $params = $request->param();
        $con = [];

-        $con = Tool::getOptionalQuery(['info_article_title', 'LIKE'],['a.info_article_type_guid', '=']);
+        $con = Tool::getOptionalQuery(['info_article_title', 'LIKE'],['a.info_article_type_guid', '='], ['info_article_status', '='],);

        $query = ModelinfoArticle::where($con)
            ->field([
@ -36,7 +36,9 @@ class InfoArticle extends BaseController
                'a.info_article_title',
                'a.info_article_cover',
                'a.info_article_content',
-                'a.info_article_order'
+                'a.info_article_order',
+                'a.info_article_status',
+
            ])
            ->alias('a')
            ->leftjoin('info_article_type b','a.info_article_type_guid = b.info_article_type_guid')
@ -56,7 +58,7 @@ class InfoArticle extends BaseController
            'info_article_title|文章标题' => 'require',
            'info_article_cover|文章封面' => 'require',
            'info_article_content|文章内容' => 'require',
-            'info_article_order|文章排序' => 'require'
+            'info_article_order|文章排序' => 'require',
        ]);
        $model = ModelinfoArticle::where('info_article_guid', $params['info_article_guid'])->find();

@ -67,7 +69,8 @@ class InfoArticle extends BaseController
            'info_article_type_guid',
            'info_article_cover',
            'info_article_content',
-            'info_article_order'
+            'info_article_order',
+            'info_article_status',
        ])->save($params);
        return msg('编辑成功!');
    }
@ -94,7 +97,8 @@ class InfoArticle extends BaseController
            'info_article_title',
            'info_article_cover',
            'info_article_content',
-            'info_article_order'
+            'info_article_order',
+            'info_article_status',
        ]);
        return msg('添加成功!');
    }
@ -122,14 +126,8 @@ class InfoArticle extends BaseController
    public function exportExcel(Request $request)
    {
        $params = $request->param();
-        $select = ModelinfoArticle::field([
-            'info_article_title',
-            'info_article_cover',
-            'info_article_content',
-            'info_article_order'
-        ])
-            ->order('info_article_update_time', 'desc')
-            ->select();
+        $params['limit'] = 10000;
+        $select = self::getinfoArticleList($request)['data'];
        return ModelinfoArticle::exportExcel($select);
    }

--- a/app/admin/controller/HonoraryAchievement/JointAchievement.php
+++ b/app/admin/controller/HonoraryAchievement/JointAchievement.php
@ -25,7 +25,7 @@ class JointAchievement extends BaseController
        $params = $request->param();
        $con = [];

-        $con = Tool::getOptionalQuery(['joint_achievement_title', 'LIKE'],);
+        $con = Tool::getOptionalQuery(['joint_achievement_title', 'LIKE'],['joint_achievement_status', '='],);

        $query = ModelJointAchievement::where($con)
            ->field([
@ -34,6 +34,7 @@ class JointAchievement extends BaseController
                'joint_achievement_title',
                'joint_achievement_cover',
                'joint_achievement_sort',
+                'joint_achievement_status',
                'joint_achievement_content'
            ])
            ->order('joint_achievement_sort', 'asc');
@ -61,6 +62,7 @@ class JointAchievement extends BaseController
                'joint_achievement_title',
                'joint_achievement_cover',
                'joint_achievement_sort',
+                'joint_achievement_status',
                'joint_achievement_content'
            ])->save($params);
            Db::commit();
@ -91,6 +93,7 @@ class JointAchievement extends BaseController
                'joint_achievement_title',
                'joint_achievement_cover',
                'joint_achievement_sort',
+                'joint_achievement_status',
                'joint_achievement_content'
            ]);
            Db::commit();
@ -130,14 +133,8 @@ class JointAchievement extends BaseController
    public function exportExcel(Request $request)
    {
        $params = $request->param();
-        $select = ModelJointAchievement::field([
-            'joint_achievement_title',
-            'joint_achievement_cover',
-            'joint_achievement_sort',
-            'joint_achievement_content'
-        ])
-            ->order('joint_achievement_sort', 'asc')
-            ->select();
+        $params['limit'] = 10000;
+        $select = self::getJointAchievementList($request)['data'];
        return ModelJointAchievement::exportExcel($select);
    }
 }
--- a/app/admin/controller/HonoraryAchievement/SchoolCategory.php
+++ b/app/admin/controller/HonoraryAchievement/SchoolCategory.php
@ -25,7 +25,7 @@ class SchoolCategory extends BaseController
        $params = $request->param();
        $con = [];

-        $con = Tool::getOptionalQuery(['school_category_name', 'LIKE'],);
+        $con = Tool::getOptionalQuery(['school_category_name', 'LIKE'],['school_category_status', "="],);

        $query = ModelSchoolCategory::where($con)
            ->field([
@ -34,6 +34,7 @@ class SchoolCategory extends BaseController
                'school_category_title',
                'school_category_name',
                'school_category_img',
+                'school_category_status',
                'school_category_sort'
            ])
            ->order('school_category_sort', 'asc');
@ -60,6 +61,7 @@ class SchoolCategory extends BaseController
            'school_category_title',
            'school_category_name',
            'school_category_img',
+            'school_category_status',
            'school_category_sort'
        ])->save($params);
        return msg('编辑成功!');
@ -84,6 +86,7 @@ class SchoolCategory extends BaseController
            'school_category_title',
            'school_category_name',
            'school_category_img',
+            'school_category_status',
            'school_category_sort'
        ]);
        return msg('添加成功!');
@ -111,13 +114,8 @@ class SchoolCategory extends BaseController
    public function exportExcel(Request $request)
    {
        $params = $request->param();
-        $select = ModelSchoolCategory::field([
-            'school_category_title',
-            'school_category_name',
-            'school_category_img'
-        ])
-            ->order('school_category_sort', 'asc')
-            ->select();
+        $params['limit'] = 10000;
+        $select = self::getSchoolCategoryList($request)['data'];
        return ModelSchoolCategory::exportExcel($select);
-    }
 }
+}
--- a/app/admin/controller/TeachersStrength/Teacher.php
+++ b/app/admin/controller/TeachersStrength/Teacher.php
@ -25,7 +25,7 @@ class Teacher extends BaseController
        $params = $request->param();
        $con = [];

-        $con = Tool::getOptionalQuery(['teacher_name', 'LIKE'], ['teacher_position', 'LIKE'], ['a.subject_guid', '='],);
+        $con = Tool::getOptionalQuery(['teacher_name', 'LIKE'], ['teacher_position', 'LIKE'], ['a.subject_guid', '='], ['a.teacher_status', '='],);

        $query = ModelTeacher::where($con)
            ->field([
@ -37,6 +37,7 @@ class Teacher extends BaseController
                'a.subject_guid',
                'b.subject_name',
                'a.teacher_intro',
+                'a.teacher_status',
                'a.teacher_order'
            ])
            ->alias('a')
@ -71,6 +72,7 @@ class Teacher extends BaseController
                'teacher_img',
                'subject_guid',
                'teacher_intro',
+                'teacher_status',
                'teacher_order'
            ])->save($params);
            Db::commit();
@ -106,6 +108,7 @@ class Teacher extends BaseController
                'teacher_img',
                'subject_guid',
                'teacher_intro',
+                'teacher_status',
                'teacher_order'
            ]);
            Db::commit();
@ -155,12 +158,9 @@ class Teacher extends BaseController
    public function downloadTemplate(Request $request)
    {
        $params = $request->param();
-        $data = [
-            array_values(ModelTeacher::EXCELFIELD),
-            ['管理组', '黎老师', '执行董事', '毕业于西南交大建筑与设计学院 高考美术教育13年', "1"]
-        ];
+        $data = array_values(ModelTeacher::EXCELFIELD);
        $excel = (new Excel())->exporTsheet($data);
-        $excel->save('教师导入模板.xlsx');
+        $excel->save('资讯文章导入模板.xlsx');
    }

    /**
@ -169,7 +169,7 @@ class Teacher extends BaseController
    public function importExcel(Request $request)
    {
        $file = new UploadFile('uploads', 'fileExt:xlsx');
-        $file->putFile('teacher');
+        $file->putFile('info_article');

        $msg = ModelTeacher::importExcel($file);
        return [
--- a/app/common/model/Enrol/Classes.php
+++ b/app/common/model/Enrol/Classes.php
@ -34,6 +34,8 @@ class Classes extends BaseModel

        "classes_content" => "string",

+        "classes_status" => "int",
+
        "classes_sort" => "int",

        "classes_create_time" => "datetime",
--- a/app/common/model/ExaminationInformation/InfoArticle.php
+++ b/app/common/model/ExaminationInformation/InfoArticle.php
@ -34,6 +34,8 @@ class InfoArticle extends BaseModel

        "info_article_content" => "string",

+        "info_article_status" => "int",
+
        "info_article_order" => "int",

        "info_article_create_time" => "datetime",
--- a/app/common/model/HonoraryAchievement/JointAchievement.php
+++ b/app/common/model/HonoraryAchievement/JointAchievement.php
@ -30,6 +30,8 @@ class JointAchievement extends BaseModel

        "joint_achievement_cover" => "string",

+        "joint_achievement_status" => "int",
+
        "joint_achievement_sort" => "int",

        "joint_achievement_content" => "string",
--- a/app/common/model/HonoraryAchievement/SchoolCategory.php
+++ b/app/common/model/HonoraryAchievement/SchoolCategory.php
@ -33,6 +33,8 @@ class SchoolCategory extends BaseModel

        "school_category_img" => "string",

+        "school_category_status" => "int",
+
        "school_category_sort" => "int",

        "school_category_create_time" => "datetime",
--- a/app/common/model/TeachersStrength/Teacher.php
+++ b/app/common/model/TeachersStrength/Teacher.php
@ -37,6 +37,8 @@ class Teacher extends BaseModel
        "subject_guid" => "string",

        "teacher_intro" => "string",
+           
+        "teacher_status" => "int",

        "teacher_order" => "int",