From a490a36fbe3903e871a8339e59228802338e3e96 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Mon, 28 Jul 2025 16:10:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=87=E7=AB=A0=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B5=B7=E6=8A=A5=E5=9B=BE=E7=89=87/?= =?UTF-8?q?=E6=B5=B7=E6=8A=A5=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0=202?= =?UTF-8?q?=E3=80=81=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EducationArticleController.java | 2 +- .../educationArticle/entity/EducationArticle.java | 10 +++++++++- .../mapper/EducationArticleMapper.java | 2 +- .../service/IEducationArticleService.java | 2 +- .../service/impl/EducationArticleServiceImpl.java | 2 +- .../educationArticle/vue/EducationArticleList.vue | 13 ++++++++++++ .../vue/modules/EducationArticleForm.vue | 10 ++++++++++ .../educationArticle/vue3/EducationArticle.data.ts | 23 ++++++++++++++++++++++ .../EducationCategoryThesisController.java | 2 +- .../entity/EducationCategoryThesis.java | 6 +++++- .../mapper/EducationCategoryThesisMapper.java | 2 +- .../service/IEducationCategoryThesisService.java | 2 +- .../impl/EducationCategoryThesisServiceImpl.java | 2 +- .../vue/EducationCategoryThesisList.vue | 7 +++++++ .../vue/modules/EducationCategoryThesisModal.vue | 3 +++ .../vue3/EducationCategoryThesis.data.ts | 13 ++++++++++++ .../controller/EducationThesisController.java | 2 +- .../educationThesis/entity/EducationCourse.java | 2 +- .../educationThesis/entity/EducationDocument.java | 2 +- .../entity/EducationPeriodical.java | 2 +- .../educationThesis/entity/EducationTarget.java | 2 +- .../educationThesis/entity/EducationTeacher.java | 2 +- .../educationThesis/entity/EducationThesis.java | 12 ++++++++--- .../mapper/EducationCourseMapper.java | 2 +- .../mapper/EducationDocumentMapper.java | 2 +- .../mapper/EducationPeriodicalMapper.java | 2 +- .../mapper/EducationTargetMapper.java | 2 +- .../mapper/EducationTeacherMapper.java | 2 +- .../mapper/EducationThesisMapper.java | 2 +- .../service/IEducationCourseService.java | 2 +- .../service/IEducationDocumentService.java | 2 +- .../service/IEducationPeriodicalService.java | 2 +- .../service/IEducationTargetService.java | 2 +- .../service/IEducationTeacherService.java | 2 +- .../service/IEducationThesisService.java | 2 +- .../service/impl/EducationCourseServiceImpl.java | 2 +- .../service/impl/EducationDocumentServiceImpl.java | 2 +- .../impl/EducationPeriodicalServiceImpl.java | 2 +- .../service/impl/EducationTargetServiceImpl.java | 2 +- .../service/impl/EducationTeacherServiceImpl.java | 2 +- .../service/impl/EducationThesisServiceImpl.java | 2 +- .../educationThesis/vo/EducationThesisPage.java | 10 +++++++++- .../educationThesis/vue/EducationThesisList.vue | 13 ++++++++++++ .../vue/modules/EducationThesisForm.vue | 10 ++++++++++ 44 files changed, 156 insertions(+), 38 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/controller/EducationArticleController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/controller/EducationArticleController.java index 80afbbb..7746889 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/controller/EducationArticleController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/controller/EducationArticleController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 案例文章表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Api(tags="案例文章表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/entity/EducationArticle.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/entity/EducationArticle.java index c18dee0..79bb9b5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/entity/EducationArticle.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/entity/EducationArticle.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 案例文章表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Data @@ -90,4 +90,12 @@ public class EducationArticle implements Serializable { @Dict(dictTable = "education_category_period", dicText = "title", dicCode = "id") @ApiModelProperty(value = "阶段分类") private java.lang.String categoryPeriodId; + /**海报图片*/ + @Excel(name = "海报图片", width = 15) + @ApiModelProperty(value = "海报图片") + private java.lang.String paperImage; + /**海报文字描述*/ + @Excel(name = "海报文字描述", width = 15) + @ApiModelProperty(value = "海报文字描述") + private java.lang.String paperDesc; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/mapper/EducationArticleMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/mapper/EducationArticleMapper.java index ac79db1..908d02e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/mapper/EducationArticleMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/mapper/EducationArticleMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 案例文章表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationArticleMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/IEducationArticleService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/IEducationArticleService.java index b6fd90b..3f05996 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/IEducationArticleService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/IEducationArticleService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 案例文章表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationArticleService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/impl/EducationArticleServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/impl/EducationArticleServiceImpl.java index d65d70c..4f4eedc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/impl/EducationArticleServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/service/impl/EducationArticleServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 案例文章表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/EducationArticleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/EducationArticleList.vue index 5c624d9..808e924 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/EducationArticleList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/EducationArticleList.vue @@ -178,6 +178,17 @@ align:"center", dataIndex: 'categoryPeriodId_dictText' }, + { + title:'海报图片', + align:"center", + dataIndex: 'paperImage', + scopedSlots: {customRender: 'imgSlot'} + }, + { + title:'海报文字描述', + align:"center", + dataIndex: 'paperDesc' + }, { title: '操作', dataIndex: 'action', @@ -222,6 +233,8 @@ fieldList.push({type:'string',value:'categoryServiceId',text:'服务分类',dictCode:"education_category_service,title,id"}) fieldList.push({type:'string',value:'categoryMajorId',text:'专业分类',dictCode:"education_category_major,title,id"}) fieldList.push({type:'string',value:'categoryPeriodId',text:'阶段分类',dictCode:"education_category_period,title,id"}) + fieldList.push({type:'Text',value:'paperImage',text:'海报图片',dictCode:''}) + fieldList.push({type:'Text',value:'paperDesc',text:'海报文字描述',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/modules/EducationArticleForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/modules/EducationArticleForm.vue index dae7972..7554b74 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/modules/EducationArticleForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue/modules/EducationArticleForm.vue @@ -53,6 +53,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue3/EducationArticle.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue3/EducationArticle.data.ts index 80cc22f..1d0b3d5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue3/EducationArticle.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationArticle/vue3/EducationArticle.data.ts @@ -60,6 +60,17 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'categoryPeriodId_dictText' }, + { + title: '海报图片', + align:"center", + dataIndex: 'paperImage', + customRender:render.renderAvatar, + }, + { + title: '海报文字描述', + align:"center", + dataIndex: 'paperDesc' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -127,4 +138,16 @@ export const formSchema: FormSchema[] = [ dictCode:"education_category_period,title,id" }, }, + { + label: '海报图片', + field: 'paperImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '海报文字描述', + field: 'paperDesc', + component: 'InputTextArea',//TODO 注意string转换问题 + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/controller/EducationCategoryThesisController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/controller/EducationCategoryThesisController.java index ec098e9..97b61fa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/controller/EducationCategoryThesisController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/controller/EducationCategoryThesisController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 论文分类表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Api(tags="论文分类表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/entity/EducationCategoryThesis.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/entity/EducationCategoryThesis.java index beca067..eeaa210 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/entity/EducationCategoryThesis.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/entity/EducationCategoryThesis.java @@ -18,7 +18,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 论文分类表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Data @@ -47,6 +47,10 @@ public class EducationCategoryThesis implements Serializable { @Excel(name = "分类名称", width = 15) @ApiModelProperty(value = "分类名称") private java.lang.String title; + /**图标*/ + @Excel(name = "图标", width = 15) + @ApiModelProperty(value = "图标") + private java.lang.String image; /**父级节点*/ @Excel(name = "父级节点", width = 15) @ApiModelProperty(value = "父级节点") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/mapper/EducationCategoryThesisMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/mapper/EducationCategoryThesisMapper.java index 7282ed1..8323415 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/mapper/EducationCategoryThesisMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/mapper/EducationCategoryThesisMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 论文分类表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationCategoryThesisMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/IEducationCategoryThesisService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/IEducationCategoryThesisService.java index 795fa76..9ee9dbf 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/IEducationCategoryThesisService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/IEducationCategoryThesisService.java @@ -9,7 +9,7 @@ import java.util.List; /** * @Description: 论文分类表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationCategoryThesisService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/impl/EducationCategoryThesisServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/impl/EducationCategoryThesisServiceImpl.java index dcb0b45..ab8b0f9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/impl/EducationCategoryThesisServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/service/impl/EducationCategoryThesisServiceImpl.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 论文分类表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/EducationCategoryThesisList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/EducationCategoryThesisList.vue index 5b29218..8c036c8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/EducationCategoryThesisList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/EducationCategoryThesisList.vue @@ -115,6 +115,12 @@ align:"left", dataIndex: 'title' }, + { + title:'图标', + align:"left", + dataIndex: 'image', + scopedSlots: {customRender: 'imgSlot'} + }, { title: '操作', dataIndex: 'action', @@ -336,6 +342,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'分类名称',dictCode:''}) + fieldList.push({type:'Text',value:'image',text:'图标',dictCode:''}) fieldList.push({type:'string',value:'pid',text:'父级节点',dictCode:''}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/modules/EducationCategoryThesisModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/modules/EducationCategoryThesisModal.vue index 77cb23a..7c46bf8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/modules/EducationCategoryThesisModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationCategoryThesis/vue/modules/EducationCategoryThesisModal.vue @@ -13,6 +13,9 @@ + + + educationDocumentList; - } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationCourseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationCourseMapper.java index 6cfeef9..a7586b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationCourseMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationCourseMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 课程安排表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationCourseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationDocumentMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationDocumentMapper.java index c38a748..bacf65e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationDocumentMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationDocumentMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 附加材料表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationDocumentMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationPeriodicalMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationPeriodicalMapper.java index 5e72b94..ad467a1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationPeriodicalMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationPeriodicalMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 期刊推荐表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationPeriodicalMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTargetMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTargetMapper.java index 0c437e7..fccf735 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTargetMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTargetMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 发表方向表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationTargetMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTeacherMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTeacherMapper.java index 7488dff..c96ef61 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTeacherMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationTeacherMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 师资力量表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationTeacherMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationThesisMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationThesisMapper.java index 2342589..9da3b8b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationThesisMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationThesisMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface EducationThesisMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationCourseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationCourseService.java index e3ffba4..08d9bf5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationCourseService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationCourseService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 课程安排表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationCourseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationDocumentService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationDocumentService.java index 7b29276..3eb0332 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationDocumentService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationDocumentService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 附加材料表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationDocumentService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationPeriodicalService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationPeriodicalService.java index da2ce47..a7c5bcd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationPeriodicalService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationPeriodicalService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 期刊推荐表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationPeriodicalService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTargetService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTargetService.java index 259bc4e..3fb95ae 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTargetService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTargetService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 发表方向表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationTargetService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTeacherService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTeacherService.java index 2aa2f34..1781543 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTeacherService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationTeacherService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 师资力量表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationTeacherService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationThesisService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationThesisService.java index b0475f3..13060c4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationThesisService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationThesisService.java @@ -14,7 +14,7 @@ import java.util.List; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ public interface IEducationThesisService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationCourseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationCourseServiceImpl.java index 73a6e97..0fda849 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationCourseServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationCourseServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 课程安排表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationDocumentServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationDocumentServiceImpl.java index 8a955a7..8bcae7b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationDocumentServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationDocumentServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 附加材料表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationPeriodicalServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationPeriodicalServiceImpl.java index 46e4b35..3b7e1c1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationPeriodicalServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationPeriodicalServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 期刊推荐表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTargetServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTargetServiceImpl.java index f9a74ab..acfde70 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTargetServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTargetServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 发表方向表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTeacherServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTeacherServiceImpl.java index 00606de..f135056 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTeacherServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationTeacherServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 师资力量表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationThesisServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationThesisServiceImpl.java index 7b07744..9d5b137 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationThesisServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationThesisServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vo/EducationThesisPage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vo/EducationThesisPage.java index aae5984..a67632f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vo/EducationThesisPage.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vo/EducationThesisPage.java @@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-07-24 + * @Date: 2025-07-28 * @Version: V1.0 */ @Data @@ -71,6 +71,14 @@ public class EducationThesisPage { @Excel(name = "适用人群", width = 15) @ApiModelProperty(value = "适用人群") private java.lang.String suit; + /**海报图片*/ + @Excel(name = "海报图片", width = 15) + @ApiModelProperty(value = "海报图片") + private java.lang.String paperImage; + /**海报文字描述*/ + @Excel(name = "海报文字描述", width = 15) + @ApiModelProperty(value = "海报文字描述") + private java.lang.String paperDesc; @ExcelCollection(name="发表方向表") @ApiModelProperty(value = "发表方向表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/EducationThesisList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/EducationThesisList.vue index 8c71ebf..89eafe4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/EducationThesisList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/EducationThesisList.vue @@ -158,6 +158,17 @@ dataIndex: 'suit', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'海报图片', + align:"center", + dataIndex: 'paperImage', + scopedSlots: {customRender: 'imgSlot'} + }, + { + title:'海报文字描述', + align:"center", + dataIndex: 'paperDesc' + }, { title: '操作', dataIndex: 'action', @@ -199,6 +210,8 @@ fieldList.push({type:'Text',value:'image',text:'封面',dictCode:''}) fieldList.push({type:'Text',value:'process',text:'发表全流程辅导',dictCode:''}) fieldList.push({type:'Text',value:'suit',text:'适用人群',dictCode:''}) + fieldList.push({type:'Text',value:'paperImage',text:'海报图片',dictCode:''}) + fieldList.push({type:'Text',value:'paperDesc',text:'海报文字描述',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/modules/EducationThesisForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/modules/EducationThesisForm.vue index 2a36431..5a67070 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/modules/EducationThesisForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/vue/modules/EducationThesisForm.vue @@ -39,6 +39,16 @@ + + + + + + + + + +