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

int

Browse Source
This commit is contained in:
ll 2023-04-27 19:28:10 +08:00
parent cec83457c5
commit 6ac26fe930
10 changed files with 342 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/controller/infoArticle/infoArticle.php → app/admin/controller/ExaminationInformation/infoArticle/infoArticle.php
View File

@ -1,9 +1,9 @@
<?php
namespace app\admin\controller\infoArticle;
namespace app\admin\controller\ExaminationInformation\infoArticle;
use app\BaseController;
use app\common\model\infoArticle\infoArticle as ModelinfoArticle;
use app\common\model\ExaminationInformation\infoArticle\infoArticle as ModelinfoArticle;
use app\Request;
use think\Validate;
use think\exception\ValidateException;

4
app/admin/controller/infoArticleType/infoArticleType.php → app/admin/controller/ExaminationInformation/infoArticleType/infoArticleType.php
View File

@ -1,9 +1,9 @@
<?php
namespace app\admin\controller\infoArticleType;
namespace app\admin\controller\ExaminationInformation\infoArticleType;
use app\BaseController;
use app\common\model\infoArticleType\infoArticleType as ModelinfoArticleType;
use app\common\model\ExaminationInformation\infoArticleType as ModelinfoArticleType;
use app\Request;
use think\Validate;
use think\exception\ValidateException;

55
app/admin/controller/Teachers_strength/Teacher.php
View File

