From 7caffa67ccf6b066043f199bf80e083c89898192 Mon Sep 17 00:00:00 2001 From: lvzhihao <2837263645@qq.com> Date: Sat, 9 Aug 2025 15:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gen/course/controller/CourseController.java | 3 +-- .../org/jeecg/modules/gen/course/entity/Course.java | 4 ++-- .../modules/gen/course/mapper/CourseMapper.java | 1 - .../modules/gen/course/mapper/xml/CourseMapper.xml | 2 +- .../modules/gen/course/service/ICourseService.java | 1 - .../gen/course/service/impl/CourseServiceImpl.java | 1 - jeecgboot-vue3/src/views/gen/course/Course.api.ts | 1 - jeecgboot-vue3/src/views/gen/course/Course.data.ts | 13 ++++++++----- jeecgboot-vue3/src/views/gen/course/CourseList.vue | 3 +-- .../src/views/gen/course/components/CourseForm.vue | 3 +-- .../src/views/gen/course/components/CourseModal.vue | 3 +-- 11 files changed, 15 insertions(+), 20 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/controller/CourseController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/controller/CourseController.java index e9be5637..3857044e 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/controller/CourseController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/controller/CourseController.java @@ -51,8 +51,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class CourseController extends JeecgController { @Autowired private ICourseService courseService; - - + /** * 分页列表查询 * diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/entity/Course.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/entity/Course.java index 6f644902..451050da 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/entity/Course.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/entity/Course.java @@ -33,7 +33,6 @@ import lombok.experimental.Accessors; public class Course implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") @@ -114,7 +113,8 @@ public class Course implements Serializable { @Schema(description = "最大报名人数") private java.lang.Integer maxEnroll; /**状态*/ - @Excel(name = "状态", width = 15) + @Excel(name = "状态", width = 15, dicCode = "course_status") + @Dict(dicCode = "course_status") @Schema(description = "状态") private java.lang.Integer status; /**常见问题*/ diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/CourseMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/CourseMapper.java index f65f1e02..31fa6683 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/CourseMapper.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/CourseMapper.java @@ -14,5 +14,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface CourseMapper extends BaseMapper { - } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/xml/CourseMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/xml/CourseMapper.xml index 58a39568..42aba30c 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/xml/CourseMapper.xml +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/mapper/xml/CourseMapper.xml @@ -2,4 +2,4 @@ - + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/ICourseService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/ICourseService.java index ec362e60..dfe9cc71 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/ICourseService.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/ICourseService.java @@ -11,5 +11,4 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ICourseService extends IService { - } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/impl/CourseServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/impl/CourseServiceImpl.java index 897a7715..0f089310 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/impl/CourseServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/course/service/impl/CourseServiceImpl.java @@ -16,5 +16,4 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CourseServiceImpl extends ServiceImpl implements ICourseService { - } diff --git a/jeecgboot-vue3/src/views/gen/course/Course.api.ts b/jeecgboot-vue3/src/views/gen/course/Course.api.ts index e762a7a1..74e68749 100644 --- a/jeecgboot-vue3/src/views/gen/course/Course.api.ts +++ b/jeecgboot-vue3/src/views/gen/course/Course.api.ts @@ -3,7 +3,6 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); - enum Api { list = '/gen/course/course/list', save='/gen/course/course/add', diff --git a/jeecgboot-vue3/src/views/gen/course/Course.data.ts b/jeecgboot-vue3/src/views/gen/course/Course.data.ts index 1e0dd843..9e8d25c5 100644 --- a/jeecgboot-vue3/src/views/gen/course/Course.data.ts +++ b/jeecgboot-vue3/src/views/gen/course/Course.data.ts @@ -3,7 +3,6 @@ import {FormSchema} from '/@/components/Table'; import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; - //列表数据 export const columns: BasicColumn[] = [ { @@ -95,7 +94,7 @@ export const columns: BasicColumn[] = [ { title: '状态', align:"center", - dataIndex: 'status' + dataIndex: 'status_dictText' }, { title: '常见问题', @@ -219,7 +218,11 @@ export const formSchema: FormSchema[] = [ { label: '状态', field: 'status', - component: 'InputNumber', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"course_status", + type: "radio" + }, }, { label: '常见问题', @@ -254,7 +257,7 @@ export const superQuerySchema = { endTime: {title: '结课时间',order: 14,view: 'datetime', type: 'string',}, enrollCount: {title: '已报名人数',order: 15,view: 'number', type: 'number',}, maxEnroll: {title: '最大报名人数',order: 16,view: 'number', type: 'number',}, - status: {title: '状态',order: 17,view: 'number', type: 'number',}, + status: {title: '状态',order: 17,view: 'number', type: 'number',dictCode: 'course_status',}, question: {title: '常见问题',order: 18,view: 'umeditor', type: 'string',}, }; @@ -265,4 +268,4 @@ export const superQuerySchema = { export function getBpmFormSchema(_formData): FormSchema[]{ // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema return formSchema; -} +} \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/gen/course/CourseList.vue b/jeecgboot-vue3/src/views/gen/course/CourseList.vue index edb3739c..43adac6f 100644 --- a/jeecgboot-vue3/src/views/gen/course/CourseList.vue +++ b/jeecgboot-vue3/src/views/gen/course/CourseList.vue @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/gen/course/components/CourseModal.vue b/jeecgboot-vue3/src/views/gen/course/components/CourseModal.vue index f88acc90..7affc85c 100644 --- a/jeecgboot-vue3/src/views/gen/course/components/CourseModal.vue +++ b/jeecgboot-vue3/src/views/gen/course/components/CourseModal.vue @@ -4,7 +4,6 @@ -