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 9a4d5ca..9002b24 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-13 + * @Date: 2025-09-15 * @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 76cf456..3c8a455 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-13 + * @Date: 2025-09-15 * @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 6cc0bb9..f096956 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-13 + * @Date: 2025-09-15 * @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 c81e1dc..8e6a598 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-13 + * @Date: 2025-09-15 * @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 431eb37..dea526a 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-13 + * @Date: 2025-09-15 * @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 5bd69d3..4814737 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-13 + * @Date: 2025-09-15 * @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 49a45b3..589eb2b 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-13 + * @Date: 2025-09-15 * @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 6369830..b34e32e 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-13 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="education_thesis对象", description="论文信息表") @@ -54,6 +54,10 @@ public class EducationThesis implements Serializable { @Dict(dictTable = "education_category_thesis", dicText = "title", dicCode = "id") @ApiModelProperty(value = "二级分类") private java.lang.String categoryTwo; + /**封面/海报图片*/ + @Excel(name = "封面/海报图片", width = 15) + @ApiModelProperty(value = "封面/海报图片") + private java.lang.String paperImage; /**标题*/ @Excel(name = "标题", width = 15) @ApiModelProperty(value = "标题") @@ -66,26 +70,14 @@ public class EducationThesis implements Serializable { @Excel(name = "详情页图片", width = 15) @ApiModelProperty(value = "详情页图片") private java.lang.String image; - /**发表全流程辅导*/ - @Excel(name = "发表全流程辅导", width = 15) - @ApiModelProperty(value = "发表全流程辅导") - private java.lang.String process; - /**适用人群*/ - @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; /**模块一标题*/ @Excel(name = "模块一标题", width = 15) @ApiModelProperty(value = "模块一标题") private java.lang.String processTitle; + /**发表全流程辅导*/ + @Excel(name = "发表全流程辅导", width = 15) + @ApiModelProperty(value = "发表全流程辅导") + private java.lang.String process; /**模块二标题*/ @Excel(name = "模块二标题", width = 15) @ApiModelProperty(value = "模块二标题") @@ -102,6 +94,10 @@ public class EducationThesis implements Serializable { @Excel(name = "模块五标题", width = 15) @ApiModelProperty(value = "模块五标题") private java.lang.String suitTitle; + /**适用人群*/ + @Excel(name = "适用人群", width = 15) + @ApiModelProperty(value = "适用人群") + private java.lang.String suit; /**模块六标题*/ @Excel(name = "模块六标题", width = 15) @ApiModelProperty(value = "模块六标题") @@ -110,6 +106,15 @@ public class EducationThesis implements Serializable { @Excel(name = "模块七标题", width = 15) @ApiModelProperty(value = "模块七标题") private java.lang.String documentTitle; + /**海报文字描述*/ + @Excel(name = "海报文字描述", width = 15) + @ApiModelProperty(value = "海报文字描述") + private java.lang.String paperDesc; + /**标签*/ + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private java.lang.String tag; + //发表全流程辅导 @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 d10fb77..dbf2d1a 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-13 + * @Date: 2025-09-15 * @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 cab97c8..555d8d9 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-13 + * @Date: 2025-09-15 * @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 cbaf1b1..b6fc0e4 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-13 + * @Date: 2025-09-15 * @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 13dc86f..9b8ff7f 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-13 + * @Date: 2025-09-15 * @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 898a8d5..c386ea8 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-13 + * @Date: 2025-09-15 * @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 b4389e5..1f27a02 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-13 + * @Date: 2025-09-15 * @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 749d9d6..301b836 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-13 + * @Date: 2025-09-15 * @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 b87b540..cf172ea 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-13 + * @Date: 2025-09-15 * @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 8bd144e..e548aa2 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-13 + * @Date: 2025-09-15 * @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 b77bc56..fa9f6b5 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-13 + * @Date: 2025-09-15 * @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 283e3f8..7588b5d 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-13 + * @Date: 2025-09-15 * @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 1af3204..751fc50 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-13 + * @Date: 2025-09-15 * @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 b510af9..467dfe4 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-13 + * @Date: 2025-09-15 * @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 3f3bce0..c4913ae 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-13 + * @Date: 2025-09-15 * @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 934e73a..24ccf4d 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-13 + * @Date: 2025-09-15 * @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 950c52f..558d698 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-13 + * @Date: 2025-09-15 * @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 5f42255..5c7de52 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-13 + * @Date: 2025-09-15 * @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 a468578..b278d7c 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-13 + * @Date: 2025-09-15 * @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 fa27ccc..1205c62 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-13 + * @Date: 2025-09-15 * @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 a78426a..4cc071c 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-13 + * @Date: 2025-09-15 * @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 19c748f..7711e9a 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-13 + * @Date: 2025-09-15 * @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 4129c22..9b19d11 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-13 + * @Date: 2025-09-15 * @Version: V1.0 */ @Data @@ -53,6 +53,10 @@ public class EducationThesisPage { @Dict(dictTable = "education_category_thesis", dicText = "title", dicCode = "id") @ApiModelProperty(value = "二级分类") private java.lang.String categoryTwo; + /**封面/海报图片*/ + @Excel(name = "封面/海报图片", width = 15) + @ApiModelProperty(value = "封面/海报图片") + private java.lang.String paperImage; /**标题*/ @Excel(name = "标题", width = 15) @ApiModelProperty(value = "标题") @@ -65,26 +69,14 @@ public class EducationThesisPage { @Excel(name = "详情页图片", width = 15) @ApiModelProperty(value = "详情页图片") private java.lang.String image; - /**发表全流程辅导*/ - @Excel(name = "发表全流程辅导", width = 15) - @ApiModelProperty(value = "发表全流程辅导") - private java.lang.String process; - /**适用人群*/ - @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; /**模块一标题*/ @Excel(name = "模块一标题", width = 15) @ApiModelProperty(value = "模块一标题") private java.lang.String processTitle; + /**发表全流程辅导*/ + @Excel(name = "发表全流程辅导", width = 15) + @ApiModelProperty(value = "发表全流程辅导") + private java.lang.String process; /**模块二标题*/ @Excel(name = "模块二标题", width = 15) @ApiModelProperty(value = "模块二标题") @@ -101,6 +93,10 @@ public class EducationThesisPage { @Excel(name = "模块五标题", width = 15) @ApiModelProperty(value = "模块五标题") private java.lang.String suitTitle; + /**适用人群*/ + @Excel(name = "适用人群", width = 15) + @ApiModelProperty(value = "适用人群") + private java.lang.String suit; /**模块六标题*/ @Excel(name = "模块六标题", width = 15) @ApiModelProperty(value = "模块六标题") @@ -109,6 +105,14 @@ public class EducationThesisPage { @Excel(name = "模块七标题", width = 15) @ApiModelProperty(value = "模块七标题") private java.lang.String documentTitle; + /**海报文字描述*/ + @Excel(name = "海报文字描述", width = 15) + @ApiModelProperty(value = "海报文字描述") + private java.lang.String paperDesc; + /**标签*/ + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private java.lang.String tag; @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 6716820..0fb02cb 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 @@ -151,6 +151,12 @@ align:"center", dataIndex: 'categoryTwo_dictText' }, + { + title:'封面/海报图片', + align:"center", + dataIndex: 'paperImage', + scopedSlots: {customRender: 'imgSlot'} + }, { title:'标题', align:"center", @@ -168,33 +174,16 @@ scopedSlots: {customRender: 'imgSlot'} }, { - title:'发表全流程辅导', + title:'模块一标题', align:"center", - dataIndex: 'process', - scopedSlots: {customRender: 'htmlSlot'} + dataIndex: 'processTitle' }, { - title:'适用人群', + title:'发表全流程辅导', align:"center", - dataIndex: 'suit', + dataIndex: 'process', scopedSlots: {customRender: 'htmlSlot'} }, - { - title:'封面/海报图片', - align:"center", - dataIndex: 'paperImage', - scopedSlots: {customRender: 'imgSlot'} - }, - { - title:'海报文字描述', - align:"center", - dataIndex: 'paperDesc' - }, - { - title:'模块一标题', - align:"center", - dataIndex: 'processTitle' - }, { title:'模块二标题', align:"center", @@ -215,6 +204,12 @@ align:"center", dataIndex: 'suitTitle' }, + { + title:'适用人群', + align:"center", + dataIndex: 'suit', + scopedSlots: {customRender: 'htmlSlot'} + }, { title:'模块六标题', align:"center", @@ -225,6 +220,11 @@ align:"center", dataIndex: 'documentTitle' }, + { + title:'标签', + align:"center", + dataIndex: 'tag' + }, { title: '操作', dataIndex: 'action', @@ -261,20 +261,20 @@ let fieldList=[]; fieldList.push({type:'string',value:'categoryOne',text:'一级分类'}) fieldList.push({type:'string',value:'categoryTwo',text:'二级分类',dictCode:"education_category_thesis,title,id"}) + fieldList.push({type:'Text',value:'paperImage',text:'封面/海报图片',dictCode:''}) fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'shortTitle',text:'副标题',dictCode:''}) 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:''}) fieldList.push({type:'Text',value:'processTitle',text:'模块一标题',dictCode:''}) + fieldList.push({type:'Text',value:'process',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:'suit',text:'适用人群',dictCode:''}) fieldList.push({type:'Text',value:'periodicalTitle',text:'模块六标题',dictCode:''}) fieldList.push({type:'Text',value:'documentTitle',text:'模块七标题',dictCode:''}) + fieldList.push({type:'Text',value:'tag',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 cb29349..a9ad807 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 @@ -14,6 +14,11 @@ + + + + + @@ -30,28 +35,13 @@ - - - - - - - - - - - - - - - - - + + - - + + @@ -74,6 +64,11 @@ + + + + + @@ -84,6 +79,11 @@ + + + + + @@ -188,6 +188,13 @@ sm: { span: 16 }, }, model:{ + processTitle:"发表全流程辅导", + targetTitle:"发表方向", + teacherTitle:"师资介绍", + courseTitle:"课程安排", + suitTitle:"适用人群", + periodicalTitle:"期刊推荐", + documentTitle:"附加材料", }, // 新增时子表默认添加几行空数据 addDefaultRowNum: 1, diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/controller/EducationThesisTwoController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/controller/EducationThesisTwoController.java index 1828ddc..48b602c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/controller/EducationThesisTwoController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/controller/EducationThesisTwoController.java @@ -49,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 论文信息表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @Api(tags="论文信息表二") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationDocumentTwo.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationDocumentTwo.java index c24b1de..abf1227 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationDocumentTwo.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationDocumentTwo.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 附加材料表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="education_document_two对象", description="附加材料表二") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelOne.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelOne.java index a137636..cf5afbd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelOne.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelOne.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 表格一 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="education_excel_one对象", description="表格一") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelTwo.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelTwo.java index 5528e60..19d645d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelTwo.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationExcelTwo.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 表格二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="education_excel_two对象", description="表格二") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationThesisTwo.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationThesisTwo.java index 90e96ac..c5a0e25 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationThesisTwo.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/entity/EducationThesisTwo.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 论文信息表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @ApiModel(value="education_thesis_two对象", description="论文信息表二") @@ -133,6 +133,11 @@ public class EducationThesisTwo implements Serializable { @Excel(name = "表格标题二", width = 15) @ApiModelProperty(value = "表格标题二") private java.lang.String titleExcelTwo; + /**标签*/ + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private java.lang.String tag; + //表格一 @TableField(exist = false) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationDocumentTwoMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationDocumentTwoMapper.java index 6758cd6..075aa60 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationDocumentTwoMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationDocumentTwoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 附加材料表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface EducationDocumentTwoMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelOneMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelOneMapper.java index e89d598..40357d8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelOneMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelOneMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 表格一 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface EducationExcelOneMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelTwoMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelTwoMapper.java index b20bcc8..80476fa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelTwoMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationExcelTwoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 表格二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface EducationExcelTwoMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationThesisTwoMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationThesisTwoMapper.java index 1e53ff4..b0dd709 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationThesisTwoMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/mapper/EducationThesisTwoMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 论文信息表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface EducationThesisTwoMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationDocumentTwoService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationDocumentTwoService.java index ce982b1..d460baf 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationDocumentTwoService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationDocumentTwoService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 附加材料表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IEducationDocumentTwoService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelOneService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelOneService.java index b437d30..02f28c9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelOneService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelOneService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 表格一 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IEducationExcelOneService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelTwoService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelTwoService.java index 1fb19e3..b5550be 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelTwoService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationExcelTwoService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 表格二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IEducationExcelTwoService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationThesisTwoService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationThesisTwoService.java index 7b694d1..71d8b72 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationThesisTwoService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/IEducationThesisTwoService.java @@ -12,7 +12,7 @@ import java.util.List; /** * @Description: 论文信息表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ public interface IEducationThesisTwoService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationDocumentTwoServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationDocumentTwoServiceImpl.java index 336f239..b5ea8af 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationDocumentTwoServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationDocumentTwoServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 附加材料表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelOneServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelOneServiceImpl.java index 84a7b9a..7db05de 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelOneServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelOneServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 表格一 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelTwoServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelTwoServiceImpl.java index 2485e80..c094e2c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelTwoServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationExcelTwoServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 表格二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationThesisTwoServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationThesisTwoServiceImpl.java index 8ef316f..be9715b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationThesisTwoServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/service/impl/EducationThesisTwoServiceImpl.java @@ -20,7 +20,7 @@ import java.util.Collection; /** * @Description: 论文信息表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vo/EducationThesisTwoPage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vo/EducationThesisTwoPage.java index f4bcd23..aa8cd63 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vo/EducationThesisTwoPage.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vo/EducationThesisTwoPage.java @@ -19,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 论文信息表二 * @Author: jeecg-boot - * @Date: 2025-08-12 + * @Date: 2025-09-15 * @Version: V1.0 */ @Data @@ -129,6 +129,10 @@ public class EducationThesisTwoPage { @Excel(name = "表格标题二", width = 15) @ApiModelProperty(value = "表格标题二") private java.lang.String titleExcelTwo; + /**标签*/ + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private java.lang.String tag; @ExcelCollection(name="表格一") @ApiModelProperty(value = "表格一") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/EducationThesisTwoList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/EducationThesisTwoList.vue index 560f910..b9f4af9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/EducationThesisTwoList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/EducationThesisTwoList.vue @@ -239,6 +239,11 @@ align:"center", dataIndex: 'titleExcelTwo' }, + { + title:'标签', + align:"center", + dataIndex: 'tag' + }, { title: '操作', dataIndex: 'action', @@ -295,6 +300,7 @@ fieldList.push({type:'Text',value:'cotentModuleSeven',text:'模块内容七',dictCode:''}) fieldList.push({type:'Text',value:'titleExcelOne',text:'表格标题一',dictCode:''}) fieldList.push({type:'Text',value:'titleExcelTwo',text:'表格标题二',dictCode:''}) + fieldList.push({type:'Text',value:'tag',text:'标签',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/modules/EducationThesisTwoForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/modules/EducationThesisTwoForm.vue index da89644..4cefb90 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/modules/EducationThesisTwoForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue/modules/EducationThesisTwoForm.vue @@ -114,6 +114,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.api.ts new file mode 100644 index 0000000..90af8da --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.api.ts @@ -0,0 +1,80 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/educationThesisTwo/educationThesisTwo/list', + save='/educationThesisTwo/educationThesisTwo/add', + edit='/educationThesisTwo/educationThesisTwo/edit', + deleteOne = '/educationThesisTwo/educationThesisTwo/delete', + deleteBatch = '/educationThesisTwo/educationThesisTwo/deleteBatch', + importExcel = '/educationThesisTwo/educationThesisTwo/importExcel', + exportXls = '/educationThesisTwo/educationThesisTwo/exportXls', + educationExcelOneList = '/educationThesisTwo/educationThesisTwo/queryEducationExcelOneByMainId', + educationExcelTwoList = '/educationThesisTwo/educationThesisTwo/queryEducationExcelTwoByMainId', + educationDocumentTwoList = '/educationThesisTwo/educationThesisTwo/queryEducationDocumentTwoByMainId', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 查询子表数据 + * @param params + */ +export const educationExcelOneList = Api.educationExcelOneList; +/** + * 查询子表数据 + * @param params + */ +export const educationExcelTwoList = Api.educationExcelTwoList; +/** + * 查询子表数据 + * @param params + */ +export const educationDocumentTwoList = Api.educationDocumentTwoList; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.data.ts new file mode 100644 index 0000000..7ad0b31 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwo.data.ts @@ -0,0 +1,318 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types' +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '一级分类', + align:"center", + dataIndex: 'categoryOne' + }, + { + title: '二级分类', + align:"center", + dataIndex: 'categoryTwo_dictText' + }, + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '副标题', + align:"center", + dataIndex: 'shortTitle' + }, + { + title: '封面/海报图片', + align:"center", + dataIndex: 'paperImage', + customRender:render.renderAvatar, + }, + { + title: '详情页图片', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '模块标题一', + align:"center", + dataIndex: 'titleModuleOne' + }, + { + title: '模块内容一', + align:"center", + dataIndex: 'cotentModuleOne', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '模块标题二', + align:"center", + dataIndex: 'titleModuleTwo' + }, + { + title: '模块内容二', + align:"center", + dataIndex: 'cotentModuleTwo', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '模块标题三', + align:"center", + dataIndex: 'titleModuleThree' + }, + { + title: '模块内容三', + align:"center", + dataIndex: 'cotentModuleThree', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '模块标题四', + align:"center", + dataIndex: 'titleModuleFour' + }, + { + title: '模块内容四', + align:"center", + dataIndex: 'cotentModuleFour', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '模块标题五', + align:"center", + dataIndex: 'titleModuleFive' + }, + { + title: '模块内容五', + align:"center", + dataIndex: 'cotentModuleFive', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '模块标题六', + align:"center", + dataIndex: 'titleModuleSix' + }, + { + title: '模块内容六', + align:"center", + dataIndex: 'cotentModuleSix', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '模块标题七', + align:"center", + dataIndex: 'titleModuleSeven' + }, + { + title: '模块内容七', + align:"center", + dataIndex: 'cotentModuleSeven', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '表格标题一', + align:"center", + dataIndex: 'titleExcelOne' + }, + { + title: '表格标题二', + align:"center", + dataIndex: 'titleExcelTwo' + }, + { + title: '标签', + align:"center", + dataIndex: 'tag' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '一级分类', + field: 'categoryOne', + component: 'Input', + }, + { + label: '二级分类', + field: 'categoryTwo', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"" + }, + }, + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '副标题', + field: 'shortTitle', + component: 'Input', + }, + { + label: '封面/海报图片', + field: 'paperImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '详情页图片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '模块标题一', + field: 'titleModuleOne', + component: 'Input', + }, + { + label: '模块内容一', + field: 'cotentModuleOne', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '模块标题二', + field: 'titleModuleTwo', + component: 'Input', + }, + { + label: '模块内容二', + field: 'cotentModuleTwo', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '模块标题三', + field: 'titleModuleThree', + component: 'Input', + }, + { + label: '模块内容三', + field: 'cotentModuleThree', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '模块标题四', + field: 'titleModuleFour', + component: 'Input', + }, + { + label: '模块内容四', + field: 'cotentModuleFour', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '模块标题五', + field: 'titleModuleFive', + component: 'Input', + }, + { + label: '模块内容五', + field: 'cotentModuleFive', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '模块标题六', + field: 'titleModuleSix', + component: 'Input', + }, + { + label: '模块内容六', + field: 'cotentModuleSix', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '模块标题七', + field: 'titleModuleSeven', + component: 'Input', + }, + { + label: '模块内容七', + field: 'cotentModuleSeven', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '表格标题一', + field: 'titleExcelOne', + component: 'Input', + }, + { + label: '表格标题二', + field: 'titleExcelTwo', + component: 'Input', + }, + { + label: '标签', + field: 'tag', + component: 'Input', + }, +]; +//子表单数据 +//子表表格配置 +export const educationExcelOneColumns: JVxeColumn[] = [ + { + title: '第一列', + key: 'columnOne', + type: JVxeTypes.textarea, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '第二列', + key: 'columnTwo', + type: JVxeTypes.textarea, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + ] +export const educationExcelTwoColumns: JVxeColumn[] = [ + { + title: '第一列', + key: 'columnOne', + type: JVxeTypes.textarea, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '第二列', + key: 'columnTwo', + type: JVxeTypes.textarea, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + ] +export const educationDocumentTwoColumns: JVxeColumn[] = [ + { + title: '标题', + key: 'title', + type: JVxeTypes.input, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '文件', + key: 'document', + type: JVxeTypes.file, + token:true, + responseName:"message", + width:"200px", + placeholder: '请选择文件', + defaultValue:'', + }, + ] diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwoList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwoList.vue new file mode 100644 index 0000000..2c18fef --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/EducationThesisTwoList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/components/EducationThesisTwoModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/components/EducationThesisTwoModal.vue new file mode 100644 index 0000000..c981b74 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/educationThesisTwo/vue3/components/EducationThesisTwoModal.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file