php/houde_web_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改排序

Browse Source
This commit is contained in:
lwh 2023-05-12 21:35:27 +08:00
parent 983d47462d
commit 27d49f9abb
25 changed files with 411 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/controller/AboutUs/CompanyProfile.php
View File

@ -64,7 +64,6 @@ class CompanyProfile extends BaseController
$this->validate($params, [
'company_profile_img|简介图片' => 'require',
'company_profile_content|简介内容' => 'require',
'company_profile_order|简介排序' => 'require'
]);
ModelCompanyProfile::create($params, [
'company_profile_guid',
@ -103,7 +102,6 @@ class CompanyProfile extends BaseController
$this->validate($params, [
'company_profile_img|简介图片' => 'require',
'company_profile_content|简介内容' => 'require',
'company_profile_order|简介排序' => 'require'
]);
$model = ModelCompanyProfile::where('company_profile_guid', $params['company_profile_guid'])->find();
if (!$model) throwErrorMsg("该公司简介不存在", 1);

4
app/admin/controller/AboutUs/TeachingEnvir/TeachingEnvirType.php
View File

@ -86,12 +86,11 @@ class TeachingEnvirType extends BaseController
public function addTeachingEnvirType(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('teaching_envir_type');
// Tool::adminLockTableWrite('teaching_envir_type');
try {
$params = $request->param();
$this->validate($params, [
'teaching_envir_type_name|环境类型名称' => 'require',
'teaching_envir_type_order|环境类型排序' => 'require',
'teaching_envir_type_parent_guid|作品类型父级guid' => 'require',
]);
ModelTeachingEnvirType::create($params, [
@ -130,7 +129,6 @@ class TeachingEnvirType extends BaseController
$params = $request->param();
$this->validate($params, [
'teaching_envir_type_name|环境类型名称' => 'require',
'teaching_envir_type_order|环境类型排序' => 'require',
'teaching_envir_type_parent_guid|作品类型父级guid' => 'require',
]);
$model = ModelTeachingEnvirType::where('teaching_envir_type_guid', $params['teaching_envir_type_guid'])->find();

3
app/admin/controller/Banner/Banner.php
View File

@ -48,7 +48,7 @@ class Banner extends BaseController
$params = $request->param();
$this->validate($params, [
'banner_img|轮播图图片' => 'require',
'banner_order|排序' => 'require'
// 'banner_order
]);
ModelBanner::create($params, [
'banner_guid',
@ -78,7 +78,6 @@ class Banner extends BaseController
$params = $request->param();
$this->validate($params, [
'banner_img|轮播图图片' => 'require',
'banner_order|排序' => 'require'
]);
$model = ModelBanner::where('banner_guid', $params['banner_guid'])->find();
if (!$model) throwErrorMsg("该轮播图不存在", 1);

24
app/admin/controller/Enrol/Classes.php
View File

@ -20,7 +20,7 @@ class Classes extends BaseController
/**
* 获取班型列表
*/
public function getClassesList(Request $request): array
public function getClassesList(Request $request, $isExport = false): array
{
$params = $request->param();
$con = [];
@ -40,7 +40,7 @@ class Classes extends BaseController
])
->order('classes_sort', 'asc');
return msg("获取班型列表成功!", $query);
return $isExport ? $query->select()->toArray() : msg("获取班型列表成功!", $query);
}
/**
@ -54,7 +54,6 @@ class Classes extends BaseController
$params = $request->param();
$this->validate($params, [
'classes_name|名称' => 'require',
'classes_sort|排序' => 'require'
]);
$model = ModelClasses::create($params, [
'classes_guid',
@ -88,7 +87,6 @@ class Classes extends BaseController
$params = $request->param();
$this->validate($params, [
'classes_name|名称' => 'require',
'classes_sort|排序' => 'require'
]);
$model = ModelClasses::where('classes_guid', $params['classes_guid'])->find();
if (!$model) throwErrorMsg("该班型不存在", 1);
@ -142,10 +140,7 @@ class Classes extends BaseController
*/
public function exportExcel(Request $request)
{
$params = $request->param();
$params['limit'] = 10000;
$select = self::getClassesList($request)['data'];
return ModelClasses::exportExcel($select);
ModelClasses::exportExcel(self::getClassesList($request, true));
}
/**
@ -153,10 +148,17 @@ class Classes extends BaseController
*/
public function downloadTemplate(Request $request)
{
$params = $request->param();
$data = array_values(ModelClasses::EXCELFIELD);
$data = [
array_values(ModelClasses::EXCELFIELD),
[
'冲刺班',
'冲刺央清国等高等院校',
'1',
"展示",
]
];
$excel = (new Excel())->exporTsheet($data);
$excel->save('资讯文章导入模板.xlsx');
$excel->save('班型导入模板.xlsx');
}
/**

2
app/admin/controller/Enrol/EnterSchoolProcess.php
View File

@ -52,7 +52,6 @@ class EnterSchoolProcess extends BaseController
$this->validate($params, [
'enter_school_process_title|标题' => 'require',
'enter_school_process_intro|介绍' => 'require',
'enter_school_process_sort|排序' => 'require'
]);
$model = ModelEnterSchoolProcess::create($params, [
'enter_school_process_guid',
@ -85,7 +84,6 @@ class EnterSchoolProcess extends BaseController
$this->validate($params, [
'enter_school_process_title|标题' => 'require',
'enter_school_process_intro|介绍' => 'require',
'enter_school_process_sort|排序' => 'require'
]);
$model = ModelEnterSchoolProcess::where('enter_school_process_guid', $params['enter_school_process_guid'])->find();
if (!$model) throwErrorMsg("该入学流程不存在", 1);

2
app/admin/controller/Enrol/SignUpProcess.php
View File

@ -54,7 +54,6 @@ class SignUpProcess extends BaseController
'sign_up_process_title|标题' => 'require',
'sign_up_process_icon|图标' => 'require',
'sign_up_process_intro|介绍' => 'require',
'sign_up_process_sort|排序' => 'require'
]);
$model = ModelSignUpProcess::create($params, [
'sign_up_process_guid',
@ -88,7 +87,6 @@ class SignUpProcess extends BaseController
'sign_up_process_title|标题' => 'require',
'sign_up_process_icon|图标' => 'require',
'sign_up_process_intro|介绍' => 'require',
'sign_up_process_sort|排序' => 'require'
]);
$model = ModelSignUpProcess::where('sign_up_process_guid', $params['sign_up_process_guid'])->find();
if (!$model) throwErrorMsg("该报名流程不存在", 1);

3
app/admin/controller/Home/HomeEnv.php
View File

@ -48,9 +48,9 @@ class HomeEnv extends BaseController
Tool::adminLockTableWrite('home_env');
try {
$params = $request->param();
if (!$params) throwErrorMsg("请上传参数！");
$this->validate($params, [
// 'home_env_img|图片' => 'require',
'home_env_sort|排序' => 'require'
]);
$model = ModelHomeEnv::create($params, [
'home_env_guid',
@ -81,7 +81,6 @@ class HomeEnv extends BaseController
$params = $request->param();
$this->validate($params, [
// 'home_env_img|图片' => 'require',
'home_env_sort|排序' => 'require'
]);
$model = ModelHomeEnv::where('home_env_guid', $params['home_env_guid'])->find();
if (!$model) throwErrorMsg("该首页环境不存在", 1);

2
app/admin/controller/Home/HomeWorks.php
View File

@ -53,7 +53,6 @@ class HomeWorks extends BaseController
$this->validate($params, [
'home_works_author_type|作者类型' => 'require',
'home_works_img|图片' => 'require',
'home_works_sort|排序' => 'require',
]);
$model = ModelHomeWorks::create($params, [
'home_works_guid',
@ -86,7 +85,6 @@ class HomeWorks extends BaseController
$this->validate($params, [
'home_works_author_type|作者类型' => 'require',
'home_works_img|图片' => 'require',
'home_works_sort|排序' => 'require',
]);
$model = ModelHomeWorks::where('home_works_guid', $params['home_works_guid'])->find();
if (!$model) throwErrorMsg("该首页作品不存在", 1);

34
app/admin/controller/HonoraryAchievement/Achievement.php
View File

@ -20,7 +20,7 @@ class Achievement extends BaseController
/**
* 获取录取院校成绩列表
*/
public function getAchievementList(Request $request): array
public function getAchievementList(Request $request, $isExport = false): array
{
$params = $request->param();
$con = [];
@ -46,7 +46,7 @@ class Achievement extends BaseController
->leftjoin('school_category b', 'a.school_category_guid = b.school_category_guid')
->order('achievement_sort', 'asc');
return msg("获取录取院校成绩列表成功!", $query);
return $isExport ? $query->select()->toArray() : msg("获取录取院校成绩列表成功!", $query);
}
/**
@ -55,6 +55,7 @@ class Achievement extends BaseController
public function editAchievement(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('achievement');
try {
$params = $request->param();
$this->validate($params, [
@ -62,7 +63,6 @@ class Achievement extends BaseController
'achievement_title|标题' => 'require',
'achievement_content|内容' => 'require',
'achievement_sub_content|副内容' => 'require',
'achievement_sort|排序' => 'require'
]);
$model = ModelAchievement::where('achievement_guid', $params['achievement_guid'])->find();
if (!$model) throwErrorMsg("该录取院校成绩不存在", 1);
@ -75,8 +75,10 @@ class Achievement extends BaseController
'achievement_sort'
])->save($params);
Db::commit();
Tool::unlockTable();
return msg('编辑成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -88,6 +90,7 @@ class Achievement extends BaseController
public function addAchievement(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('achievement');
try {
$params = $request->param();
$this->validate($params, [
@ -95,7 +98,6 @@ class Achievement extends BaseController
'achievement_title|标题' => 'require',
'achievement_content|内容' => 'require',
'achievement_sub_content|副内容' => 'require',
'achievement_sort|排序' => 'require'
]);
$model = ModelAchievement::create($params, [
'achievement_guid',
@ -108,8 +110,10 @@ class Achievement extends BaseController
'achievement_sort'
]);
Db::commit();
Tool::unlockTable();
return msg('添加成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -121,6 +125,7 @@ class Achievement extends BaseController
public function deleteAchievement(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('achievement');
try {
$params = $request->param();
$this->validate($params, [
@ -131,8 +136,10 @@ class Achievement extends BaseController
])->select();
$achievement->delete();
Db::commit();
Tool::unlockTable();
return msg('删除成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -143,13 +150,7 @@ class Achievement extends BaseController
*/
public function exportExcel(Request $request)
{
$params = $request->param();
$params['limit'] = 10000;
// if (isset($params['signup_guids']) && $params['signup_guids']) {
// $con['signup.signup_guid'] = explode(',', $params['signup_guids']);
// }
$select = self::getAchievementList($request)['data'];
return ModelAchievement::exportExcel($select);
ModelAchievement::exportExcel(self::getAchievementList($request, true));
}
/**
@ -171,13 +172,24 @@ class Achievement extends BaseController
*/
public function importExcel(Request $request)
{
Db::startTrans();
Tool::adminLockTableWrite('teacher');
try {
$file = new UploadFile('uploads', 'fileExt:xlsx');
$file->putFile('achievement');
$msg = ModelAchievement::importExcel($file);
Db::commit();
Tool::unlockTable();
return [
'code' => 0,
'msg' => $msg
];
} catch (\Throwable $th) {
Db::rollback();
Tool::unlockTable();
throw $th;
}
}
}

22
app/admin/controller/HonoraryAchievement/JointAchievement.php
View File

@ -20,12 +20,12 @@ class JointAchievement extends BaseController
/**
* 获取联考成绩列表
*/
public function getJointAchievementList(Request $request): array
public function getJointAchievementList(Request $request, $isExport = false): array
{
$params = $request->param();
$con = [];
$con = Tool::getOptionalQuery(['joint_achievement_title', 'LIKE'],['joint_achievement_status', '='],);
$con = Tool::getOptionalQuery(['joint_achievement_title', 'LIKE'], ['joint_achievement_status', '='],);
$query = ModelJointAchievement::where($con)
->field([
@ -39,7 +39,7 @@ class JointAchievement extends BaseController
])
->order('joint_achievement_sort', 'asc');
return msg("获取联考成绩列表成功!", $query);
return $isExport ? $query->select()->toArray() : msg("获取联考成绩列表成功!", $query);
}
/**
@ -48,12 +48,12 @@ class JointAchievement extends BaseController
public function editJointAchievement(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('joint_achievement');
try {
$params = $request->param();
$this->validate($params, [
'joint_achievement_title|标题' => 'require',
'joint_achievement_cover|封面' => 'require',
'joint_achievement_sort|排序' => 'require'
]);
$model = ModelJointAchievement::where('joint_achievement_guid', $params['joint_achievement_guid'])->find();
if (!$model) throwErrorMsg("该联考成绩不存在", 1);
@ -66,8 +66,10 @@ class JointAchievement extends BaseController
'joint_achievement_content'
])->save($params);
Db::commit();
Tool::unlockTable();
return msg('编辑成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -79,12 +81,12 @@ class JointAchievement extends BaseController
public function addJointAchievement(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('joint_achievement');
try {
$params = $request->param();
$this->validate($params, [
'joint_achievement_title|标题' => 'require',
'joint_achievement_cover|封面' => 'require',
'joint_achievement_sort|排序' => 'require'
]);
$model = ModelJointAchievement::create($params, [
'joint_achievement_guid',
@ -97,8 +99,10 @@ class JointAchievement extends BaseController
'joint_achievement_content'
]);
Db::commit();
Tool::unlockTable();
return msg('添加成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -110,6 +114,7 @@ class JointAchievement extends BaseController
public function deleteJointAchievement(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('joint_achievement');
try {
$params = $request->param();
$this->validate($params, [
@ -120,8 +125,10 @@ class JointAchievement extends BaseController
])->select();
$joint_achievement->delete();
Db::commit();
Tool::unlockTable();
return msg('删除成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -132,9 +139,6 @@ class JointAchievement extends BaseController
*/
public function exportExcel(Request $request)
{
$params = $request->param();
$params['limit'] = 10000;
$select = self::getJointAchievementList($request)['data'];
return ModelJointAchievement::exportExcel($select);
ModelJointAchievement::exportExcel(self::getJointAchievementList($request, true));
}
}

32
app/admin/controller/HonoraryAchievement/SchoolCategory.php
View File

@ -49,12 +49,14 @@ class SchoolCategory extends BaseController
*/
public function editSchoolCategory(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('school_category');
try {
$params = $request->param();
$this->validate($params, [
'school_category_title|标题' => 'require',
'school_category_name|名称' => 'require',
'school_category_img|图片' => 'require',
'school_category_sort|排序' => 'require'
]);
$model = ModelSchoolCategory::where('school_category_guid', $params['school_category_guid'])->find();
if (!$model) throwErrorMsg("该录取院校分类不存在", 1);
@ -68,7 +70,14 @@ class SchoolCategory extends BaseController
'school_category_status',
'school_category_sort'
])->save($params);
Db::commit();
Tool::unlockTable();
return msg('编辑成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
}
/**
@ -76,12 +85,14 @@ class SchoolCategory extends BaseController
*/
public function addSchoolCategory(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('school_category');
try {
$params = $request->param();
$this->validate($params, [
'school_category_title|标题' => 'require',
'school_category_name|名称' => 'require',
'school_category_img|图片' => 'require',
'school_category_sort|排序' => 'require'
]);
$model = ModelSchoolCategory::create($params, [
'school_category_guid',
@ -95,7 +106,14 @@ class SchoolCategory extends BaseController
'school_category_status',
'school_category_sort'
]);
Db::commit();
Tool::unlockTable();
return msg('添加成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
}
/**
@ -103,6 +121,9 @@ class SchoolCategory extends BaseController
*/
public function deleteSchoolCategory(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('school_category');
try {
$params = $request->param();
$this->validate($params, [
'school_category_guid' => 'require',
@ -111,7 +132,14 @@ class SchoolCategory extends BaseController
'school_category_guid' => explode(',', $params['school_category_guid'])
])->select();
$school_category->delete();
Db::commit();
Tool::unlockTable();
return msg('删除成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
}
/**

21
app/admin/controller/HonoraryAchievement/SchoolLeaders.php
View File

@ -20,7 +20,7 @@ class SchoolLeaders extends BaseController
/**
* 获取录取学院领军者列表
*/
public function getSchoolLeadersList(Request $request): array
public function getSchoolLeadersList(Request $request, $isExport = false): array
{
$params = $request->param();
$con = [];
@ -42,7 +42,7 @@ class SchoolLeaders extends BaseController
->leftjoin('school_category b', 'a.school_category_guid = b.school_category_guid')
->order('school_leaders_sort', 'asc');
return msg("获取录取学院领军者列表成功!", $query);
return $isExport ? $query->select()->toArray() : msg("获取录取学院领军者列表成功!", $query);
}
/**
@ -51,6 +51,7 @@ class SchoolLeaders extends BaseController
public function editSchoolLeaders(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('school_leaders');
try {
$params = $request->param();
$this->validate($params, [
@ -70,8 +71,10 @@ class SchoolLeaders extends BaseController
'school_leaders_sort'
])->save($params);
Db::commit();
Tool::unlockTable();
return msg('编辑成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -83,6 +86,7 @@ class SchoolLeaders extends BaseController
public function addSchoolLeaders(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('school_leaders');
try {
$params = $request->param();
$this->validate($params, [
@ -102,8 +106,10 @@ class SchoolLeaders extends BaseController
'school_leaders_sort'
]);
Db::commit();
Tool::unlockTable();
return msg('添加成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -115,6 +121,7 @@ class SchoolLeaders extends BaseController
public function deleteSchoolLeaders(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('school_leaders');
try {
$params = $request->param();
$this->validate($params, [
@ -125,8 +132,10 @@ class SchoolLeaders extends BaseController
])->select();
$school_leaders->delete();
Db::commit();
Tool::unlockTable();
return msg('删除成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -137,13 +146,7 @@ class SchoolLeaders extends BaseController
*/
public function exportExcel(Request $request)
{
$params = $request->param();
$params['limit'] = 10000;
// if (isset($params['signup_guids']) && $params['signup_guids']) {
// $con['signup.signup_guid'] = explode(',', $params['signup_guids']);
// }
$select = self::getSchoolLeadersList($request)['data'];
return ModelSchoolLeaders::exportExcel($select);
ModelSchoolLeaders::exportExcel(self::getSchoolLeadersList($request, true));
}
/**

33
app/admin/controller/Poster/Poster.php
View File

@ -45,13 +45,15 @@ class Poster extends BaseController
*/
public function editPoster(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('poster');
try {
$params = $request->param();
$this->validate($params, [
'poster_location|位置' => 'require',
'poster_img|图片' => 'require',
'poster_title|标题' => 'require',
'poster_describe|描述' => 'require',
'poster_sort|排序' => 'require'
]);
$model = ModelPoster::where('poster_guid', $params['poster_guid'])->find();
if (!$model) throwErrorMsg("该海报不存在", 1);
@ -63,7 +65,14 @@ class Poster extends BaseController
'poster_describe',
'poster_sort'
])->save($params);
Db::commit();
Tool::unlockTable();
return msg('编辑成功!');
} catch (\Throwable $th) {
Db::rollback();
Tool::unlockTable();
throw $th;
}
}
/**
@ -71,13 +80,15 @@ class Poster extends BaseController
*/
public function addPoster(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('poster');
try {
$params = $request->param();
$this->validate($params, [
'poster_location|位置' => 'require',
'poster_img|图片' => 'require',
'poster_title|标题' => 'require',
'poster_describe|描述' => 'require',
'poster_sort|排序' => 'require'
]);
$model = ModelPoster::create($params, [
'poster_guid',
@ -89,7 +100,14 @@ class Poster extends BaseController
'poster_describe',
'poster_sort'
]);
Db::commit();
Tool::unlockTable();
return msg('添加成功!');
} catch (\Throwable $th) {
Db::rollback();
Tool::unlockTable();
throw $th;
}
}
/**
@ -97,6 +115,9 @@ class Poster extends BaseController
*/
public function deletePoster(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('poster');
try {
$params = $request->param();
$this->validate($params, [
'poster_guid' => 'require',
@ -105,6 +126,14 @@ class Poster extends BaseController
'poster_guid' => explode(',', $params['poster_guid'])
])->select();
$poster->delete();
Db::commit();
Tool::unlockTable();
return msg('删除成功!');
} catch (\Throwable $th) {
Db::rollback();
Tool::unlockTable();
throw $th;
}
}
}

31
app/admin/controller/TeachersStrength/Subject.php
View File

@ -45,11 +45,11 @@ class Subject extends BaseController
public function editSubject(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('subject');
try {
$params = $request->param();
$this->validate($params, [
'subject_name|科目名字' => 'require',
'subject_sort|排序' => 'require'
]);
$model = ModelSubject::where('subject_guid', $params['subject_guid'])->find();
if (!$model) throwErrorMsg("该授课科目不存在", 1);
@ -59,12 +59,14 @@ class Subject extends BaseController
'subject_sort'
])->save($params);
Db::commit();
Tool::unlockTable();
return msg('编辑成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
}
}
/**
* 添加授课科目
@ -72,11 +74,11 @@ class Subject extends BaseController
public function addSubject(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('subject');
try {
$params = $request->param();
$this->validate($params, [
'subject_name|科目名字' => 'require',
'subject_sort|排序' => 'require'
]);
$model = ModelSubject::create($params, [
'subject_guid',
@ -86,18 +88,21 @@ class Subject extends BaseController
'subject_sort'
]);
Db::commit();
return msg('编辑成功!');
Tool::unlockTable();
return msg('添加成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
}
}
/**
* 删除授课科目
*/
public function deleteSubject(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('subject');
try {
$params = $request->param();
$this->validate($params, [
@ -108,12 +113,14 @@ class Subject extends BaseController
])->select();
$subject->delete();
Db::commit();
return msg('编辑成功!');
Tool::unlockTable();
return msg('删除成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
}
}
/**
* 导出Excel
*/
@ -148,13 +155,23 @@ class Subject extends BaseController
*/
public function importExcel(Request $request)
{
Db::startTrans();
Tool::adminLockTableWrite('subject');
try {
$file = new UploadFile('uploads', 'fileExt:xlsx');
$file->putFile('subject');
$msg = ModelSubject::importExcel($file);
Db::commit();
Tool::unlockTable();
return [
'code' => 0,
'msg' => $msg
];
} catch (\Throwable $th) {
Db::rollback();
Tool::unlockTable();
throw $th;
}
}
}

49
app/admin/controller/TeachersStrength/Teacher.php
View File

@ -20,7 +20,7 @@ class Teacher extends BaseController
/**
* 获取教师列表
*/
public function getTeacherList(Request $request): array
public function getTeacherList(Request $request, $isExport = false): array
{
$params = $request->param();
$con = [];
@ -45,7 +45,7 @@ class Teacher extends BaseController
->leftJoin('subject b', 'a.subject_guid = b.subject_guid')
->order('teacher_order', 'asc');
return msg("获取教师列表成功!", $query);
return $isExport ? $query->select()->toArray() : msg("获取教师列表成功!", $query);
}
/**
@ -54,6 +54,7 @@ class Teacher extends BaseController
public function editTeacher(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('teacher');
try {
$params = $request->param();
$this->validate($params, [
@ -62,7 +63,6 @@ class Teacher extends BaseController
'teacher_img|教师图片' => 'require',
'subject_guid|授课科目' => 'require',
'teacher_intro|教师简介' => 'require',
'teacher_order|教师排序' => 'require'
]);
$model = ModelTeacher::where('teacher_guid', $params['teacher_guid'])->find();
if (!$model) throwErrorMsg("该教师不存在", 1);
@ -78,8 +78,10 @@ class Teacher extends BaseController
'teacher_order'
])->save($params);
Db::commit();
Tool::unlockTable();
return msg('编辑成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -91,6 +93,7 @@ class Teacher extends BaseController
public function addTeacher(Request $request): array
{
Db::startTrans();
Tool::adminLockTableWrite('teacher');
try {
$params = $request->param();
$this->validate($params, [
@ -99,7 +102,6 @@ class Teacher extends BaseController
'teacher_img|教师图片' => 'require',
'subject_guid|授课科目' => 'require',
'teacher_intro|教师简介' => 'require',
'teacher_order|教师排序' => 'require'
]);
$model = ModelTeacher::create($params, [
'teacher_guid',
@ -115,8 +117,10 @@ class Teacher extends BaseController
'teacher_order'
]);
Db::commit();
Tool::unlockTable();
return msg('添加成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
@ -126,7 +130,9 @@ class Teacher extends BaseController
* 删除教师
*/
public function deleteTeacher(Request $request): array
{ Db::startTrans();
{
Db::startTrans();
Tool::adminLockTableWrite('teacher');
try {
$params = $request->param();
$this->validate($params, [
@ -137,22 +143,21 @@ class Teacher extends BaseController
])->select();
$teacher->delete();
Db::commit();
Tool::unlockTable();
return msg('删除成功!');
} catch (\Throwable $th) {
Tool::unlockTable();
Db::rollback();
throw $th;
}
}
}
/**
* 导出Excel
*/
public function exportExcel(Request $request)
{
$params = $request->param();
$params['limit'] = 10000;
$select = self::getTeacherList($request)['data'];
return ModelTeacher::exportExcel($select);
ModelTeacher::exportExcel(self::getTeacherList($request, true));
}
/**
@ -161,9 +166,19 @@ class Teacher extends BaseController
public function downloadTemplate(Request $request)
{
$params = $request->param();
$data = array_values(ModelTeacher::EXCELFIELD);
$data = [
array_values(ModelTeacher::EXCELFIELD),
[
'色彩课',
'黎老师',
'执行董事',
'毕业于西南交大建筑与设计学院 高考美术教育13年',
"1",
"不展示",
]
];
$excel = (new Excel())->exporTsheet($data);
$excel->save('资讯文章导入模板.xlsx');
$excel->save('教师列表导入模板.xlsx');
}
/**
@ -171,13 +186,23 @@ class Teacher extends BaseController
*/
public function importExcel(Request $request)
{
Db::startTrans();
Tool::adminLockTableWrite('teacher');
try {
$file = new UploadFile('uploads', 'fileExt:xlsx');
$file->putFile('info_article');
$msg = ModelTeacher::importExcel($file);
Db::commit();
Tool::unlockTable();
return [
'code' => 0,
'msg' => $msg
];
} catch (\Throwable $th) {
Db::rollback();
Tool::unlockTable();
throw $th;
}
}
}

4
app/admin/controller/Works/Works.php
View File

@ -66,9 +66,7 @@ class Works extends BaseController
$params = $request->param();
$this->validate($params, [
'works_img|作品图片' => 'require',
'works_intro|作品介绍' => 'require',
'works_likes_count|作品点赞数' => 'require',
'works_order|排序' => 'require',
'works_type_guid|作品类型guid' => 'require',
]);
ModelWorks::create($params, [
@ -110,9 +108,7 @@ class Works extends BaseController
$this->validate($params, [
'works_img|作品图片' => 'require',
'works_guid|作品guid' => 'require',
'works_intro|作品介绍' => 'require',
'works_likes_count|作品点赞数' => 'require',
'works_order|排序' => 'require',
'works_type_guid|作品类型guid' => 'require',
]);
$model = ModelWorks::where('works_guid', $params['works_guid'])->find();

14
app/common/model/Enrol/Classes.php
View File

@ -9,6 +9,7 @@ use app\common\arw\adjfut\src\Excel;
use app\Request;
use app\common\exception\Tool;
use think\facade\Db;
use app\common\model\Dictionary\Dictionary as ModelDictionary;
class Classes extends BaseModel
{
@ -62,9 +63,10 @@ class Classes extends BaseModel
// excel导入/下载模板表头
public const EXCELFIELD = [
'classes_name' => '名称',
'classes_desc' => '简介',
'classes_sort' => '排序',
'classes_name' => '班型名称',
'classes_desc' => '班型简介',
'classes_sort' => '班型排序',
'classes_status' => '是否在首页展示',
];
@ -162,10 +164,16 @@ class Classes extends BaseModel
$classes_name = $value['classes_name'];
$classes_desc = $value['classes_desc'];
$classes_sort = $value['classes_sort'];
$classes_status = $value['classes_status'];
$show_status = ModelDictionary::getDictionaryData('show_status');
$classes_status = ModelDictionary::getDataDictionaryValue($show_status, $classes_status);
return self::create([
'classes_name' => $classes_name,
'classes_desc' => $classes_desc,
'classes_sort' => $classes_sort,
'classes_status' => $classes_status,
]);
}
}

8
app/common/model/Home/HomeWorks.php
View File

@ -91,9 +91,13 @@ class HomeWorks extends BaseModel
'介绍'
]];
foreach ($select as $key => $val) {
$home_works_author_type = $val['home_works_author_type'];
$works_author_type = ModelDictionary::getDictionaryData('works_author_type');
$home_works_author_type = ModelDictionary::getDataDictionaryName($works_author_type, $home_works_author_type);
$data[] = [
Excel::ExportImgFiled($val['home_works_author_type']),
$val['home_works_img'],
$home_works_author_type,
Excel::ExportImgFiled($val['home_works_img']),
$val['home_works_sort'],
$val['home_works_intro'],
];

19
app/common/model/HonoraryAchievement/Achievement.php
View File

@ -78,11 +78,7 @@ class Achievement extends BaseModel
*/
public static function onBeforeInsert(self $model): void
{
Tool::sortInsertProc(
self::class,
$model->achievement_sort,
['school_category_guid' => $model->school_category_guid]
);
Tool::dataAddSortProc($model, ['school_category_guid' => $model->school_category_guid]);
$model->completeCreateField();
}
@ -91,12 +87,7 @@ class Achievement extends BaseModel
*/
public static function onBeforeUpdate(self $model): void
{
Tool::sortEditProc(
self::class,
$model->achievement_guid,
$model->achievement_sort,
['school_category_guid' => $model->school_category_guid]
);
Tool::dataEditSortProc($model, ['school_category_guid' => $model->school_category_guid]);
$model->completeUpdateField();
}
@ -105,7 +96,7 @@ class Achievement extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->achievement_guid);
Tool::dataDeleteSortProc($model);
$model->completeDeleteField();
}
@ -181,8 +172,8 @@ class Achievement extends BaseModel
$achievement_sort = $value['achievement_sort'];
// 录取院校
$school_category = ModelSchoolCategory::where('school_category_name',$school_category_name)->find();
if(!$school_category) throwErrorMsg( $school_category_name . " 录取院校不存在！");
$school_category = ModelSchoolCategory::where('school_category_name', $school_category_name)->find();
if (!$school_category) throwErrorMsg($school_category_name . " 录取院校不存在！");
else $school_category_guid = $school_category->school_category_guid;
$model = self::create([

13
app/common/model/HonoraryAchievement/JointAchievement.php
View File

@ -68,10 +68,7 @@ class JointAchievement extends BaseModel
*/
public static function onBeforeInsert(self $model): void
{
Tool::sortInsertProc(
self::class,
$model->joint_achievement_sort,
);
Tool::dataAddSortProc($model);
$model->completeCreateField();
}
@ -80,11 +77,7 @@ class JointAchievement extends BaseModel
*/
public static function onBeforeUpdate(self $model): void
{
Tool::sortEditProc(
self::class,
$model->joint_achievement_guid,
$model->joint_achievement_sort,
);
Tool::dataEditSortProc($model);
$model->completeUpdateField();
}
@ -93,7 +86,7 @@ class JointAchievement extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->joint_achievement_guid);
Tool::dataDeleteSortProc($model);
$model->completeDeleteField();
}

13
app/common/model/HonoraryAchievement/SchoolCategory.php
View File

@ -75,10 +75,7 @@ class SchoolCategory extends BaseModel
Validate::unique(self::class, $model->school_category_guid, $model->getData(), [
'school_category_name' => '录取院校类型名称',
]);
Tool::sortInsertProc(
self::class,
$model->school_category_sort,
);
Tool::dataAddSortProc($model);
$model->completeCreateField();
}
@ -90,11 +87,7 @@ class SchoolCategory extends BaseModel
Validate::unique(self::class, $model->school_category_guid, $model->getData(), [
'school_category_name' => '录取院校类型名称',
]);
Tool::sortEditProc(
self::class,
$model->school_category_guid,
$model->school_category_sort,
);
Tool::dataEditSortProc($model);
$model->completeUpdateField();
}
@ -103,7 +96,7 @@ class SchoolCategory extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->school_category_guid);
Tool::dataDeleteSortProc($model);
$model->completeDeleteField();
}