@ -25,19 +25,22 @@ class Teacher extends BaseController
$params = $request->param();
$con = [];
$con = Tool::getOptionalQuery(['teacher_name', 'LIKE'], ['teacher_position', '='], ['subject_guid', '='],);
$con = Tool::getOptionalQuery(['teacher_name', 'LIKE'], ['teacher_position', 'LIKE'], ['a.subject_guid', '='],);
$query = ModelTeacher::where($con)
->field([
'teacher_id',
'teacher_guid',
'teacher_name',
'teacher_position',
'teacher_img',
'subject_guid',
'teacher_intro',
'teacher_order'
'a.teacher_id',
'a.teacher_guid',
'a.teacher_name',
'a.teacher_position',
'a.teacher_img',
'a.subject_guid',
'b.subject_name',
'a.teacher_intro',
'a.teacher_order'
])
->alias('a')
->leftJoin('subject b', 'a.subject_guid = b.subject_guid')
->order('teacher_update_time', 'desc');
return msg("获取教师列表成功!", $query);
@ -48,6 +51,8 @@ class Teacher extends BaseController
*/
public function editTeacher(Request $request): array
{
Db::startTrans();
try {
$params = $request->param();
$this->validate($params, [
'teacher_name|教师名称' => 'require',
@ -68,7 +73,12 @@ class Teacher extends BaseController
'teacher_intro',
'teacher_order'
])->save($params);
Db::commit();
return msg('编辑成功!');
} catch (\Throwable $th) {
Db::rollback();
throw $th;
}
}
/**
@ -76,6 +86,8 @@ class Teacher extends BaseController
*/
public function addTeacher(Request $request): array
{
Db::startTrans();
try {
$params = $request->param();
$this->validate($params, [
'teacher_name|教师名称' => 'require',
@ -96,14 +108,20 @@ class Teacher extends BaseController
'teacher_intro',
'teacher_order'
]);
Db::commit();
return msg('添加成功!');
} catch (\Throwable $th) {
Db::rollback();
throw $th;
}
}
/**
* 删除教师
*/
public function deleteTeacher(Request $request): array
{
{ Db::startTrans();
try {
$params = $request->param();
$this->validate($params, [
'teacher_guid' => 'require',
@ -112,7 +130,12 @@ class Teacher extends BaseController
'teacher_guid' => explode(',', $params['teacher_guid'])
])->select();
$teacher->delete();
Db::commit();
return msg('删除成功!');
} catch (\Throwable $th) {
Db::rollback();
throw $th;
}
}
/**
@ -121,16 +144,8 @@ class Teacher extends BaseController
public function exportExcel(Request $request)
{
$params = $request->param();
$select = ModelTeacher::field([
'teacher_name',
'teacher_position',
'teacher_img',
'subject_guid',
'teacher_intro',
'teacher_order'
])
->order('teacher_update_time', 'desc')
->select();
$params['limit'] = 10000;
$select = self::getTeacherList($request)['data'];
return ModelTeacher::exportExcel($select);
}

27
app/admin/controller/Teachers_strength/subject.php
View File

@ -44,6 +44,8 @@ class Subject extends BaseController
*/
public function editSubject(Request $request): array
{
Db::startTrans();
try {
$params = $request->param();
$this->validate($params, [
'subject_name|科目名字' => 'require',
@ -56,7 +58,12 @@ class Subject extends BaseController
'subject_name',
'subject_sort'
])->save($params);
Db::commit();
return msg('编辑成功!');
} catch (\Throwable $th) {
Db::rollback();
throw $th;
}
}
/**
@ -64,6 +71,8 @@ class Subject extends BaseController
*/
public function addSubject(Request $request): array
{
Db::startTrans();
try {
$params = $request->param();
$this->validate($params, [
'subject_name|科目名字' => 'require',
@ -76,14 +85,20 @@ class Subject extends BaseController
'subject_name',
'subject_sort'
]);
return msg('添加成功!');
Db::commit();
return msg('编辑成功!');
} catch (\Throwable $th) {
Db::rollback();
throw $th;
}
}
/**
* 删除授课科目
*/
public function deleteSubject(Request $request): array
{
Db::startTrans();
try {
$params = $request->param();
$this->validate($params, [
'subject_guid' => 'require',
@ -92,9 +107,13 @@ class Subject extends BaseController
'subject_guid' => explode(',', $params['subject_guid'])
])->select();
$subject->delete();
return msg('删除成功!');
Db::commit();
return msg('编辑成功!');
} catch (\Throwable $th) {
Db::rollback();
throw $th;
}
}
/**
* 导出Excel
*/

4
app/api/controller/infoArticle/infoArticle.php → app/api/controller/ExaminationInformation/infoArticle/infoArticle.php
View File

@ -1,9 +1,9 @@
<?php
namespace app\api\controller\infoArticle;
namespace app\api\controller\ExaminationInformation\infoArticle;
use app\BaseController;
use app\common\model\infoArticle\infoArticle as ModelinfoArticle;
use app\common\model\ExaminationInformation\infoArticle\infoArticle as ModelinfoArticle;
use app\Request;
use think\Validate;
use think\exception\ValidateException;

4
app/api/controller/infoArticleType/infoArticleType.php → app/api/controller/ExaminationInformation/infoArticleType/infoArticleType.php
View File

@ -1,9 +1,9 @@
<?php
namespace app\api\controller\infoArticleType;
namespace app\api\controller\ExaminationInformation\infoArticleType;
use app\BaseController;
use app\common\model\infoArticleType\infoArticleType as ModelinfoArticleType;
use app\common\model\ExaminationInformation\infoArticleType\infoArticleType as ModelinfoArticleType;
use app\Request;
use think\Validate;
use think\exception\ValidateException;

2
app/common/model/infoArticle/infoArticle.php → app/common/model/ExaminationInformation/infoArticle/infoArticle.php
View File

@ -1,6 +1,6 @@
<?php
namespace app\common\model\infoArticle;
namespace app\common\model\ExaminationInformation\infoArticle;
use app\common\arw\adjfut\src\Validate;
use app\BaseModel;

2
app/common/model/infoArticleType/infoArticleType.php → app/common/model/ExaminationInformation/infoArticleType/infoArticleType.php
View File

@ -1,6 +1,6 @@
<?php
namespace app\common\model\infoArticleType;
namespace app\common\model\ExaminationInformation\infoArticleType;
use app\common\arw\adjfut\src\Validate;
use app\BaseModel;

30
app/common/model/Teachers_strength/Teacher.php
View File

@ -28,7 +28,7 @@ class Teacher extends BaseModel
"teacher_name" => "string",
"teacher_position" => "int",
"teacher_position" => "string",
"teacher_img" => "string",
@ -72,13 +72,19 @@ class Teacher extends BaseModel
];
//排序字段
public $order_field = 'teacher_order';
/**
* 新增前
*/
public static function onBeforeInsert(self $model): void
{
// self::checkRepeatData($model);
Tool::sortInsertProc(
self::class,
$model->teacher_order,
['subject_guid' => $model->subject_guid]
);
$model->completeCreateField();
}
@ -87,7 +93,12 @@ class Teacher extends BaseModel
*/
public static function onBeforeUpdate(self $model): void
{
// self::checkRepeatData($model);
Tool::sortEditProc(
self::class,
$model->teacher_guid,
$model->teacher_order,
['subject_guid' => $model->subject_guid]
);
$model->completeUpdateField();
}
@ -96,6 +107,7 @@ class Teacher extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->teacher_guid);
$model->completeDeleteField();
}
@ -140,7 +152,8 @@ $val['teacher_order'],
Tool::getExcelRule(self::EXCELFIELD),
[
'titleLine' => [1]
]);
]
);
if (!$data) throwErrorMsg('excel无数据', 1);
$msg = [];
foreach ($data as $line => $value) {
@ -164,7 +177,12 @@ $val['teacher_order'],
*/
public static function importExcelInit($value)
{
$teacher_name = $value['teacher_name'];$teacher_position = $value['teacher_position'];$teacher_img = $value['teacher_img'];$subject_guid = $value['subject_guid'];$teacher_intro = $value['teacher_intro'];$teacher_order = $value['teacher_order'];
$teacher_name = $value['teacher_name'];
$teacher_position = $value['teacher_position'];
$teacher_img = $value['teacher_img'];
$subject_guid = $value['subject_guid'];
$teacher_intro = $value['teacher_intro'];
$teacher_order = $value['teacher_order'];
return self::create([
'teacher_name' => $teacher_name,
'teacher_position' => $teacher_position,
@ -174,6 +192,4 @@ $val['teacher_order'],
'teacher_order' => $teacher_order,
]);
}
}

