Selaa lähdekoodia

模块业务关联表

he2802 4 vuotta sitten
vanhempi
commit
707c89c31a
17 muutettua tiedostoa jossa 500 lisäystä ja 52 poistoa
  1. 112 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseModuleBusinessController.java
  2. 1 9
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleAddBo.java
  3. 33 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleBusinessAddBo.java
  4. 40 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleBusinessEditBo.java
  5. 51 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleBusinessQueryBo.java
  6. 0 10
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleEditBo.java
  7. 1 9
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleQueryBo.java
  8. 1 6
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModule.java
  9. 37 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModuleBusiness.java
  10. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseModuleBusinessMapper.java
  11. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseModuleBusinessService.java
  12. 98 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleBusinessServiceImpl.java
  13. 0 3
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleServiceImpl.java
  14. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseModuleBusinessVo.java
  15. 1 12
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseModuleVo.java
  16. 16 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleBusinessMapper.xml
  17. 0 3
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleMapper.xml

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

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.course.bo.CourseModuleBusinessAddBo;
+import com.zhongzheng.modules.course.bo.CourseModuleBusinessEditBo;
+import com.zhongzheng.modules.course.bo.CourseModuleBusinessQueryBo;
+import com.zhongzheng.modules.course.service.ICourseModuleBusinessService;
+import com.zhongzheng.modules.course.vo.CourseModuleBusinessVo;
+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/module/business")
+public class CourseModuleBusinessController extends BaseController {
+
+    private final ICourseModuleBusinessService iCourseModuleBusinessService;
+
+    /**
+     * 查询课程模块适用业务关系列表
+     */
+    @ApiOperation("查询课程模块适用业务关系列表")
+    @PreAuthorize("@ss.hasPermi('system:business:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CourseModuleBusinessVo> list(CourseModuleBusinessQueryBo bo) {
+        startPage();
+        List<CourseModuleBusinessVo> list = iCourseModuleBusinessService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出课程模块适用业务关系列表
+     */
+   /* @ApiOperation("导出课程模块适用业务关系列表")
+    @PreAuthorize("@ss.hasPermi('system:business:export')")
+    @Log(title = "课程模块适用业务关系", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<CourseModuleBusinessVo> export(CourseModuleBusinessQueryBo bo) {
+        List<CourseModuleBusinessVo> list = iCourseModuleBusinessService.queryList(bo);
+        ExcelUtil<CourseModuleBusinessVo> util = new ExcelUtil<CourseModuleBusinessVo>(CourseModuleBusinessVo.class);
+        return util.exportExcel(list, "课程模块适用业务关系");
+    }*/
+
+    /**
+     * 获取课程模块适用业务关系详细信息
+     */
+    @ApiOperation("获取课程模块适用业务关系详细信息")
+    @PreAuthorize("@ss.hasPermi('system:business:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<CourseModuleBusinessVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iCourseModuleBusinessService.queryById(id));
+    }
+
+    /**
+     * 新增课程模块适用业务关系
+     */
+    @ApiOperation("新增课程模块适用业务关系")
+    @PreAuthorize("@ss.hasPermi('system:business:add')")
+    @Log(title = "课程模块适用业务关系", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CourseModuleBusinessAddBo bo) {
+        return toAjax(iCourseModuleBusinessService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改课程模块适用业务关系
+     */
+    @ApiOperation("修改课程模块适用业务关系")
+    @PreAuthorize("@ss.hasPermi('system:business:edit')")
+    @Log(title = "课程模块适用业务关系", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody CourseModuleBusinessEditBo bo) {
+        return toAjax(iCourseModuleBusinessService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除课程模块适用业务关系
+     */
+    /*@ApiOperation("删除课程模块适用业务关系")
+    @PreAuthorize("@ss.hasPermi('system:business:remove')")
+    @Log(title = "课程模块适用业务关系" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iCourseModuleBusinessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

+ 1 - 9
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleAddBo.java

@@ -42,13 +42,5 @@ public class CourseModuleAddBo {
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;
-    /** 教育类型id用,拼接 */
-    @ApiModelProperty("教育类型id用,拼接")
-    private String educationTypeIds;
-    /** 业务层次id用,拼接 */
-    @ApiModelProperty("业务层次id用,拼接")
-    private String businessIds;
-    /** 科目id用,拼接 */
-    @ApiModelProperty("科目id用,拼接")
-    private String subjectIds;
+
 }

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleBusinessAddBo.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_module_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("课程模块适用业务关系添加对象")
+public class CourseModuleBusinessAddBo {
+
+    /** 模块id */
+    @ApiModelProperty("模块id")
+    private Long moduleId;
+    /** 教育类型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/CourseModuleBusinessEditBo.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_module_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("课程模块适用业务关系编辑对象")
+public class CourseModuleBusinessEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 模块id */
+    @ApiModelProperty("模块id")
+    private Long moduleId;
+
+    /** 教育类型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/CourseModuleBusinessQueryBo.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_module_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("课程模块适用业务关系分页查询对象")
+public class CourseModuleBusinessQueryBo 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 moduleId;
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 科目id */
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+}

+ 0 - 10
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleEditBo.java

@@ -49,16 +49,6 @@ public class CourseModuleEditBo {
     @ApiModelProperty("编码")
     private String code;
 
-    /** 教育类型id用,拼接 */
-    @ApiModelProperty("教育类型id用,拼接")
-    private String educationTypeIds;
 
-    /** 业务层次id用,拼接 */
-    @ApiModelProperty("业务层次id用,拼接")
-    private String businessIds;
-
-    /** 科目id用,拼接 */
-    @ApiModelProperty("科目id用,拼接")
-    private String subjectIds;
 
 }

+ 1 - 9
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseModuleQueryBo.java

@@ -55,13 +55,5 @@ public class CourseModuleQueryBo extends BaseEntity {
 	/** 编码 */
 	@ApiModelProperty("编码")
 	private String code;
-	/** 教育类型id用,拼接 */
-	@ApiModelProperty("教育类型id用,拼接")
-	private String educationTypeIds;
-	/** 业务层次id用,拼接 */
-	@ApiModelProperty("业务层次id用,拼接")
-	private String businessIds;
-	/** 科目id用,拼接 */
-	@ApiModelProperty("科目id用,拼接")
-	private String subjectIds;
+
 }

+ 1 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModule.java

@@ -44,10 +44,5 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 编码 */
     private String code;
-    /** 教育类型id用,拼接 */
-    private String educationTypeIds;
-    /** 业务层次id用,拼接 */
-    private String businessIds;
-    /** 科目id用,拼接 */
-    private String subjectIds;
+
 }

+ 37 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseModuleBusiness.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_module_business
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("course_module_business")
+public class CourseModuleBusiness implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 模块id */
+    private Long moduleId;
+    /** 教育类型id */
+    private Long educationTypeId;
+    /** 业务层次id */
+    private Long businessId;
+    /** 科目id */
+    private Long subjectId;
+}

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

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

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

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

+ 98 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleBusinessServiceImpl.java

@@ -0,0 +1,98 @@
+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.CourseModuleBusinessAddBo;
+import com.zhongzheng.modules.course.bo.CourseModuleBusinessEditBo;
+import com.zhongzheng.modules.course.bo.CourseModuleBusinessQueryBo;
+import com.zhongzheng.modules.course.domain.CourseModuleBusiness;
+import com.zhongzheng.modules.course.mapper.CourseModuleBusinessMapper;
+import com.zhongzheng.modules.course.service.ICourseModuleBusinessService;
+import com.zhongzheng.modules.course.vo.CourseModuleBusinessVo;
+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 CourseModuleBusinessServiceImpl extends ServiceImpl<CourseModuleBusinessMapper, CourseModuleBusiness> implements ICourseModuleBusinessService {
+
+    @Override
+    public CourseModuleBusinessVo queryById(Long id){
+        CourseModuleBusiness db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CourseModuleBusinessVo.class);
+    }
+
+    @Override
+    public List<CourseModuleBusinessVo> queryList(CourseModuleBusinessQueryBo bo) {
+        LambdaQueryWrapper<CourseModuleBusiness> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getModuleId() != null, CourseModuleBusiness::getModuleId, bo.getModuleId());
+        lqw.eq(bo.getEducationTypeId() != null, CourseModuleBusiness::getEducationTypeId, bo.getEducationTypeId());
+        lqw.eq(bo.getBusinessId() != null, CourseModuleBusiness::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getSubjectId() != null, CourseModuleBusiness::getSubjectId, bo.getSubjectId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CourseModuleBusinessVo> entity2Vo(Collection<CourseModuleBusiness> collection) {
+        List<CourseModuleBusinessVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseModuleBusinessVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CourseModuleBusiness> page = (Page<CourseModuleBusiness>)collection;
+            Page<CourseModuleBusinessVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CourseModuleBusinessAddBo bo) {
+        CourseModuleBusiness add = BeanUtil.toBean(bo, CourseModuleBusiness.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CourseModuleBusinessEditBo bo) {
+        CourseModuleBusiness update = BeanUtil.toBean(bo, CourseModuleBusiness.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CourseModuleBusiness 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/CourseModuleServiceImpl.java

@@ -46,9 +46,6 @@ public class CourseModuleServiceImpl extends ServiceImpl<CourseModuleMapper, Cou
         lqw.eq(bo.getPublishStatus() != null, CourseModule::getPublishStatus, bo.getPublishStatus());
         lqw.in(bo.getStatus() != null, CourseModule::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), CourseModule::getCode, bo.getCode());
-        lqw.eq(StrUtil.isNotBlank(bo.getEducationTypeIds()), CourseModule::getEducationTypeIds, bo.getEducationTypeIds());
-        lqw.eq(StrUtil.isNotBlank(bo.getBusinessIds()), CourseModule::getBusinessIds, bo.getBusinessIds());
-        lqw.eq(StrUtil.isNotBlank(bo.getSubjectIds()), CourseModule::getSubjectIds, bo.getSubjectIds());
         return entity2Vo(this.list(lqw));
     }
 

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseModuleBusinessVo.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 CourseModuleBusinessVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 模块id */
+	@Excel(name = "模块id")
+	@ApiModelProperty("模块id")
+	private Long moduleId;
+	/** 教育类型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;
+}

+ 1 - 12
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseModuleVo.java

@@ -48,16 +48,5 @@ public class CourseModuleVo {
 	@Excel(name = "编码")
 	@ApiModelProperty("编码")
 	private String code;
-	/** 教育类型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;
+
 }

+ 16 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleBusinessMapper.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.CourseModuleBusinessMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.CourseModuleBusiness" id="CourseModuleBusinessResult">
+        <result property="id" column="id"/>
+        <result property="moduleId" column="module_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/CourseModuleMapper.xml

@@ -14,9 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="code" column="code"/>
-        <result property="educationTypeIds" column="education_type_ids"/>
-        <result property="businessIds" column="business_ids"/>
-        <result property="subjectIds" column="subject_ids"/>
     </resultMap>