diff --git a/app/admin/controller/Enrol/EnrolIntro.php b/app/admin/controller/Enrol/EnrolIntro.php
new file mode 100644
index 0000000..bf48bec
--- /dev/null
+++ b/app/admin/controller/Enrol/EnrolIntro.php
@@ -0,0 +1,97 @@
+param();
+ $con = [];
+
+ $con = Tool::getOptionalQuery(['enrol_intro_title', 'LIKE'],);
+
+ $query = ModelEnrolIntro::where($con)
+ ->field([
+ 'enrol_intro_id',
+ 'enrol_intro_guid',
+ 'enrol_intro_title',
+ 'enrol_intro_content'
+ ])
+ ->order('enrol_intro_create_time', 'asc');
+
+ return msg("获取招生简介列表成功!", $query);
+ }
+
+ /**
+ * 编辑招生简介
+ */
+ public function editEnrolIntro(Request $request): array
+ {
+ $params = $request->param();
+ $this->validate($params, [
+ 'enrol_intro_title|标题' => 'require',
+ 'enrol_intro_content|内容' => 'require'
+ ]);
+ $model = ModelEnrolIntro::where('enrol_intro_guid', $params['enrol_intro_guid'])->find();
+ if (!$model) throwErrorMsg("该招生简介不存在", 1);
+ $model->allowField([
+ 'enrol_intro_update_user_guid',
+ 'enrol_intro_title',
+ 'enrol_intro_content'
+ ])->save($params);
+ return msg('编辑成功!');
+ }
+
+ /**
+ * 添加招生简介
+ */
+ public function addEnrolIntro(Request $request): array
+ {
+ $params = $request->param();
+ $this->validate($params, [
+ 'enrol_intro_title|标题' => 'require',
+ 'enrol_intro_content|内容' => 'require'
+ ]);
+ $model = ModelEnrolIntro::create($params, [
+ 'enrol_intro_guid',
+ 'enrol_intro_create_user_guid',
+ 'enrol_intro_update_user_guid',
+ 'enrol_intro_title',
+ 'enrol_intro_content'
+ ]);
+ return msg('添加成功!');
+ }
+
+ /**
+ * 删除招生简介
+ */
+ public function deleteEnrolIntro(Request $request): array
+ {
+ $params = $request->param();
+ $this->validate($params, [
+ 'enrol_intro_guid' => 'require',
+ ]);
+ $enrol_intro = ModelEnrolIntro::where([
+ 'enrol_intro_guid' => explode(',', $params['enrol_intro_guid'])
+ ])->select();
+ $enrol_intro->delete();
+ return msg('删除成功!');
+ }
+}
diff --git a/app/admin/controller/Gen/Gen.php b/app/admin/controller/Gen/Gen.php
index 4aa199a..32f57a5 100644
--- a/app/admin/controller/Gen/Gen.php
+++ b/app/admin/controller/Gen/Gen.php
@@ -946,7 +946,8 @@ class Gen extends BaseController
{
label: '操作',
prop: 'chaoz',
- width: '250'
+ width: '250',
+ fixed: 'right'
}";
// return $imgTemplate;
diff --git a/app/common/model/Enrol/Classes.php b/app/common/model/Enrol/Classes.php
index 02b2622..29b2c68 100644
--- a/app/common/model/Enrol/Classes.php
+++ b/app/common/model/Enrol/Classes.php
@@ -148,11 +148,12 @@ class Classes extends BaseModel
if (!$data) throwErrorMsg('excel无数据', 1);
$msg = [];
foreach ($data as $line => $value) {
+ $classes_name = $value['classes_name'];
try {
$model = self::importExcelInit($value);
- $msg[] = "{$line} {$value->classes_name} 新增成功!
";
+ $msg[] = "{$line} {$classes_name} 新增成功!
";
} catch (\Throwable $th) {
- $msg[] = "{$line} {$value->classes_name} {$th->getMessage()}
";
+ $msg[] = "{$line} {$classes_name} {$th->getMessage()}
";
}
}
Db::commit();
diff --git a/app/common/model/Enrol/EnrolIntro.php b/app/common/model/Enrol/EnrolIntro.php
new file mode 100644
index 0000000..104f2e1
--- /dev/null
+++ b/app/common/model/Enrol/EnrolIntro.php
@@ -0,0 +1,83 @@
+ "int",
+
+ "enrol_intro_guid" => "string",
+
+ "enrol_intro_title" => "string",
+
+ "enrol_intro_content" => "string",
+
+ "enrol_intro_create_time" => "datetime",
+
+ "enrol_intro_create_user_guid" => "string",
+
+ "enrol_intro_update_time" => "datetime",
+
+ "enrol_intro_update_user_guid" => "string",
+
+ "enrol_intro_delete_time" => "datetime",
+
+ "enrol_intro_delete_user_guid" => "string",
+
+ ];
+ // 设置json类型字段
+ protected $json = [''];
+ // 开启自动写入时间戳字段
+ protected $autoWriteTimestamp = 'datetime';
+ // 创建时间
+ protected $createTime = 'enrol_intro_create_time';
+ // 修改时间
+ protected $updateTime = 'enrol_intro_update_time';
+
+
+
+
+ /**
+ * 新增前
+ */
+ public static function onBeforeInsert(self $model): void
+ {
+ // self::checkRepeatData($model);
+ $model->completeCreateField();
+ }
+
+ /**
+ * 更新前
+ */
+ public static function onBeforeUpdate(self $model): void
+ {
+ // self::checkRepeatData($model);
+ $model->completeUpdateField();
+ }
+
+ /**
+ * 删除前
+ */
+ public static function onBeforeDelete(self $model): void
+ {
+ $model->completeDeleteField();
+ }
+}