24
app/common/model/Teachers_strength/subject.php
View File

@ -59,7 +59,8 @@ class Subject extends BaseModel
'subject_sort' => '排序',
];
//排序字段
public $order_field = 'subject_sort';
/**
* 新增前
@ -67,6 +68,11 @@ class Subject extends BaseModel
public static function onBeforeInsert(self $model): void
{
// self::checkRepeatData($model);
Tool::sortInsertProc(
self::class,
$model->subject_sort,
);
$model->completeCreateField();
}
@ -75,7 +81,14 @@ class Subject extends BaseModel
*/
public static function onBeforeUpdate(self $model): void
{
// self::checkRepeatData($model);
Tool::sortEditProc(
self::class,
$model->subject_guid,
$model->subject_sort,
);
$model->completeUpdateField();
}
@ -84,6 +97,7 @@ class Subject extends BaseModel
*/
public static function onBeforeDelete(self $model): void
{
Tool::sortDeleteProc(self::class, $model->subject_guid);
$model->completeDeleteField();
}
@ -120,7 +134,8 @@ $val['subject_sort'],
Tool::getExcelRule(self::EXCELFIELD),
[
'titleLine' => [1]
]);
]
);
if (!$data) throwErrorMsg('excel无数据', 1);
$msg = [];
foreach ($data as $line => $value) {
@ -144,12 +159,11 @@ $val['subject_sort'],
*/
public static function importExcelInit($value)
{
$subject_name = $value['subject_name'];$subject_sort = $value['subject_sort'];
$subject_name = $value['subject_name'];
$subject_sort = $value['subject_sort'];
return self::create([
'subject_name' => $subject_name,
'subject_sort' => $subject_sort,
]);
}
}