业务层次

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSubjectController.java

@@ -37,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "科目控制器", tags = {"科目管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/modules.course/subject")
+@RequestMapping("/course/subject")
 public class CourseSubjectController extends BaseController {
 
     private final ICourseSubjectService iCourseSubjectService;
@@ -46,7 +46,7 @@ public class CourseSubjectController extends BaseController {
      * 查询科目列表
      */
     @ApiOperation("查询科目列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:subject:list')")
+    @PreAuthorize("@ss.hasPermi('course:subject:list')")
     @GetMapping("/list")
     public TableDataInfo<CourseSubjectVo> list(CourseSubjectQueryBo bo) {
         startPage();
@@ -58,7 +58,7 @@ public class CourseSubjectController extends BaseController {
      * 导出科目列表
      */
     @ApiOperation("导出科目列表")
-    @PreAuthorize("@ss.hasPermi('modules.course:subject:export')")
+    @PreAuthorize("@ss.hasPermi('course:subject:export')")
     @Log(title = "科目", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<CourseSubjectVo> export(CourseSubjectQueryBo bo) {
@@ -71,7 +71,7 @@ public class CourseSubjectController extends BaseController {
      * 获取科目详细信息
      */
     @ApiOperation("获取科目详细信息")
-    @PreAuthorize("@ss.hasPermi('modules.course:subject:query')")
+    @PreAuthorize("@ss.hasPermi('course:subject:query')")
     @GetMapping("/{id}")
     public AjaxResult<CourseSubjectVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iCourseSubjectService.queryById(id));
@@ -81,7 +81,7 @@ public class CourseSubjectController extends BaseController {
      * 新增科目
      */
     @ApiOperation("新增科目")
-    @PreAuthorize("@ss.hasPermi('modules.course:subject:add')")
+    @PreAuthorize("@ss.hasPermi('course:subject:add')")
     @Log(title = "科目", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody CourseSubjectAddBo bo) {
@@ -92,7 +92,7 @@ public class CourseSubjectController extends BaseController {
      * 修改科目
      */
     @ApiOperation("修改科目")
-    @PreAuthorize("@ss.hasPermi('modules.course:subject:edit')")
+    @PreAuthorize("@ss.hasPermi('course:subject:edit')")
     @Log(title = "科目", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody CourseSubjectEditBo bo) {
@@ -103,7 +103,7 @@ public class CourseSubjectController extends BaseController {
      * 删除科目
      */
     @ApiOperation("删除科目")
-    @PreAuthorize("@ss.hasPermi('modules.course:subject:remove')")
+    @PreAuthorize("@ss.hasPermi('course:subject:remove')")
     @Log(title = "科目" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.course.vo.MajorVo;
+import com.zhongzheng.modules.course.bo.MajorQueryBo;
+import com.zhongzheng.modules.course.bo.MajorAddBo;
+import com.zhongzheng.modules.course.bo.MajorEditBo;
+import com.zhongzheng.modules.course.service.IMajorService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 专业Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Api(value = "专业控制器", tags = {"专业管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/major")
+public class MajorController extends BaseController {
+
+    private final IMajorService iMajorService;
+
+    /**
+     * 查询专业列表
+     */
+    @ApiOperation("查询专业列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:major:list')")
+    @GetMapping("/list")
+    public TableDataInfo<MajorVo> list(MajorQueryBo bo) {
+        startPage();
+        List<MajorVo> list = iMajorService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出专业列表
+     */
+    @ApiOperation("导出专业列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:major:export')")
+    @Log(title = "专业", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<MajorVo> export(MajorQueryBo bo) {
+        List<MajorVo> list = iMajorService.queryList(bo);
+        ExcelUtil<MajorVo> util = new ExcelUtil<MajorVo>(MajorVo.class);
+        return util.exportExcel(list, "专业");
+    }
+
+    /**
+     * 获取专业详细信息
+     */
+    @ApiOperation("获取专业详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.course:major:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<MajorVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iMajorService.queryById(id));
+    }
+
+    /**
+     * 新增专业
+     */
+    @ApiOperation("新增专业")
+    @PreAuthorize("@ss.hasPermi('modules.course:major:add')")
+    @Log(title = "专业", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody MajorAddBo bo) {
+        return toAjax(iMajorService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改专业
+     */
+    @ApiOperation("修改专业")
+    @PreAuthorize("@ss.hasPermi('modules.course:major:edit')")
+    @Log(title = "专业", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody MajorEditBo bo) {
+        return toAjax(iMajorService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除专业
+     */
+    @ApiOperation("删除专业")
+    @PreAuthorize("@ss.hasPermi('modules.course:major:remove')")
+    @Log(title = "专业" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iMajorService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorExamineController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.course.vo.MajorExamineVo;
+import com.zhongzheng.modules.course.bo.MajorExamineQueryBo;
+import com.zhongzheng.modules.course.bo.MajorExamineAddBo;
+import com.zhongzheng.modules.course.bo.MajorExamineEditBo;
+import com.zhongzheng.modules.course.service.IMajorExamineService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 考期Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Api(value = "考期控制器", tags = {"考期管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/examine")
+public class MajorExamineController extends BaseController {
+
+    private final IMajorExamineService iMajorExamineService;
+
+    /**
+     * 查询考期列表
+     */
+    @ApiOperation("查询考期列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:examine:list')")
+    @GetMapping("/list")
+    public TableDataInfo<MajorExamineVo> list(MajorExamineQueryBo bo) {
+        startPage();
+        List<MajorExamineVo> list = iMajorExamineService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出考期列表
+     */
+    @ApiOperation("导出考期列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:examine:export')")
+    @Log(title = "考期", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<MajorExamineVo> export(MajorExamineQueryBo bo) {
+        List<MajorExamineVo> list = iMajorExamineService.queryList(bo);
+        ExcelUtil<MajorExamineVo> util = new ExcelUtil<MajorExamineVo>(MajorExamineVo.class);
+        return util.exportExcel(list, "考期");
+    }
+
+    /**
+     * 获取考期详细信息
+     */
+    @ApiOperation("获取考期详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.course:examine:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<MajorExamineVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iMajorExamineService.queryById(id));
+    }
+
+    /**
+     * 新增考期
+     */
+    @ApiOperation("新增考期")
+    @PreAuthorize("@ss.hasPermi('modules.course:examine:add')")
+    @Log(title = "考期", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody MajorExamineAddBo bo) {
+        return toAjax(iMajorExamineService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改考期
+     */
+    @ApiOperation("修改考期")
+    @PreAuthorize("@ss.hasPermi('modules.course:examine:edit')")
+    @Log(title = "考期", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody MajorExamineEditBo bo) {
+        return toAjax(iMajorExamineService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除考期
+     */
+    @ApiOperation("删除考期")
+    @PreAuthorize("@ss.hasPermi('modules.course:examine:remove')")
+    @Log(title = "考期" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iMajorExamineService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorLabelController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.course.vo.MajorLabelVo;
+import com.zhongzheng.modules.course.bo.MajorLabelQueryBo;
+import com.zhongzheng.modules.course.bo.MajorLabelAddBo;
+import com.zhongzheng.modules.course.bo.MajorLabelEditBo;
+import com.zhongzheng.modules.course.service.IMajorLabelService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 标签Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Api(value = "标签控制器", tags = {"标签管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/label")
+public class MajorLabelController extends BaseController {
+
+    private final IMajorLabelService iMajorLabelService;
+
+    /**
+     * 查询标签列表
+     */
+    @ApiOperation("查询标签列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:label:list')")
+    @GetMapping("/list")
+    public TableDataInfo<MajorLabelVo> list(MajorLabelQueryBo bo) {
+        startPage();
+        List<MajorLabelVo> list = iMajorLabelService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出标签列表
+     */
+    @ApiOperation("导出标签列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:label:export')")
+    @Log(title = "标签", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<MajorLabelVo> export(MajorLabelQueryBo bo) {
+        List<MajorLabelVo> list = iMajorLabelService.queryList(bo);
+        ExcelUtil<MajorLabelVo> util = new ExcelUtil<MajorLabelVo>(MajorLabelVo.class);
+        return util.exportExcel(list, "标签");
+    }
+
+    /**
+     * 获取标签详细信息
+     */
+    @ApiOperation("获取标签详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.course:label:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<MajorLabelVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iMajorLabelService.queryById(id));
+    }
+
+    /**
+     * 新增标签
+     */
+    @ApiOperation("新增标签")
+    @PreAuthorize("@ss.hasPermi('modules.course:label:add')")
+    @Log(title = "标签", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody MajorLabelAddBo bo) {
+        return toAjax(iMajorLabelService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改标签
+     */
+    @ApiOperation("修改标签")
+    @PreAuthorize("@ss.hasPermi('modules.course:label:edit')")
+    @Log(title = "标签", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody MajorLabelEditBo bo) {
+        return toAjax(iMajorLabelService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除标签
+     */
+    @ApiOperation("删除标签")
+    @PreAuthorize("@ss.hasPermi('modules.course:label:remove')")
+    @Log(title = "标签" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iMajorLabelService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessQueryBo.java

@@ -51,4 +51,8 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	/**  状态 1正常 0关闭 */
 	@ApiModelProperty(" 状态 1正常 0关闭")
 	private List<Integer> status;
+
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Integer educationId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorAddBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 专业添加对象 major
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("专业添加对象")
+public class MajorAddBo {
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 分类名称 */
+    @ApiModelProperty("分类名称")
+    private String categoryName;
+    /** 专业介绍 */
+    @ApiModelProperty("专业介绍")
+    private String majorReferral;
+    /** 标签ID */
+    @ApiModelProperty("标签ID")
+    private Long labelId;
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+    /** 编码ZY */
+    @ApiModelProperty("编码ZY")
+    private String encoder;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorEditBo.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 专业编辑对象 major
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("专业编辑对象")
+public class MajorEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 分类名称 */
+    @ApiModelProperty("分类名称")
+    private String categoryName;
+
+    /** 专业介绍 */
+    @ApiModelProperty("专业介绍")
+    private String majorReferral;
+
+    /** 标签ID */
+    @ApiModelProperty("标签ID")
+    private Long labelId;
+
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+
+    /** 编码ZY */
+    @ApiModelProperty("编码ZY")
+    private String encoder;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorExamineAddBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 考期添加对象 major_examine
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("考期添加对象")
+public class MajorExamineAddBo {
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 考期名字 */
+    @ApiModelProperty("考期名字")
+    private Long examineName;
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+    /** 编码KQ */
+    @ApiModelProperty("编码KQ")
+    private String encoder;
+    /** 有效期开始 */
+    @ApiModelProperty("有效期开始")
+    private Long startTime;
+    /** 有效期结束 */
+    @ApiModelProperty("有效期结束")
+    private Long endTime;
+    /** 入学年份 */
+    @ApiModelProperty("入学年份")
+    private Integer enrollmentYear;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorExamineEditBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 考期编辑对象 major_examine
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("考期编辑对象")
+public class MajorExamineEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 考期名字 */
+    @ApiModelProperty("考期名字")
+    private Long examineName;
+
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+
+    /** 编码KQ */
+    @ApiModelProperty("编码KQ")
+    private String encoder;
+
+    /** 有效期开始 */
+    @ApiModelProperty("有效期开始")
+    private Long startTime;
+
+    /** 有效期结束 */
+    @ApiModelProperty("有效期结束")
+    private Long endTime;
+
+    /** 入学年份 */
+    @ApiModelProperty("入学年份")
+    private Integer enrollmentYear;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorExamineQueryBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 考期分页查询对象 major_examine
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考期分页查询对象")
+public class MajorExamineQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 考期名字 */
+	@ApiModelProperty("考期名字")
+	private Long examineName;
+	/** 1正常 0关闭 */
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 编码KQ */
+	@ApiModelProperty("编码KQ")
+	private String encoder;
+	/** 有效期开始 */
+	@ApiModelProperty("有效期开始")
+	private Long startTime;
+	/** 有效期结束 */
+	@ApiModelProperty("有效期结束")
+	private Long endTime;
+	/** 入学年份 */
+	@ApiModelProperty("入学年份")
+	private Integer enrollmentYear;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorLabelAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 标签添加对象 major_label
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("标签添加对象")
+public class MajorLabelAddBo {
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 标签名字 */
+    @ApiModelProperty("标签名字")
+    private Long labelName;
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+    /** 编码BQ */
+    @ApiModelProperty("编码BQ")
+    private String encoder;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorLabelEditBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 标签编辑对象 major_label
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("标签编辑对象")
+public class MajorLabelEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 标签名字 */
+    @ApiModelProperty("标签名字")
+    private Long labelName;
+
+    /** 1正常 0关闭 */
+    @ApiModelProperty("1正常 0关闭")
+    private Integer status;
+
+    /** 编码BQ */
+    @ApiModelProperty("编码BQ")
+    private String encoder;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorLabelQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 标签分页查询对象 major_label
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("标签分页查询对象")
+public class MajorLabelQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 标签名字 */
+	@ApiModelProperty("标签名字")
+	private Long labelName;
+	/** 1正常 0关闭 */
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 编码BQ */
+	@ApiModelProperty("编码BQ")
+	private String encoder;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorProjectAddBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 科目绑定项目添加对象 major_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("科目绑定项目添加对象")
+public class MajorProjectAddBo {
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+    /** 科目ID */
+    @ApiModelProperty("科目ID")
+    private Long subjectId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorProjectEditBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 科目绑定项目编辑对象 major_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("科目绑定项目编辑对象")
+public class MajorProjectEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 科目ID */
+    @ApiModelProperty("科目ID")
+    private Long subjectId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorProjectQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 科目绑定项目分页查询对象 major_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("科目绑定项目分页查询对象")
+public class MajorProjectQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 科目ID */
+	@ApiModelProperty("科目ID")
+	private Long subjectId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorQueryBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 专业分页查询对象 major
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("专业分页查询对象")
+public class MajorQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 分类名称 */
+	@ApiModelProperty("分类名称")
+	private String categoryName;
+	/** 专业介绍 */
+	@ApiModelProperty("专业介绍")
+	private String majorReferral;
+	/** 标签ID */
+	@ApiModelProperty("标签ID")
+	private Long labelId;
+	/** 1正常 0关闭 */
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 编码ZY */
+	@ApiModelProperty("编码ZY")
+	private String encoder;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Major.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.course.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 专业对象 major
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("major")
+public class Major implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 备注 */
+    private String remark;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 分类名称 */
+    private String categoryName;
+    /** 专业介绍 */
+    private String majorReferral;
+    /** 标签ID */
+    private Long labelId;
+    /** 1正常 0关闭 */
+    private Integer status;
+    /** 编码ZY */
+    private String encoder;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/MajorExamine.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.course.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 考期对象 major_examine
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("major_examine")
+public class MajorExamine implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 备注 */
+    private String remark;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 考期名字 */
+    private Long examineName;
+    /** 1正常 0关闭 */
+    private Integer status;
+    /** 编码KQ */
+    private String encoder;
+    /** 有效期开始 */
+    private Long startTime;
+    /** 有效期结束 */
+    private Long endTime;
+    /** 入学年份 */
+    private Integer enrollmentYear;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/MajorLabel.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.course.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 标签对象 major_label
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("major_label")
+public class MajorLabel implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 备注 */
+    private String remark;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 标签名字 */
+    private Long labelName;
+    /** 1正常 0关闭 */
+    private Integer status;
+    /** 编码BQ */
+    private String encoder;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/MajorProject.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.course.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 科目绑定项目对象 major_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("major_project")
+public class MajorProject implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 项目ID */
+    private Long projectId;
+    /** 科目ID */
+    private Long subjectId;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/MajorExamineMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.zhongzheng.modules.course.domain.MajorExamine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 考期Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface MajorExamineMapper extends BaseMapper<MajorExamine> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/MajorLabelMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.zhongzheng.modules.course.domain.MajorLabel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 标签Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface MajorLabelMapper extends BaseMapper<MajorLabel> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/MajorMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.zhongzheng.modules.course.domain.Major;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 专业Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface MajorMapper extends BaseMapper<Major> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/MajorProjectMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.zhongzheng.modules.course.domain.MajorProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 科目绑定项目Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface MajorProjectMapper extends BaseMapper<MajorProject> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorExamineService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.zhongzheng.modules.course.domain.MajorExamine;
+import com.zhongzheng.modules.course.vo.MajorExamineVo;
+import com.zhongzheng.modules.course.bo.MajorExamineQueryBo;
+import com.zhongzheng.modules.course.bo.MajorExamineAddBo;
+import com.zhongzheng.modules.course.bo.MajorExamineEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考期Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface IMajorExamineService extends IService<MajorExamine> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	MajorExamineVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<MajorExamineVo> queryList(MajorExamineQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考期
+	 * @param bo 考期新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(MajorExamineAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考期
+	 * @param bo 考期编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(MajorExamineEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorLabelService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.zhongzheng.modules.course.domain.MajorLabel;
+import com.zhongzheng.modules.course.vo.MajorLabelVo;
+import com.zhongzheng.modules.course.bo.MajorLabelQueryBo;
+import com.zhongzheng.modules.course.bo.MajorLabelAddBo;
+import com.zhongzheng.modules.course.bo.MajorLabelEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 标签Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface IMajorLabelService extends IService<MajorLabel> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	MajorLabelVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<MajorLabelVo> queryList(MajorLabelQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入标签
+	 * @param bo 标签新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(MajorLabelAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改标签
+	 * @param bo 标签编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(MajorLabelEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorProjectService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.zhongzheng.modules.course.domain.MajorProject;
+import com.zhongzheng.modules.course.vo.MajorProjectVo;
+import com.zhongzheng.modules.course.bo.MajorProjectQueryBo;
+import com.zhongzheng.modules.course.bo.MajorProjectAddBo;
+import com.zhongzheng.modules.course.bo.MajorProjectEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 科目绑定项目Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface IMajorProjectService extends IService<MajorProject> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	MajorProjectVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<MajorProjectVo> queryList(MajorProjectQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入科目绑定项目
+	 * @param bo 科目绑定项目新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(MajorProjectAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改科目绑定项目
+	 * @param bo 科目绑定项目编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(MajorProjectEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.zhongzheng.modules.course.domain.Major;
+import com.zhongzheng.modules.course.vo.MajorVo;
+import com.zhongzheng.modules.course.bo.MajorQueryBo;
+import com.zhongzheng.modules.course.bo.MajorAddBo;
+import com.zhongzheng.modules.course.bo.MajorEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 专业Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+public interface IMajorService extends IService<Major> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	MajorVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<MajorVo> queryList(MajorQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入专业
+	 * @param bo 专业新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(MajorAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改专业
+	 * @param bo 专业编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(MajorEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorExamineServiceImpl.java

@@ -0,0 +1,104 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.course.bo.MajorExamineAddBo;
+import com.zhongzheng.modules.course.bo.MajorExamineQueryBo;
+import com.zhongzheng.modules.course.bo.MajorExamineEditBo;
+import com.zhongzheng.modules.course.domain.MajorExamine;
+import com.zhongzheng.modules.course.mapper.MajorExamineMapper;
+import com.zhongzheng.modules.course.vo.MajorExamineVo;
+import com.zhongzheng.modules.course.service.IMajorExamineService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考期Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Service
+public class MajorExamineServiceImpl extends ServiceImpl<MajorExamineMapper, MajorExamine> implements IMajorExamineService {
+
+    @Override
+    public MajorExamineVo queryById(Long id){
+        MajorExamine db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, MajorExamineVo.class);
+    }
+
+    @Override
+    public List<MajorExamineVo> queryList(MajorExamineQueryBo bo) {
+        LambdaQueryWrapper<MajorExamine> lqw = Wrappers.lambdaQuery();
+        lqw.like(bo.getExamineName() != null, MajorExamine::getExamineName, bo.getExamineName());
+        lqw.eq(bo.getStatus() != null, MajorExamine::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), MajorExamine::getEncoder, bo.getEncoder());
+        lqw.eq(bo.getStartTime() != null, MajorExamine::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, MajorExamine::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getEnrollmentYear() != null, MajorExamine::getEnrollmentYear, bo.getEnrollmentYear());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<MajorExamineVo> entity2Vo(Collection<MajorExamine> collection) {
+        List<MajorExamineVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, MajorExamineVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<MajorExamine> page = (Page<MajorExamine>)collection;
+            Page<MajorExamineVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(MajorExamineAddBo bo) {
+        MajorExamine add = BeanUtil.toBean(bo, MajorExamine.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(MajorExamineEditBo bo) {
+        MajorExamine update = BeanUtil.toBean(bo, MajorExamine.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(MajorExamine entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorLabelServiceImpl.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.course.bo.MajorLabelAddBo;
+import com.zhongzheng.modules.course.bo.MajorLabelQueryBo;
+import com.zhongzheng.modules.course.bo.MajorLabelEditBo;
+import com.zhongzheng.modules.course.domain.MajorLabel;
+import com.zhongzheng.modules.course.mapper.MajorLabelMapper;
+import com.zhongzheng.modules.course.vo.MajorLabelVo;
+import com.zhongzheng.modules.course.service.IMajorLabelService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 标签Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Service
+public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLabel> implements IMajorLabelService {
+
+    @Override
+    public MajorLabelVo queryById(Long id){
+        MajorLabel db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, MajorLabelVo.class);
+    }
+
+    @Override
+    public List<MajorLabelVo> queryList(MajorLabelQueryBo bo) {
+        LambdaQueryWrapper<MajorLabel> lqw = Wrappers.lambdaQuery();
+        lqw.like(bo.getLabelName() != null, MajorLabel::getLabelName, bo.getLabelName());
+        lqw.eq(bo.getStatus() != null, MajorLabel::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), MajorLabel::getEncoder, bo.getEncoder());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<MajorLabelVo> entity2Vo(Collection<MajorLabel> collection) {
+        List<MajorLabelVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, MajorLabelVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<MajorLabel> page = (Page<MajorLabel>)collection;
+            Page<MajorLabelVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(MajorLabelAddBo bo) {
+        MajorLabel add = BeanUtil.toBean(bo, MajorLabel.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(MajorLabelEditBo bo) {
+        MajorLabel update = BeanUtil.toBean(bo, MajorLabel.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(MajorLabel entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorProjectServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.course.bo.MajorProjectAddBo;
+import com.zhongzheng.modules.course.bo.MajorProjectQueryBo;
+import com.zhongzheng.modules.course.bo.MajorProjectEditBo;
+import com.zhongzheng.modules.course.domain.MajorProject;
+import com.zhongzheng.modules.course.mapper.MajorProjectMapper;
+import com.zhongzheng.modules.course.vo.MajorProjectVo;
+import com.zhongzheng.modules.course.service.IMajorProjectService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 科目绑定项目Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Service
+public class MajorProjectServiceImpl extends ServiceImpl<MajorProjectMapper, MajorProject> implements IMajorProjectService {
+
+    @Override
+    public MajorProjectVo queryById(Long id){
+        MajorProject db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, MajorProjectVo.class);
+    }
+
+    @Override
+    public List<MajorProjectVo> queryList(MajorProjectQueryBo bo) {
+        LambdaQueryWrapper<MajorProject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getProjectId() != null, MajorProject::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getSubjectId() != null, MajorProject::getSubjectId, bo.getSubjectId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<MajorProjectVo> entity2Vo(Collection<MajorProject> collection) {
+        List<MajorProjectVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, MajorProjectVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<MajorProject> page = (Page<MajorProject>)collection;
+            Page<MajorProjectVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(MajorProjectAddBo bo) {
+        MajorProject add = BeanUtil.toBean(bo, MajorProject.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(MajorProjectEditBo bo) {
+        MajorProject update = BeanUtil.toBean(bo, MajorProject.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(MajorProject entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorServiceImpl.java

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.course.bo.MajorAddBo;
+import com.zhongzheng.modules.course.bo.MajorQueryBo;
+import com.zhongzheng.modules.course.bo.MajorEditBo;
+import com.zhongzheng.modules.course.domain.Major;
+import com.zhongzheng.modules.course.mapper.MajorMapper;
+import com.zhongzheng.modules.course.vo.MajorVo;
+import com.zhongzheng.modules.course.service.IMajorService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 专业Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Service
+public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements IMajorService {
+
+    @Override
+    public MajorVo queryById(Long id){
+        Major db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, MajorVo.class);
+    }
+
+    @Override
+    public List<MajorVo> queryList(MajorQueryBo bo) {
+        LambdaQueryWrapper<Major> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getCategoryName()), Major::getCategoryName, bo.getCategoryName());
+        lqw.eq(StrUtil.isNotBlank(bo.getMajorReferral()), Major::getMajorReferral, bo.getMajorReferral());
+        lqw.eq(bo.getLabelId() != null, Major::getLabelId, bo.getLabelId());
+        lqw.eq(bo.getStatus() != null, Major::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), Major::getEncoder, bo.getEncoder());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<MajorVo> entity2Vo(Collection<Major> collection) {
+        List<MajorVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, MajorVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Major> page = (Page<Major>)collection;
+            Page<MajorVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(MajorAddBo bo) {
+        Major add = BeanUtil.toBean(bo, Major.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(MajorEditBo bo) {
+        Major update = BeanUtil.toBean(bo, Major.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(Major entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseBusinessVo.java

@@ -24,9 +24,9 @@ public class CourseBusinessVo {
 	@ApiModelProperty("$pkColumn.columnComment")
 	private Long id;
 
-	/** 项目名称 */
-	@Excel(name = "项目名称")
-	@ApiModelProperty("项目名称")
+	/** 业务名称 */
+	@Excel(name = "业务名称")
+	@ApiModelProperty("业务名称")
 	private String businessName;
 	/** 备注 */
 	@Excel(name = "备注")
@@ -55,6 +55,10 @@ public class CourseBusinessVo {
 	private String educationName;
 
 
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Integer educationId;
+
 	/** 项目名称 */
 	@Excel(name = "项目名称")
 	@ApiModelProperty("项目名称")

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorExamineVo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 考期视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("考期视图对象")
+public class MajorExamineVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 考期名字 */
+	@Excel(name = "考期名字")
+	@ApiModelProperty("考期名字")
+	private Long examineName;
+	/** 1正常 0关闭 */
+	@Excel(name = "1正常 0关闭")
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 编码KQ */
+	@Excel(name = "编码KQ")
+	@ApiModelProperty("编码KQ")
+	private String encoder;
+	/** 有效期开始 */
+	@Excel(name = "有效期开始")
+	@ApiModelProperty("有效期开始")
+	private Long startTime;
+	/** 有效期结束 */
+	@Excel(name = "有效期结束")
+	@ApiModelProperty("有效期结束")
+	private Long endTime;
+	/** 入学年份 */
+	@Excel(name = "入学年份")
+	@ApiModelProperty("入学年份")
+	private Integer enrollmentYear;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorLabelVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 标签视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("标签视图对象")
+public class MajorLabelVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 标签名字 */
+	@Excel(name = "标签名字")
+	@ApiModelProperty("标签名字")
+	private Long labelName;
+	/** 1正常 0关闭 */
+	@Excel(name = "1正常 0关闭")
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 编码BQ */
+	@Excel(name = "编码BQ")
+	@ApiModelProperty("编码BQ")
+	private String encoder;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorProjectVo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 科目绑定项目视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("科目绑定项目视图对象")
+public class MajorProjectVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 科目ID */
+	@Excel(name = "科目ID")
+	@ApiModelProperty("科目ID")
+	private Long subjectId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorVo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 专业视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("专业视图对象")
+public class MajorVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 分类名称 */
+	@Excel(name = "分类名称")
+	@ApiModelProperty("分类名称")
+	private String categoryName;
+	/** 专业介绍 */
+	@Excel(name = "专业介绍")
+	@ApiModelProperty("专业介绍")
+	private String majorReferral;
+	/** 标签ID */
+	@Excel(name = "标签ID")
+	@ApiModelProperty("标签ID")
+	private Long labelId;
+	/** 1正常 0关闭 */
+	@Excel(name = "1正常 0关闭")
+	@ApiModelProperty("1正常 0关闭")
+	private Integer status;
+	/** 编码ZY */
+	@Excel(name = "编码ZY")
+	@ApiModelProperty("编码ZY")
+	private String encoder;
+}

zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -24,12 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
+        <result property="educationId" column="education_id"/>
     </resultMap>
 
-    <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo"  resultMap="CourseBusinessVoResult">
+    <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.CourseBusinessQueryBo"  resultMap="CourseBusinessVoResult">
         SELECT
             b.*,
             e.education_name,
+            e.id as education_id,
             p.project_name
         FROM
             course_business b
@@ -43,6 +45,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="businessName != null and businessName != ''">
+            b.business_name = #{businessName}
+        </if>
+        <if test="encoder != null and encoder != ''">
+            b.encoder = #{encoder}
+        </if>
+        <if test="projectId != null and projectId != ''">
+            b.project_id = #{projectId}
+        </if>
+        <if test="educationId != null and educationId != ''">
+            e.education_id = #{educationId}
+        </if>
     </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseProjectTypeMapper.xml

@@ -38,8 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-        <if test="id != null and id != ''">
-            p.id = #{id}
+        <if test="projectName != null and projectName != ''">
+            p.project_name = #{projectName}
+        </if>
+        <if test="encoder != null and encoder != ''">
+            p.encoder = #{encoder}
+        </if>
+        <if test="educationId != null and educationId != ''">
+            p.education_id = #{educationId}
         </if>
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/MajorExamineMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.course.mapper.MajorExamineMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.MajorExamine" id="MajorExamineResult">
+        <result property="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="examineName" column="examine_name"/>
+        <result property="status" column="status"/>
+        <result property="encoder" column="encoder"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="enrollmentYear" column="enrollment_year"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/MajorLabelMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.course.mapper.MajorLabelMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.MajorLabel" id="MajorLabelResult">
+        <result property="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="labelName" column="label_name"/>
+        <result property="status" column="status"/>
+        <result property="encoder" column="encoder"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/MajorMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.course.mapper.MajorMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.Major" id="MajorResult">
+        <result property="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="majorReferral" column="major_referral"/>
+        <result property="labelId" column="label_id"/>
+        <result property="status" column="status"/>
+        <result property="encoder" column="encoder"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/MajorProjectMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.course.mapper.MajorProjectMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.MajorProject" id="MajorProjectResult">
+        <result property="id" column="id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>