17
app/common/model/HonoraryAchievement/SchoolLeaders.php
View File

@ -78,9 +78,8 @@ class SchoolLeaders extends BaseModel
*/
public static function onBeforeInsert(self $model): void
{
Tool::sortInsertProc(
self::class,
$model->school_leaders_sort,
Tool::dataAddSortProc(
$model,
['school_category_guid' => $model->school_category_guid]
);
$model->completeCreateField();
@ -91,10 +90,8 @@ class SchoolLeaders extends BaseModel
*/
public static function onBeforeUpdate(self $model): void
{
Tool::sortEditProc(
self::class,
$model->school_leaders_guid,
$model->school_leaders_sort,
Tool::dataEditSortProc(
$model,
['school_category_guid' => $model->school_category_guid]
);
$model->completeUpdateField();
@ -105,7 +102,7 @@ class SchoolLeaders extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->school_category_guid);
Tool::dataDeleteSortProc($model);
$model->completeDeleteField();
}
@ -179,8 +176,8 @@ class SchoolLeaders extends BaseModel
$school_leaders_sort = $value['school_leaders_sort'];
// 录取院校
$school_category = ModelSchoolCategory::where('school_category_name',$school_category_name)->find();
if(!$school_category) throwErrorMsg( $school_category_name . " 录取院校不存在！");
$school_category = ModelSchoolCategory::where('school_category_name', $school_category_name)->find();
if (!$school_category) throwErrorMsg($school_category_name . " 录取院校不存在！");
else $school_category_guid = $school_category->school_category_guid;
$model = self::create([

8
app/common/model/Poster/Poster.php
View File

@ -68,10 +68,10 @@ class Poster extends BaseModel
*/
public static function onBeforeInsert(self $model): void
{
Validate::unique(self::class, $model->subject_guid, $model->getData(), [
Validate::unique(self::class, $model->poster_guid, $model->getData(), [
'poster_location' => '海报位置',
]);
Tool::sortInsertProc(self::class, $model->poster_sort);
Tool::dataAddSortProc($model);
$model->completeCreateField();
}
@ -80,7 +80,7 @@ class Poster extends BaseModel
*/
public static function onBeforeUpdate(self $model): void
{
Tool::sortEditProc(self::class, $model->poster_guid, $model->poster_sort);
Tool::dataEditSortProc($model);
$model->completeUpdateField();
}
@ -89,7 +89,7 @@ class Poster extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->poster_guid);
Tool::dataDeleteSortProc($model);
$model->completeDeleteField();
}
}

15
app/common/model/TeachersStrength/Subject.php
View File

@ -67,14 +67,10 @@ class Subject extends BaseModel
*/
public static function onBeforeInsert(self $model): void
{
// self::checkRepeatData($model);
Validate::unique(self::class, $model->subject_guid, $model->getData(), [
'subject_name' => '科目名字',
]);
Tool::sortInsertProc(
self::class,
$model->subject_sort,
);
Tool::dataAddSortProc($model);
$model->completeCreateField();
}
@ -86,12 +82,7 @@ class Subject extends BaseModel
Validate::unique(self::class, $model->subject_guid, $model->getData(), [
'subject_name' => '科目名字',
]);
Tool::sortEditProc(
self::class,
$model->subject_guid,
$model->subject_sort,
);
Tool::dataEditSortProc($model);
$model->completeUpdateField();
}
@ -100,7 +91,7 @@ class Subject extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->subject_guid);
Tool::dataDeleteSortProc($model);
$model->completeDeleteField();
}

