From e89105dd88d2993e37b76d053c16df7cf15c522c Mon Sep 17 00:00:00 2001 From: lwh <2679599887@qq.com> Date: Fri, 21 Apr 2023 21:10:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8B=9B=E7=94=9F?= =?UTF-8?q?=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Enrol/EnrolAq.php | 30 +----- app/api/controller/Enrol/EnrolAq.php | 6 +- app/common/model/Enrol/EnrolAq.php | 133 ++++++++++++++----------- 3 files changed, 80 insertions(+), 89 deletions(-) diff --git a/app/admin/controller/Enrol/EnrolAq.php b/app/admin/controller/Enrol/EnrolAq.php index 571ad7f..cf3f772 100644 --- a/app/admin/controller/Enrol/EnrolAq.php +++ b/app/admin/controller/Enrol/EnrolAq.php @@ -49,10 +49,10 @@ class EnrolAq extends BaseController { $params = $request->param(); $this->validate($params, [ - 'enrol_aq_question|问题' => 'require', - 'enrol_aq_answer|答案' => 'require', - 'enrol_aq_sort|排序' => 'require' ]); + + $params['enrol_aq_answer_status'] = 2; + $model = ModelEnrolAq::where('enrol_aq_guid', $params['enrol_aq_guid'])->find(); if (!$model) throwErrorMsg("该招生问答不存在", 1); $model->allowField([ @@ -66,30 +66,6 @@ class EnrolAq extends BaseController return msg('编辑成功!'); } - /** - * 添加招生问答 - */ - public function addEnrolAq(Request $request): array - { - $params = $request->param(); - $this->validate($params, [ - 'enrol_aq_question|问题' => 'require', - 'enrol_aq_answer|答案' => 'require', - 'enrol_aq_sort|排序' => 'require' - ]); - $model = ModelEnrolAq::create($params, [ - 'enrol_aq_guid', - 'enrol_aq_create_user_guid', - 'enrol_aq_update_user_guid', - 'enrol_aq_question', - 'enrol_aq_answer', - 'enrol_aq_sort', - 'enrol_aq_status', - 'enrol_aq_answer_status' - ]); - return msg('添加成功!'); - } - /** * 删除招生问答 */ diff --git a/app/api/controller/Enrol/EnrolAq.php b/app/api/controller/Enrol/EnrolAq.php index 3b95ab0..b79fb08 100644 --- a/app/api/controller/Enrol/EnrolAq.php +++ b/app/api/controller/Enrol/EnrolAq.php @@ -57,9 +57,9 @@ class EnrolAq extends BaseController 'enrol_aq_question|问题' => 'require', ]); - $params['enrol_aq_sort'] = 0; - $params['enrol_aq_status'] = 1; - $params['enrol_aq_answer_status'] = 1; + // $params['enrol_aq_sort'] = 0; + // $params['enrol_aq_status'] = 1; + // $params['enrol_aq_answer_status'] = 1; $model = ModelEnrolAq::create($params, [ 'enrol_aq_guid', diff --git a/app/common/model/Enrol/EnrolAq.php b/app/common/model/Enrol/EnrolAq.php index c307814..9f56045 100644 --- a/app/common/model/Enrol/EnrolAq.php +++ b/app/common/model/Enrol/EnrolAq.php @@ -21,34 +21,34 @@ class EnrolAq extends BaseModel protected $disuse = []; // 设置字段信息 protected $schema = [ - - "enrol_aq_id" => "int", - - "enrol_aq_guid" => "string", - - "enrol_aq_question" => "string", - - "enrol_aq_answer" => "string", - - "enrol_aq_sort" => "int", - - "enrol_aq_status" => "int", - - "enrol_aq_answer_status" => "int", - - "enrol_aq_create_time" => "datetime", - - "enrol_aq_create_user_guid" => "string", - - "enrol_aq_update_time" => "datetime", - - "enrol_aq_update_user_guid" => "string", - - "enrol_aq_delete_time" => "datetime", - - "enrol_aq_delete_user_guid" => "string", - - ]; + + "enrol_aq_id" => "int", + + "enrol_aq_guid" => "string", + + "enrol_aq_question" => "string", + + "enrol_aq_answer" => "string", + + "enrol_aq_sort" => "int", + + "enrol_aq_status" => "int", + + "enrol_aq_answer_status" => "int", + + "enrol_aq_create_time" => "datetime", + + "enrol_aq_create_user_guid" => "string", + + "enrol_aq_update_time" => "datetime", + + "enrol_aq_update_user_guid" => "string", + + "enrol_aq_delete_time" => "datetime", + + "enrol_aq_delete_user_guid" => "string", + + ]; // 设置json类型字段 protected $json = ['']; // 开启自动写入时间戳字段 @@ -58,15 +58,21 @@ class EnrolAq extends BaseModel // 修改时间 protected $updateTime = 'enrol_aq_update_time'; - + //排序字段 + public $order_field = 'enrol_aq_sort'; /** * 新增前 */ public static function onBeforeInsert(self $model): void { - // self::checkRepeatData($model); + BaseModel::setUserGuid(false); + self::createFieldInit($model); + Tool::sortInsertProc( + self::class, + $model->enrol_aq_sort, + ); $model->completeCreateField(); } @@ -75,7 +81,11 @@ class EnrolAq extends BaseModel */ public static function onBeforeUpdate(self $model): void { - // self::checkRepeatData($model); + Tool::sortEditProc( + self::class, + $model->enrol_aq_guid, + $model->enrol_aq_sort, + ); $model->completeUpdateField(); } @@ -84,37 +94,42 @@ class EnrolAq extends BaseModel */ public static function onBeforeDelete(self $model): void { + Tool::sortDeleteProc(self::class, $model->enrol_aq_guid); $model->completeDeleteField(); } /** -* 导出Excel -*/ - public static function exportExcel($select) - { - $data = [[ -'问题', -'答案', -'排序', -'是否展示', -'回答状态' -]]; - foreach ($select as $key => $val) { - $data[] = [ -$val['enrol_aq_question'], -$val['enrol_aq_answer'], -$val['enrol_aq_sort'], -$val['enrol_aq_status'], -$val['enrol_aq_answer_status'], -]; - } - $excel = (new Excel())->exporTsheet($data); - $excel->save('招生问答.xlsx'); - } - - - - - + * 导出Excel + */ + public static function exportExcel($select) + { + $data = [[ + '问题', + '答案', + '排序', + '是否展示', + '回答状态' + ]]; + foreach ($select as $key => $val) { + $data[] = [ + $val['enrol_aq_question'], + $val['enrol_aq_answer'], + $val['enrol_aq_sort'], + $val['enrol_aq_status'], + $val['enrol_aq_answer_status'], + ]; + } + $excel = (new Excel())->exporTsheet($data); + $excel->save('招生问答.xlsx'); + } + /** + * 新增前字段初始化 + */ + public static function createFieldInit(self &$model): void + { + $model->enrol_aq_sort = 1; + $model->enrol_aq_status = 1; + $model->enrol_aq_answer_status = 1; + } }