Procházet zdrojové kódy

大章业务关联表

he2802 před 4 roky
rodič
revize
b8ae7abea3
18 změnil soubory, kde provedl 500 přidání a 56 odebrání
  1. 112 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseChapterBusinessController.java
  2. 3 3
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseModuleBusinessController.java
  3. 0 9
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterAddBo.java
  4. 33 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterBusinessAddBo.java
  5. 40 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterBusinessEditBo.java
  6. 51 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterBusinessQueryBo.java
  7. 0 11
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterEditBo.java
  8. 0 9
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterQueryBo.java
  9. 0 6
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java
  10. 37 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapterBusiness.java
  11. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterBusinessMapper.java
  12. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseChapterBusinessService.java
  13. 99 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterBusinessServiceImpl.java
  14. 0 3
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterServiceImpl.java
  15. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseChapterBusinessVo.java
  16. 0 12
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseChapterVo.java
  17. 16 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterBusinessMapper.xml
  18. 0 3
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml

+ 112 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseChapterBusinessController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.course.bo.CourseChapterBusinessAddBo;
+import com.zhongzheng.modules.course.bo.CourseChapterBusinessEditBo;
+import com.zhongzheng.modules.course.bo.CourseChapterBusinessQueryBo;
+import com.zhongzheng.modules.course.service.ICourseChapterBusinessService;
+import com.zhongzheng.modules.course.vo.CourseChapterBusinessVo;
+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.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 课程大章适用业务关系Controller
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Api(value = "课程大章适用业务关系控制器", tags = {"课程大章适用业务关系管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/chapter/business")
+public class CourseChapterBusinessController extends BaseController {
+
+    private final ICourseChapterBusinessService iCourseChapterBusinessService;
+
+    /**
+     * 查询课程大章适用业务关系列表
+     */
+    @ApiOperation("查询课程大章适用业务关系列表")
+    @PreAuthorize("@ss.hasPermi('system:business:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CourseChapterBusinessVo> list(CourseChapterBusinessQueryBo bo) {
+        startPage();
+        List<CourseChapterBusinessVo> list = iCourseChapterBusinessService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出课程大章适用业务关系列表
+     */
+    /*@ApiOperation("导出课程大章适用业务关系列表")
+    @PreAuthorize("@ss.hasPermi('system:business:export')")
+    @Log(title = "课程大章适用业务关系", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<CourseChapterBusinessVo> export(CourseChapterBusinessQueryBo bo) {
+        List<CourseChapterBusinessVo> list = iCourseChapterBusinessService.queryList(bo);
+        ExcelUtil<CourseChapterBusinessVo> util = new ExcelUtil<CourseChapterBusinessVo>(CourseChapterBusinessVo.class);
+        return util.exportExcel(list, "课程大章适用业务关系");
+    }*/
+
+    /**
+     * 获取课程大章适用业务关系详细信息
+     */
+    @ApiOperation("获取课程大章适用业务关系详细信息")
+    @PreAuthorize("@ss.hasPermi('system:business:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<CourseChapterBusinessVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iCourseChapterBusinessService.queryById(id));
+    }
+
+    /**
+     * 新增课程大章适用业务关系
+     */
+    @ApiOperation("新增课程大章适用业务关系")
+    @PreAuthorize("@ss.hasPermi('system:business:add')")
+    @Log(title = "课程大章适用业务关系", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CourseChapterBusinessAddBo bo) {
+        return toAjax(iCourseChapterBusinessService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改课程大章适用业务关系
+     */
+    @ApiOperation("修改课程大章适用业务关系")
+    @PreAuthorize("@ss.hasPermi('system:business:edit')")
+    @Log(title = "课程大章适用业务关系", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody CourseChapterBusinessEditBo bo) {
+        return toAjax(iCourseChapterBusinessService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除课程大章适用业务关系
+     */
+    @ApiOperation("删除课程大章适用业务关系")
+    @PreAuthorize("@ss.hasPermi('system:business:remove')")
+    @Log(title = "课程大章适用业务关系" , businessType = BusinessType.DELETE)
+    @PostMapping("/del/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iCourseChapterBusinessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

+ 3 - 3
zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseModuleBusinessController.java

@@ -102,11 +102,11 @@ public class CourseModuleBusinessController extends BaseController {
     /**
      * 删除课程模块适用业务关系
      */
-    /*@ApiOperation("删除课程模块适用业务关系")
+    @ApiOperation("删除课程模块适用业务关系")
     @PreAuthorize("@ss.hasPermi('system:business:remove')")
     @Log(title = "课程模块适用业务关系" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @PostMapping("/del/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iCourseModuleBusinessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }*/
+    }
 }

+ 0 - 9
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterAddBo.java

@@ -42,15 +42,6 @@ public class CourseChapterAddBo {
     /** 发布状态 1发布 0未发布 */
     @ApiModelProperty("发布状态 1发布 0未发布")
     private Long publishStatus;
-    /** 教育类型id用,拼接 */
-    @ApiModelProperty("教育类型id用,拼接")
-    private String educationTypeIds;
-    /** 业务层次id用,拼接 */
-    @ApiModelProperty("业务层次id用,拼接")
-    private String businessIds;
-    /** 科目id用,拼接 */
-    @ApiModelProperty("科目id用,拼接")
-    private String subjectIds;
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterBusinessAddBo.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;
+
+
+
+/**
+ * 课程大章适用业务关系添加对象 course_chapter_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("课程大章适用业务关系添加对象")
+public class CourseChapterBusinessAddBo {
+
+    /** 大章id */
+    @ApiModelProperty("大章id")
+    private Long chapterId;
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 科目id */
+    @ApiModelProperty("科目id")
+    private Long subjectId;
+}

+ 40 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterBusinessEditBo.java

@@ -0,0 +1,40 @@
+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;
+
+
+/**
+ * 课程大章适用业务关系编辑对象 course_chapter_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("课程大章适用业务关系编辑对象")
+public class CourseChapterBusinessEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 大章id */
+    @ApiModelProperty("大章id")
+    private Long chapterId;
+
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+
+    /** 科目id */
+    @ApiModelProperty("科目id")
+    private Long subjectId;
+
+}

+ 51 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterBusinessQueryBo.java

@@ -0,0 +1,51 @@
+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;
+
+/**
+ * 课程大章适用业务关系分页查询对象 course_chapter_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("课程大章适用业务关系分页查询对象")
+public class CourseChapterBusinessQueryBo 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 chapterId;
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 科目id */
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+}

+ 0 - 11
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterEditBo.java

@@ -50,17 +50,6 @@ public class CourseChapterEditBo {
     @ApiModelProperty("发布状态 1发布 0未发布")
     private Long publishStatus;
 
-    /** 教育类型id用,拼接 */
-    @ApiModelProperty("教育类型id用,拼接")
-    private String educationTypeIds;
-
-    /** 业务层次id用,拼接 */
-    @ApiModelProperty("业务层次id用,拼接")
-    private String businessIds;
-
-    /** 科目id用,拼接 */
-    @ApiModelProperty("科目id用,拼接")
-    private String subjectIds;
 
     /** 编码 */
     @ApiModelProperty("编码")

+ 0 - 9
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterQueryBo.java

@@ -55,15 +55,6 @@ public class CourseChapterQueryBo extends BaseEntity {
 	/** 发布状态 1发布 0未发布 */
 	@ApiModelProperty("发布状态 1发布 0未发布")
 	private Long publishStatus;
-	/** 教育类型id用,拼接 */
-	@ApiModelProperty("教育类型id用,拼接")
-	private String educationTypeIds;
-	/** 业务层次id用,拼接 */
-	@ApiModelProperty("业务层次id用,拼接")
-	private String businessIds;
-	/** 科目id用,拼接 */
-	@ApiModelProperty("科目id用,拼接")
-	private String subjectIds;
 	/** 编码 */
 	@ApiModelProperty("编码")
 	private String code;

+ 0 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapter.java

@@ -44,12 +44,6 @@ private static final long serialVersionUID=1L;
     private String coverUrl;
     /** 发布状态 1发布 0未发布 */
     private Long publishStatus;
-    /** 教育类型id用,拼接 */
-    private String educationTypeIds;
-    /** 业务层次id用,拼接 */
-    private String businessIds;
-    /** 科目id用,拼接 */
-    private String subjectIds;
     /** 编码 */
     private String code;
 }

+ 37 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseChapterBusiness.java

@@ -0,0 +1,37 @@
+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;
+
+/**
+ * 课程大章适用业务关系对象 course_chapter_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("course_chapter_business")
+public class CourseChapterBusiness implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 大章id */
+    private Long chapterId;
+    /** 教育类型id */
+    private Long educationTypeId;
+    /** 业务层次id */
+    private Long businessId;
+    /** 科目id */
+    private Long subjectId;
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterBusinessMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
+
+/**
+ * 课程大章适用业务关系Mapper接口
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+public interface CourseChapterBusinessMapper extends BaseMapper<CourseChapterBusiness> {
+
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseChapterBusinessService.java

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

+ 99 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterBusinessServiceImpl.java

@@ -0,0 +1,99 @@
+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 com.zhongzheng.modules.course.bo.CourseChapterBusinessAddBo;
+import com.zhongzheng.modules.course.bo.CourseChapterBusinessEditBo;
+import com.zhongzheng.modules.course.bo.CourseChapterBusinessQueryBo;
+import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
+import com.zhongzheng.modules.course.mapper.CourseChapterBusinessMapper;
+import com.zhongzheng.modules.course.service.ICourseChapterBusinessService;
+import com.zhongzheng.modules.course.vo.CourseChapterBusinessVo;
+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 java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 课程大章适用业务关系Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Service
+public class CourseChapterBusinessServiceImpl extends ServiceImpl<CourseChapterBusinessMapper, CourseChapterBusiness> implements ICourseChapterBusinessService {
+
+    @Override
+    public CourseChapterBusinessVo queryById(Long id){
+        CourseChapterBusiness db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CourseChapterBusinessVo.class);
+    }
+
+    @Override
+    public List<CourseChapterBusinessVo> queryList(CourseChapterBusinessQueryBo bo) {
+        LambdaQueryWrapper<CourseChapterBusiness> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getChapterId() != null, CourseChapterBusiness::getChapterId, bo.getChapterId());
+        lqw.eq(bo.getEducationTypeId() != null, CourseChapterBusiness::getEducationTypeId, bo.getEducationTypeId());
+        lqw.eq(bo.getBusinessId() != null, CourseChapterBusiness::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getSubjectId() != null, CourseChapterBusiness::getSubjectId, bo.getSubjectId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CourseChapterBusinessVo> entity2Vo(Collection<CourseChapterBusiness> collection) {
+        List<CourseChapterBusinessVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseChapterBusinessVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CourseChapterBusiness> page = (Page<CourseChapterBusiness>)collection;
+            Page<CourseChapterBusinessVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CourseChapterBusinessAddBo bo) {
+        CourseChapterBusiness add = BeanUtil.toBean(bo, CourseChapterBusiness.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CourseChapterBusinessEditBo bo) {
+        CourseChapterBusiness update = BeanUtil.toBean(bo, CourseChapterBusiness.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CourseChapterBusiness entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 0 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterServiceImpl.java

@@ -46,9 +46,6 @@ public class CourseChapterServiceImpl extends ServiceImpl<CourseChapterMapper, C
         lqw.like(StrUtil.isNotBlank(bo.getPrefixName()), CourseChapter::getPrefixName, bo.getPrefixName());
         lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), CourseChapter::getCoverUrl, bo.getCoverUrl());
         lqw.in(bo.getPublishStatus() != null, CourseChapter::getPublishStatus, bo.getPublishStatus());
-        lqw.eq(StrUtil.isNotBlank(bo.getEducationTypeIds()), CourseChapter::getEducationTypeIds, bo.getEducationTypeIds());
-        lqw.eq(StrUtil.isNotBlank(bo.getBusinessIds()), CourseChapter::getBusinessIds, bo.getBusinessIds());
-        lqw.eq(StrUtil.isNotBlank(bo.getSubjectIds()), CourseChapter::getSubjectIds, bo.getSubjectIds());
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), CourseChapter::getCode, bo.getCode());
         return entity2Vo(this.list(lqw));
     }

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseChapterBusinessVo.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 hjl
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("课程大章适用业务关系视图对象")
+public class CourseChapterBusinessVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 大章id */
+	@Excel(name = "大章id")
+	@ApiModelProperty("大章id")
+	private Long chapterId;
+	/** 教育类型id */
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 科目id */
+	@Excel(name = "科目id")
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+}

+ 0 - 12
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseChapterVo.java

@@ -48,18 +48,6 @@ public class CourseChapterVo {
 	@Excel(name = "发布状态 1发布 0未发布")
 	@ApiModelProperty("发布状态 1发布 0未发布")
 	private Long publishStatus;
-	/** 教育类型id用,拼接 */
-	@Excel(name = "教育类型id用,拼接")
-	@ApiModelProperty("教育类型id用,拼接")
-	private String educationTypeIds;
-	/** 业务层次id用,拼接 */
-	@Excel(name = "业务层次id用,拼接")
-	@ApiModelProperty("业务层次id用,拼接")
-	private String businessIds;
-	/** 科目id用,拼接 */
-	@Excel(name = "科目id用,拼接")
-	@ApiModelProperty("科目id用,拼接")
-	private String subjectIds;
 	/** 编码 */
 	@Excel(name = "编码")
 	@ApiModelProperty("编码")

+ 16 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterBusinessMapper.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.CourseChapterBusinessMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.CourseChapterBusiness" id="CourseChapterBusinessResult">
+        <result property="id" column="id"/>
+        <result property="chapterId" column="chapter_id"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="subjectId" column="subject_id"/>
+    </resultMap>
+
+
+</mapper>

+ 0 - 3
zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterMapper.xml

@@ -14,9 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="prefixName" column="prefix_name"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="publishStatus" column="publish_status"/>
-        <result property="educationTypeIds" column="education_type_ids"/>
-        <result property="businessIds" column="business_ids"/>
-        <result property="subjectIds" column="subject_ids"/>
         <result property="code" column="code"/>
     </resultMap>