Browse Source

科目对象

change 4 years ago
parent
commit
1f3b61d3cd
19 changed files with 880 additions and 0 deletions
  1. 112 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSubjectController.java
  2. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectAddBo.java
  3. 44 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectEditBo.java
  4. 35 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectProjectAddBo.java
  5. 32 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectProjectEditBo.java
  6. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectProjectQueryBo.java
  7. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectQueryBo.java
  8. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubject.java
  9. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubjectProject.java
  10. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseSubjectMapper.java
  11. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseSubjectProjectMapper.java
  12. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSubjectProjectService.java
  13. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSubjectService.java
  14. 100 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectProjectServiceImpl.java
  15. 101 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectServiceImpl.java
  16. 35 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSubjectProjectVo.java
  17. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSubjectVo.java
  18. 18 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectMapper.xml
  19. 14 0
      zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectProjectMapper.xml

+ 112 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSubjectController.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.CourseSubjectVo;
+import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
+import com.zhongzheng.modules.course.bo.CourseSubjectAddBo;
+import com.zhongzheng.modules.course.bo.CourseSubjectEditBo;
+import com.zhongzheng.modules.course.service.ICourseSubjectService;
+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("/modules.course/subject")
+public class CourseSubjectController extends BaseController {
+
+    private final ICourseSubjectService iCourseSubjectService;
+
+    /**
+     * 查询科目列表
+     */
+    @ApiOperation("查询科目列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:subject:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CourseSubjectVo> list(CourseSubjectQueryBo bo) {
+        startPage();
+        List<CourseSubjectVo> list = iCourseSubjectService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出科目列表
+     */
+    @ApiOperation("导出科目列表")
+    @PreAuthorize("@ss.hasPermi('modules.course:subject:export')")
+    @Log(title = "科目", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<CourseSubjectVo> export(CourseSubjectQueryBo bo) {
+        List<CourseSubjectVo> list = iCourseSubjectService.queryList(bo);
+        ExcelUtil<CourseSubjectVo> util = new ExcelUtil<CourseSubjectVo>(CourseSubjectVo.class);
+        return util.exportExcel(list, "科目");
+    }
+
+    /**
+     * 获取科目详细信息
+     */
+    @ApiOperation("获取科目详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.course:subject:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<CourseSubjectVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iCourseSubjectService.queryById(id));
+    }
+
+    /**
+     * 新增科目
+     */
+    @ApiOperation("新增科目")
+    @PreAuthorize("@ss.hasPermi('modules.course:subject:add')")
+    @Log(title = "科目", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CourseSubjectAddBo bo) {
+        return toAjax(iCourseSubjectService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改科目
+     */
+    @ApiOperation("修改科目")
+    @PreAuthorize("@ss.hasPermi('modules.course:subject:edit')")
+    @Log(title = "科目", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody CourseSubjectEditBo bo) {
+        return toAjax(iCourseSubjectService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除科目
+     */
+    @ApiOperation("删除科目")
+    @PreAuthorize("@ss.hasPermi('modules.course:subject:remove')")
+    @Log(title = "科目" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iCourseSubjectService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectAddBo.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;
+
+
+
+/**
+ * 科目添加对象 course_subject
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("科目添加对象")
+public class CourseSubjectAddBo {
+
+    /** 编码KM */
+    @ApiModelProperty("编码KM")
+    private String encoder;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 科目名称 */
+    @ApiModelProperty("科目名称")
+    private String subjectName;
+}

+ 44 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectEditBo.java

@@ -0,0 +1,44 @@
+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_subject
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("科目编辑对象")
+public class CourseSubjectEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 编码KM */
+    @ApiModelProperty("编码KM")
+    private String encoder;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 科目名称 */
+    @ApiModelProperty("科目名称")
+    private String subjectName;
+
+}

+ 35 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectProjectAddBo.java

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

+ 32 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectProjectEditBo.java

@@ -0,0 +1,32 @@
+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_subject_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("科目绑定项目编辑对象")
+public class CourseSubjectProjectEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 科目ID */
+    @ApiModelProperty("科目ID")
+    private Long subjectId;
+
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectProjectQueryBo.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;
+
+/**
+ * 科目绑定项目分页查询对象 course_subject_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("科目绑定项目分页查询对象")
+public class CourseSubjectProjectQueryBo 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;
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSubjectQueryBo.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;
+
+/**
+ * 科目分页查询对象 course_subject
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("科目分页查询对象")
+public class CourseSubjectQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 编码KM */
+	@ApiModelProperty("编码KM")
+	private String encoder;
+	/** 0 未启用 1启用 -1删除 */
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+	/** 科目名称 */
+	@ApiModelProperty("科目名称")
+	private String subjectName;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubject.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;
+
+/**
+ * 科目对象 course_subject
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("course_subject")
+public class CourseSubject implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 编码KM */
+    private String encoder;
+    /** 备注 */
+    private String remark;
+    /** 0 未启用 1启用 -1删除 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 科目名称 */
+    private String subjectName;
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSubjectProject.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;
+
+/**
+ * 科目绑定项目对象 course_subject_project
+ *
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("course_subject_project")
+public class CourseSubjectProject 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;
+}

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

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

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

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

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

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

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

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

+ 100 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectProjectServiceImpl.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.CourseSubjectProjectAddBo;
+import com.zhongzheng.modules.course.bo.CourseSubjectProjectQueryBo;
+import com.zhongzheng.modules.course.bo.CourseSubjectProjectEditBo;
+import com.zhongzheng.modules.course.domain.CourseSubjectProject;
+import com.zhongzheng.modules.course.mapper.CourseSubjectProjectMapper;
+import com.zhongzheng.modules.course.vo.CourseSubjectProjectVo;
+import com.zhongzheng.modules.course.service.ICourseSubjectProjectService;
+
+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 CourseSubjectProjectServiceImpl extends ServiceImpl<CourseSubjectProjectMapper, CourseSubjectProject> implements ICourseSubjectProjectService {
+
+    @Override
+    public CourseSubjectProjectVo queryById(Long id){
+        CourseSubjectProject db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CourseSubjectProjectVo.class);
+    }
+
+    @Override
+    public List<CourseSubjectProjectVo> queryList(CourseSubjectProjectQueryBo bo) {
+        LambdaQueryWrapper<CourseSubjectProject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getProjectId() != null, CourseSubjectProject::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getSubjectId() != null, CourseSubjectProject::getSubjectId, bo.getSubjectId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CourseSubjectProjectVo> entity2Vo(Collection<CourseSubjectProject> collection) {
+        List<CourseSubjectProjectVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseSubjectProjectVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CourseSubjectProject> page = (Page<CourseSubjectProject>)collection;
+            Page<CourseSubjectProjectVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CourseSubjectProjectAddBo bo) {
+        CourseSubjectProject add = BeanUtil.toBean(bo, CourseSubjectProject.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CourseSubjectProjectEditBo bo) {
+        CourseSubjectProject update = BeanUtil.toBean(bo, CourseSubjectProject.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CourseSubjectProject entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 101 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSubjectServiceImpl.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.CourseSubjectAddBo;
+import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
+import com.zhongzheng.modules.course.bo.CourseSubjectEditBo;
+import com.zhongzheng.modules.course.domain.CourseSubject;
+import com.zhongzheng.modules.course.mapper.CourseSubjectMapper;
+import com.zhongzheng.modules.course.vo.CourseSubjectVo;
+import com.zhongzheng.modules.course.service.ICourseSubjectService;
+
+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 CourseSubjectServiceImpl extends ServiceImpl<CourseSubjectMapper, CourseSubject> implements ICourseSubjectService {
+
+    @Override
+    public CourseSubjectVo queryById(Long id){
+        CourseSubject db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CourseSubjectVo.class);
+    }
+
+    @Override
+    public List<CourseSubjectVo> queryList(CourseSubjectQueryBo bo) {
+        LambdaQueryWrapper<CourseSubject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), CourseSubject::getEncoder, bo.getEncoder());
+        lqw.eq(bo.getStatus() != null, CourseSubject::getStatus, bo.getStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getSubjectName()), CourseSubject::getSubjectName, bo.getSubjectName());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CourseSubjectVo> entity2Vo(Collection<CourseSubject> collection) {
+        List<CourseSubjectVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CourseSubjectVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CourseSubject> page = (Page<CourseSubject>)collection;
+            Page<CourseSubjectVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CourseSubjectAddBo bo) {
+        CourseSubject add = BeanUtil.toBean(bo, CourseSubject.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CourseSubjectEditBo bo) {
+        CourseSubject update = BeanUtil.toBean(bo, CourseSubject.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CourseSubject entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 35 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSubjectProjectVo.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 CourseSubjectProjectVo {
+	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;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSubjectVo.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 CourseSubjectVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 编码KM */
+	@Excel(name = "编码KM")
+	@ApiModelProperty("编码KM")
+	private String encoder;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 0 未启用 1启用 -1删除 */
+	@Excel(name = "0 未启用 1启用 -1删除")
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+	/** 科目名称 */
+	@Excel(name = "科目名称")
+	@ApiModelProperty("科目名称")
+	private String subjectName;
+}

+ 18 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectMapper.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.CourseSubjectMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.CourseSubject" id="CourseSubjectResult">
+        <result property="id" column="id"/>
+        <result property="encoder" column="encoder"/>
+        <result property="remark" column="remark"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="subjectName" column="subject_name"/>
+    </resultMap>
+
+
+</mapper>

+ 14 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectProjectMapper.xml

@@ -0,0 +1,14 @@
+<?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.CourseSubjectProjectMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.CourseSubjectProject" id="CourseSubjectProjectResult">
+        <result property="id" column="id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="subjectId" column="subject_id"/>
+    </resultMap>
+
+
+</mapper>