From 1d0deecd11a4b12a1a1146f242664d5f6a0d7ff4 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 13 Aug 2025 16:15:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=BA=95?= =?UTF-8?q?=E8=89=B2=E8=B0=83=E6=95=B4=E4=B8=BA=E9=80=8F=E6=98=8E=202?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E8=88=AA=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=AE=BA=E6=96=87=E9=A1=B9=E7=9B=AE=E5=86=85=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EducationThesisController.java | 2 +- .../educationThesis/entity/EducationCourse.java | 2 +- .../educationThesis/entity/EducationDocument.java | 2 +- .../entity/EducationPeriodical.java | 2 +- .../educationThesis/entity/EducationProcess.java | 2 +- .../educationThesis/entity/EducationTarget.java | 2 +- .../educationThesis/entity/EducationTeacher.java | 2 +- .../educationThesis/entity/EducationThesis.java | 30 +++++++++++++++- .../mapper/EducationCourseMapper.java | 2 +- .../mapper/EducationDocumentMapper.java | 2 +- .../mapper/EducationPeriodicalMapper.java | 2 +- .../mapper/EducationProcessMapper.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/IEducationProcessService.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/EducationProcessServiceImpl.java | 2 +- .../service/impl/EducationTargetServiceImpl.java | 2 +- .../service/impl/EducationTeacherServiceImpl.java | 2 +- .../service/impl/EducationThesisServiceImpl.java | 2 +- .../educationThesis/vo/EducationThesisPage.java | 30 +++++++++++++++- .../educationThesis/vue/EducationThesisList.vue | 42 ++++++++++++++++++++++ .../vue/modules/EducationThesisForm.vue | 35 ++++++++++++++++++ .../api/service/impl/ConfigServiceImpl.java | 3 +- 33 files changed, 165 insertions(+), 31 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/controller/EducationThesisController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/controller/EducationThesisController.java index 902852d..9a4d5ca 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/controller/EducationThesisController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/controller/EducationThesisController.java @@ -55,7 +55,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @Api(tags="论文信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationCourse.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationCourse.java index f92f2bd..76cf456 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationCourse.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationCourse.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 课程安排表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @ApiModel(value="education_course对象", description="课程安排表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationDocument.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationDocument.java index 789264a..6cc0bb9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationDocument.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationDocument.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 附加材料表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @ApiModel(value="education_document对象", description="附加材料表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationPeriodical.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationPeriodical.java index 91a7884..c81e1dc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationPeriodical.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationPeriodical.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 期刊推荐表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @ApiModel(value="education_periodical对象", description="期刊推荐表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationProcess.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationProcess.java index d19e591..431eb37 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationProcess.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationProcess.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 发表全流程辅导 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @ApiModel(value="education_process对象", description="发表全流程辅导") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTarget.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTarget.java index 99bc814..5bd69d3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTarget.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTarget.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 发表方向表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @ApiModel(value="education_target对象", description="发表方向表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTeacher.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTeacher.java index 9d6c54e..49a45b3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTeacher.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationTeacher.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 师资力量表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @ApiModel(value="education_teacher对象", description="师资力量表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationThesis.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationThesis.java index 4cf1f0f..6369830 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationThesis.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/entity/EducationThesis.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @ApiModel(value="education_thesis对象", description="论文信息表") @@ -82,6 +82,34 @@ public class EducationThesis implements Serializable { @Excel(name = "海报文字描述", width = 15) @ApiModelProperty(value = "海报文字描述") private java.lang.String paperDesc; + /**模块一标题*/ + @Excel(name = "模块一标题", width = 15) + @ApiModelProperty(value = "模块一标题") + private java.lang.String processTitle; + /**模块二标题*/ + @Excel(name = "模块二标题", width = 15) + @ApiModelProperty(value = "模块二标题") + private java.lang.String targetTitle; + /**模块三标题*/ + @Excel(name = "模块三标题", width = 15) + @ApiModelProperty(value = "模块三标题") + private java.lang.String teacherTitle; + /**模块四标题*/ + @Excel(name = "模块四标题", width = 15) + @ApiModelProperty(value = "模块四标题") + private java.lang.String courseTitle; + /**模块五标题*/ + @Excel(name = "模块五标题", width = 15) + @ApiModelProperty(value = "模块五标题") + private java.lang.String suitTitle; + /**模块六标题*/ + @Excel(name = "模块六标题", width = 15) + @ApiModelProperty(value = "模块六标题") + private java.lang.String periodicalTitle; + /**模块七标题*/ + @Excel(name = "模块七标题", width = 15) + @ApiModelProperty(value = "模块七标题") + private java.lang.String documentTitle; //发表全流程辅导 @TableField(exist = false) 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 6aae4b5..d10fb77 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-08-12 + * @Date: 2025-08-13 * @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 085191e..cab97c8 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-08-12 + * @Date: 2025-08-13 * @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 15c42e3..cbaf1b1 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-08-12 + * @Date: 2025-08-13 * @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/EducationProcessMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationProcessMapper.java index 822a4f8..13dc86f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationProcessMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/mapper/EducationProcessMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 发表全流程辅导 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ public interface EducationProcessMapper 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 e9f6435..898a8d5 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-08-12 + * @Date: 2025-08-13 * @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 42be1f2..b4389e5 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-08-12 + * @Date: 2025-08-13 * @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 bfc5ef2..749d9d6 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-08-12 + * @Date: 2025-08-13 * @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 8084e0a..b87b540 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-08-12 + * @Date: 2025-08-13 * @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 d562fb5..8bd144e 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-08-12 + * @Date: 2025-08-13 * @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 523b9d0..b77bc56 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-08-12 + * @Date: 2025-08-13 * @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/IEducationProcessService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationProcessService.java index 09e724a..283e3f8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationProcessService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/IEducationProcessService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 发表全流程辅导 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ public interface IEducationProcessService 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 d4423ec..1af3204 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-08-12 + * @Date: 2025-08-13 * @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 3d8d7a5..b510af9 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-08-12 + * @Date: 2025-08-13 * @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 36bd123..3f3bce0 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 @@ -15,7 +15,7 @@ import java.util.List; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @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 a5f438e..934e73a 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-08-12 + * @Date: 2025-08-13 * @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 b76ec85..950c52f 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-08-12 + * @Date: 2025-08-13 * @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 c0fb9d3..5f42255 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-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationProcessServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationProcessServiceImpl.java index b03840f..a468578 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationProcessServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesis/service/impl/EducationProcessServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 发表全流程辅导 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @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 275039c..fa27ccc 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-08-12 + * @Date: 2025-08-13 * @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 35b3c24..a78426a 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-08-12 + * @Date: 2025-08-13 * @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 e972775..19c748f 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 @@ -26,7 +26,7 @@ import java.util.Collection; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @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 0236cf2..4129c22 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 @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 论文信息表 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-08-13 * @Version: V1.0 */ @Data @@ -81,6 +81,34 @@ public class EducationThesisPage { @Excel(name = "海报文字描述", width = 15) @ApiModelProperty(value = "海报文字描述") private java.lang.String paperDesc; + /**模块一标题*/ + @Excel(name = "模块一标题", width = 15) + @ApiModelProperty(value = "模块一标题") + private java.lang.String processTitle; + /**模块二标题*/ + @Excel(name = "模块二标题", width = 15) + @ApiModelProperty(value = "模块二标题") + private java.lang.String targetTitle; + /**模块三标题*/ + @Excel(name = "模块三标题", width = 15) + @ApiModelProperty(value = "模块三标题") + private java.lang.String teacherTitle; + /**模块四标题*/ + @Excel(name = "模块四标题", width = 15) + @ApiModelProperty(value = "模块四标题") + private java.lang.String courseTitle; + /**模块五标题*/ + @Excel(name = "模块五标题", width = 15) + @ApiModelProperty(value = "模块五标题") + private java.lang.String suitTitle; + /**模块六标题*/ + @Excel(name = "模块六标题", width = 15) + @ApiModelProperty(value = "模块六标题") + private java.lang.String periodicalTitle; + /**模块七标题*/ + @Excel(name = "模块七标题", width = 15) + @ApiModelProperty(value = "模块七标题") + private java.lang.String documentTitle; @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 fd9d3f7..6716820 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 @@ -190,6 +190,41 @@ align:"center", dataIndex: 'paperDesc' }, + { + title:'模块一标题', + align:"center", + dataIndex: 'processTitle' + }, + { + title:'模块二标题', + align:"center", + dataIndex: 'targetTitle' + }, + { + title:'模块三标题', + align:"center", + dataIndex: 'teacherTitle' + }, + { + title:'模块四标题', + align:"center", + dataIndex: 'courseTitle' + }, + { + title:'模块五标题', + align:"center", + dataIndex: 'suitTitle' + }, + { + title:'模块六标题', + align:"center", + dataIndex: 'periodicalTitle' + }, + { + title:'模块七标题', + align:"center", + dataIndex: 'documentTitle' + }, { title: '操作', dataIndex: 'action', @@ -233,6 +268,13 @@ fieldList.push({type:'Text',value:'suit',text:'适用人群',dictCode:''}) fieldList.push({type:'Text',value:'paperImage',text:'封面/海报图片',dictCode:''}) fieldList.push({type:'Text',value:'paperDesc',text:'海报文字描述',dictCode:''}) + fieldList.push({type:'Text',value:'processTitle',text:'模块一标题',dictCode:''}) + fieldList.push({type:'Text',value:'targetTitle',text:'模块二标题',dictCode:''}) + fieldList.push({type:'Text',value:'teacherTitle',text:'模块三标题',dictCode:''}) + fieldList.push({type:'Text',value:'courseTitle',text:'模块四标题',dictCode:''}) + fieldList.push({type:'Text',value:'suitTitle',text:'模块五标题',dictCode:''}) + fieldList.push({type:'Text',value:'periodicalTitle',text:'模块六标题',dictCode:''}) + fieldList.push({type:'Text',value:'documentTitle',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 2ad6960..cb29349 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 @@ -49,6 +49,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java index 8d002ef..5ab9e10 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java @@ -420,6 +420,7 @@ public class ConfigServiceImpl implements ConfigService { line_color.put("g", 0); line_color.put("b", 0); param.put("line_color", line_color); + param.put("is_hyaline", true); MultiValueMap headers = new LinkedMultiValueMap<>(); org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers); ResponseEntity entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]); @@ -512,7 +513,7 @@ public class ConfigServiceImpl implements ConfigService { */ private String uploadAliYunOss(MultipartFile mf) throws Exception { String uploadFile = "education"; - String fileName = new StringBuffer(mf.getOriginalFilename()).append(".jpg").toString();// 获取文件名 + String fileName = new StringBuffer(mf.getOriginalFilename()).append(".png").toString();// 获取文件名 String dbpath = uploadFile + File.separator + fileName; if (dbpath.contains("\\")) { dbpath = dbpath.replace("\\", "/");