20
app/common/model/TeachersStrength/Teacher.php
View File

@ -74,6 +74,7 @@ class Teacher extends BaseModel
'teacher_position' => '教师职位',
'teacher_intro' => '教师简介',
'teacher_order' => '教师排序',
'teacher_status' => '首页是否展示',
];
@ -85,9 +86,8 @@ class Teacher extends BaseModel
*/
public static function onBeforeInsert(self $model): void
{
Tool::sortInsertProc(
self::class,
$model->teacher_order,
Tool::dataAddSortProc(
$model,
['subject_guid' => $model->subject_guid]
);
$model->completeCreateField();
@ -98,10 +98,8 @@ class Teacher extends BaseModel
*/
public static function onBeforeUpdate(self $model): void
{
Tool::sortEditProc(
self::class,
$model->teacher_guid,
$model->teacher_order,
Tool::dataEditSortProc(
$model,
['subject_guid' => $model->subject_guid]
);
$model->completeUpdateField();
@ -112,7 +110,7 @@ class Teacher extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->teacher_guid);
Tool::dataDeleteSortProc($model);
$model->completeDeleteField();
}
@ -126,7 +124,6 @@ class Teacher extends BaseModel
'教师名称',
'教师职位',
'教师图片',
'授课科目',
'教师简介',
'教师排序'
]];
@ -136,7 +133,6 @@ class Teacher extends BaseModel
$val['teacher_name'],
$val['teacher_position'],
Excel::ExportImgFiled($val['teacher_img']),
$val['subject_guid'],
$val['teacher_intro'],
$val['teacher_order'],
];
@ -191,8 +187,8 @@ class Teacher extends BaseModel
$teacher_order = $value['teacher_order'];
// 授教科目
$subject = ModelSubject::where('subject_name',$subject_name)->find();
if(!$subject) throwErrorMsg($subject_name . " 授教科目不存在！");
$subject = ModelSubject::where('subject_name', $subject_name)->find();
if (!$subject) throwErrorMsg($subject_name . " 授教科目不存在！");
else $subject_guid = $subject->subject_guid;
$model = self::create([