diff --git a/app/admin/controller/Enrol/Classes.php b/app/admin/controller/Enrol/Classes.php index a10dc60..f0770b1 100644 --- a/app/admin/controller/Enrol/Classes.php +++ b/app/admin/controller/Enrol/Classes.php @@ -49,7 +49,6 @@ class Classes extends BaseController $params = $request->param(); $this->validate($params, [ 'classes_name|名称' => 'require', - 'classes_content|内容' => 'require', 'classes_sort|排序' => 'require' ]); $model = ModelClasses::where('classes_guid', $params['classes_guid'])->find(); @@ -58,7 +57,6 @@ class Classes extends BaseController 'classes_update_user_guid', 'classes_name', 'classes_desc', - 'classes_content', 'classes_sort' ])->save($params); return msg('编辑成功!'); @@ -72,7 +70,6 @@ class Classes extends BaseController $params = $request->param(); $this->validate($params, [ 'classes_name|名称' => 'require', - 'classes_content|内容' => 'require', 'classes_sort|排序' => 'require' ]); $model = ModelClasses::create($params, [ @@ -81,7 +78,6 @@ class Classes extends BaseController 'classes_update_user_guid', 'classes_name', 'classes_desc', - 'classes_content', 'classes_sort' ]); return msg('添加成功!'); @@ -112,7 +108,6 @@ class Classes extends BaseController $select = ModelClasses::field([ 'classes_name', 'classes_desc', - 'classes_content', 'classes_sort' ]) ->order('classes_sort', 'asc') @@ -126,7 +121,8 @@ class Classes extends BaseController public function downloadTemplate(Request $request) { $params = $request->param(); - $data = array_values(ModelClasses::EXCELFIELD); + $data[] = array_values(ModelClasses::EXCELFIELD); + $data[] = ["冲刺班","各大院校名师亲自指导",1]; $excel = (new Excel())->exporTsheet($data); $excel->save('班型导入模板.xlsx'); } diff --git a/app/admin/controller/Gen/Gen.php b/app/admin/controller/Gen/Gen.php index 8a33200..4aa199a 100644 --- a/app/admin/controller/Gen/Gen.php +++ b/app/admin/controller/Gen/Gen.php @@ -11,7 +11,7 @@ use app\common\exception\Tool; class Gen extends BaseController { - private $address = 'D:\phpstudy_pro\WWW\.Template\php_back_template'; + private $address = 'D:\phpstudy_pro\WWW\Aerwen\houde_web\houde_web_back'; public function index(Request $request) @@ -414,9 +414,9 @@ class Gen extends BaseController // 'tplCategory' => $tableInfo['tplCategory'], 'tableName' => $tableInfo['Name'], 'tableComment' => $tableInfo['Comment'], - 'className' => Tool::camelize($tableInfo['Name']), + 'className' => Tool::camelize($tableInfo['Name'],true), 'businessName' => $tableInfo['Name'], - 'moduleName' => Tool::camelize($tableInfo['Name']), + 'moduleName' => Tool::camelize($tableInfo['Name'],true), 'functionName' => $tableInfo['Comment'], 'functionAuthor' => 'admin', 'genType' => 1, diff --git a/app/common/model/Enrol/Classes.php b/app/common/model/Enrol/Classes.php index ef38c89..02b2622 100644 --- a/app/common/model/Enrol/Classes.php +++ b/app/common/model/Enrol/Classes.php @@ -63,7 +63,6 @@ class Classes extends BaseModel public const EXCELFIELD = [ 'classes_name' => '名称', 'classes_desc' => '简介', - 'classes_content' => '内容', 'classes_sort' => '排序', ]; @@ -117,14 +116,12 @@ class Classes extends BaseModel $data = [[ '名称', '简介', - '内容', '排序' ]]; foreach ($select as $key => $val) { $data[] = [ $val['classes_name'], $val['classes_desc'], - $val['classes_content'], $val['classes_sort'], ]; } @@ -153,9 +150,9 @@ class Classes extends BaseModel foreach ($data as $line => $value) { try { $model = self::importExcelInit($value); - $msg[] = "{$line} 新增成功!
"; + $msg[] = "{$line} {$value->classes_name} 新增成功!
"; } catch (\Throwable $th) { - $msg[] = "{$line} {$th->getMessage()}
"; + $msg[] = "{$line} {$value->classes_name} {$th->getMessage()}
"; } } Db::commit(); @@ -173,12 +170,10 @@ class Classes extends BaseModel { $classes_name = $value['classes_name']; $classes_desc = $value['classes_desc']; - $classes_content = $value['classes_content']; $classes_sort = $value['classes_sort']; return self::create([ 'classes_name' => $classes_name, 'classes_desc' => $classes_desc, - 'classes_content' => $classes_content, 'classes_sort' => $classes_sort, ]); }