通知列表

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

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
@@ -13,24 +11,21 @@ import java.util.Date;
 /**
  * 名师添加对象 teacher
  *
- * @author hjl
- * @date 2021-05-19
+ * @author ruoyi
+ * @date 2021-11-29
  */
 @Data
 @ApiModel("名师添加对象")
 public class TeacherAddBo {
 
     /** 教程名称 */
-    @ApiModelProperty("教师名称")
-    @NotBlank(message = "教师名称不能为空")
+    @ApiModelProperty("教程名称")
     private String teacherName;
     /** 介绍 */
     @ApiModelProperty("介绍")
-    @NotBlank(message = "教师介绍不能为空")
     private String introduce;
     /** 头像 */
     @ApiModelProperty("头像")
-    @NotBlank(message = "教师头像不能为空")
     private String avatar;
     /** 状态 0关闭 1开启 */
     @ApiModelProperty("状态 0关闭 1开启")
@@ -41,4 +36,13 @@ public class TeacherAddBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
+    /** 编码MK */
+    @ApiModelProperty("编码MK")
+    private String encoder;
+    /** 性别 1男 2女 */
+    @ApiModelProperty("性别 1男 2女")
+    private Integer sex;
+    /** 教师年龄 */
+    @ApiModelProperty("教师年龄")
+    private Long oldYear;
 }

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

@@ -4,39 +4,33 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
 /**
  * 名师编辑对象 teacher
  *
- * @author hjl
- * @date 2021-05-19
+ * @author ruoyi
+ * @date 2021-11-29
  */
 @Data
 @ApiModel("名师编辑对象")
 public class TeacherEditBo {
 
-
     /** 教师ID */
     @ApiModelProperty("教师ID")
     private Long teacherId;
 
     /** 教程名称 */
-    @ApiModelProperty("教师名称")
-    @NotBlank(message = "教师名称不能为空")
+    @ApiModelProperty("教程名称")
     private String teacherName;
 
     /** 介绍 */
     @ApiModelProperty("介绍")
-    @NotBlank(message = "教师介绍不能为空")
     private String introduce;
 
     /** 头像 */
     @ApiModelProperty("头像")
-    @NotBlank(message = "教师头像不能为空")
     private String avatar;
 
     /** 状态 0关闭 1开启 */
@@ -46,4 +40,18 @@ public class TeacherEditBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
+
+
+    /** 编码MK */
+    @ApiModelProperty("编码MK")
+    private String encoder;
+
+    /** 性别 1男 2女 */
+    @ApiModelProperty("性别 1男 2女")
+    private Integer sex;
+
+    /** 教师年龄 */
+    @ApiModelProperty("教师年龄")
+    private Long oldYear;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherProjectAddBo.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;
+
+
+
+/**
+ * 教师绑定项目添加对象 teacher_project
+ *
+ * @author ruoyi
+ * @date 2021-11-29
+ */
+@Data
+@ApiModel("教师绑定项目添加对象")
+public class TeacherProjectAddBo {
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+    /** 教师ID */
+    @ApiModelProperty("教师ID")
+    private Long teacherId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 教育ID */
+    @ApiModelProperty("教育ID")
+    private Long educationId;
+}

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

@@ -0,0 +1,41 @@
+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;
+
+
+/**
+ * 教师绑定项目编辑对象 teacher_project
+ *
+ * @author ruoyi
+ * @date 2021-11-29
+ */
+@Data
+@ApiModel("教师绑定项目编辑对象")
+public class TeacherProjectEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 教师ID */
+    @ApiModelProperty("教师ID")
+    private Long teacherId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 教育ID */
+    @ApiModelProperty("教育ID")
+    private Long educationId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherProjectQueryBo.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;
+
+/**
+ * 教师绑定项目分页查询对象 teacher_project
+ *
+ * @author ruoyi
+ * @date 2021-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("教师绑定项目分页查询对象")
+public class TeacherProjectQueryBo 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 teacherId;
+	/** 教育ID */
+	@ApiModelProperty("教育ID")
+	private Long educationId;
+}

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -15,8 +14,8 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 名师分页查询对象 teacher
  *
- * @author hjl
- * @date 2021-05-19
+ * @author ruoyi
+ * @date 2021-11-29
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -38,7 +37,7 @@ public class TeacherQueryBo extends BaseEntity {
 
 
 	/** 教程名称 */
-	@ApiModelProperty("教师名称")
+	@ApiModelProperty("教程名称")
 	private String teacherName;
 	/** 介绍 */
 	@ApiModelProperty("介绍")
@@ -48,9 +47,14 @@ public class TeacherQueryBo extends BaseEntity {
 	private String avatar;
 	/** 状态 0关闭 1开启 */
 	@ApiModelProperty("状态 0关闭 1开启")
-	private List<Integer> status;
-	/** 教师ID数组 */
-	@ApiModelProperty("教师ID数组")
-	private List<Integer> teacherIds;
-
+	private Integer status;
+	/** 编码MK */
+	@ApiModelProperty("编码MK")
+	private String encoder;
+	/** 性别 1男 2女 */
+	@ApiModelProperty("性别 1男 2女")
+	private Integer sex;
+	/** 教师年龄 */
+	@ApiModelProperty("教师年龄")
+	private Long oldYear;
 }

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

@@ -12,8 +12,8 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 名师对象 teacher
  *
- * @author hjl
- * @date 2021-05-19
+ * @author ruoyi
+ * @date 2021-11-29
  */
 @Data
 @NoArgsConstructor
@@ -23,29 +23,27 @@ public class Teacher implements Serializable {
 
 private static final long serialVersionUID=1L;
 
-
     /** 教师ID */
     @TableId(value = "teacher_id")
     private Long teacherId;
-
-    /** 教师名称 */
+    /** 教程名称 */
     private String teacherName;
-
     /** 介绍 */
     private String introduce;
-
     /** 头像 */
     private String avatar;
-
     /** 状态 0关闭 1开启 */
     private Integer status;
-
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
-
     /** 更新时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-
+    /** 编码MK */
+    private String encoder;
+    /** 性别 1男 2女 */
+    private Integer sex;
+    /** 教师年龄 */
+    private Long oldYear;
 }

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

@@ -0,0 +1,41 @@
+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;
+
+/**
+ * 教师绑定项目对象 teacher_project
+ *
+ * @author ruoyi
+ * @date 2021-11-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("teacher_project")
+public class TeacherProject implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 项目ID */
+    private Long projectId;
+    /** 教师ID */
+    private Long teacherId;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 教育ID */
+    private Long educationId;
+}

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

@@ -1,14 +1,13 @@
 package com.zhongzheng.modules.course.mapper;
 
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.domain.Teacher;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 名师Mapper接口
  *
- * @author hjl
- * @date 2021-05-19
+ * @author ruoyi
+ * @date 2021-11-29
  */
 public interface TeacherMapper extends BaseMapper<Teacher> {
 

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.zhongzheng.modules.course.domain.TeacherProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 教师绑定项目Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-29
+ */
+public interface TeacherProjectMapper extends BaseMapper<TeacherProject> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.zhongzheng.modules.course.domain.TeacherProject;
+import com.zhongzheng.modules.course.vo.TeacherProjectVo;
+import com.zhongzheng.modules.course.bo.TeacherProjectQueryBo;
+import com.zhongzheng.modules.course.bo.TeacherProjectAddBo;
+import com.zhongzheng.modules.course.bo.TeacherProjectEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 教师绑定项目Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-29
+ */
+public interface ITeacherProjectService extends IService<TeacherProject> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TeacherProjectVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TeacherProjectVo> queryList(TeacherProjectQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入教师绑定项目
+	 * @param bo 教师绑定项目新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TeacherProjectAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改教师绑定项目
+	 * @param bo 教师绑定项目编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TeacherProjectEditBo 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/ITeacherService.java

@@ -1,12 +1,11 @@
 package com.zhongzheng.modules.course.service;
 
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.course.bo.TeacherAddBo;
-import com.zhongzheng.modules.course.bo.TeacherEditBo;
-import com.zhongzheng.modules.course.bo.TeacherQueryBo;
 import com.zhongzheng.modules.course.domain.Teacher;
 import com.zhongzheng.modules.course.vo.TeacherVo;
+import com.zhongzheng.modules.course.bo.TeacherQueryBo;
+import com.zhongzheng.modules.course.bo.TeacherAddBo;
+import com.zhongzheng.modules.course.bo.TeacherEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
 import java.util.List;
@@ -14,8 +13,8 @@ import java.util.List;
 /**
  * 名师Service接口
  *
- * @author hjl
- * @date 2021-05-19
+ * @author ruoyi
+ * @date 2021-11-29
  */
 public interface ITeacherService extends IService<Teacher> {
 	/**

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/TeacherProjectServiceImpl.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.TeacherProjectAddBo;
+import com.zhongzheng.modules.course.bo.TeacherProjectQueryBo;
+import com.zhongzheng.modules.course.bo.TeacherProjectEditBo;
+import com.zhongzheng.modules.course.domain.TeacherProject;
+import com.zhongzheng.modules.course.mapper.TeacherProjectMapper;
+import com.zhongzheng.modules.course.vo.TeacherProjectVo;
+import com.zhongzheng.modules.course.service.ITeacherProjectService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 教师绑定项目Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-29
+ */
+@Service
+public class TeacherProjectServiceImpl extends ServiceImpl<TeacherProjectMapper, TeacherProject> implements ITeacherProjectService {
+
+    @Override
+    public TeacherProjectVo queryById(Long id){
+        TeacherProject db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TeacherProjectVo.class);
+    }
+
+    @Override
+    public List<TeacherProjectVo> queryList(TeacherProjectQueryBo bo) {
+        LambdaQueryWrapper<TeacherProject> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getProjectId() != null, TeacherProject::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getTeacherId() != null, TeacherProject::getTeacherId, bo.getTeacherId());
+        lqw.eq(bo.getEducationId() != null, TeacherProject::getEducationId, bo.getEducationId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TeacherProjectVo> entity2Vo(Collection<TeacherProject> collection) {
+        List<TeacherProjectVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TeacherProjectVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TeacherProject> page = (Page<TeacherProject>)collection;
+            Page<TeacherProjectVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TeacherProjectAddBo bo) {
+        TeacherProject add = BeanUtil.toBean(bo, TeacherProject.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TeacherProjectEditBo bo) {
+        TeacherProject update = BeanUtil.toBean(bo, TeacherProject.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TeacherProject 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/TeacherServiceImpl.java

@@ -3,19 +3,18 @@ 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.TeacherAddBo;
-import com.zhongzheng.modules.course.bo.TeacherEditBo;
-import com.zhongzheng.modules.course.bo.TeacherQueryBo;
-import com.zhongzheng.modules.course.domain.Teacher;
-import com.zhongzheng.modules.course.mapper.TeacherMapper;
-import com.zhongzheng.modules.course.service.ITeacherService;
-import com.zhongzheng.modules.course.vo.TeacherVo;
 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.TeacherAddBo;
+import com.zhongzheng.modules.course.bo.TeacherQueryBo;
+import com.zhongzheng.modules.course.bo.TeacherEditBo;
+import com.zhongzheng.modules.course.domain.Teacher;
+import com.zhongzheng.modules.course.mapper.TeacherMapper;
+import com.zhongzheng.modules.course.vo.TeacherVo;
+import com.zhongzheng.modules.course.service.ITeacherService;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -25,8 +24,8 @@ import java.util.stream.Collectors;
 /**
  * 名师Service业务层处理
  *
- * @author hjl
- * @date 2021-05-19
+ * @author ruoyi
+ * @date 2021-11-29
  */
 @Service
 public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> implements ITeacherService {
@@ -41,8 +40,12 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     public List<TeacherVo> queryList(TeacherQueryBo bo) {
         LambdaQueryWrapper<Teacher> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getTeacherName()), Teacher::getTeacherName, bo.getTeacherName());
-        lqw.in(bo.getStatus() != null, Teacher::getStatus, bo.getStatus());
-        lqw.in(bo.getTeacherIds() != null, Teacher::getTeacherId, bo.getTeacherIds());
+        lqw.eq(StrUtil.isNotBlank(bo.getIntroduce()), Teacher::getIntroduce, bo.getIntroduce());
+        lqw.eq(StrUtil.isNotBlank(bo.getAvatar()), Teacher::getAvatar, bo.getAvatar());
+        lqw.eq(bo.getStatus() != null, Teacher::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getEncoder()), Teacher::getEncoder, bo.getEncoder());
+        lqw.eq(bo.getSex() != null, Teacher::getSex, bo.getSex());
+        lqw.eq(bo.getOldYear() != null, Teacher::getOldYear, bo.getOldYear());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -0,0 +1,39 @@
+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-11-29
+ */
+@Data
+@ApiModel("教师绑定项目视图对象")
+public class TeacherProjectVo {
+	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 teacherId;
+	/** 教育ID */
+	@Excel(name = "教育ID")
+	@ApiModelProperty("教育ID")
+	private Long educationId;
+}

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

@@ -13,7 +13,7 @@ import java.util.Date;
  * 名师视图对象 mall_package
  *
  * @author ruoyi
- * @date 2021-05-19
+ * @date 2021-11-29
  */
 @Data
 @ApiModel("名师视图对象")
@@ -40,5 +40,16 @@ public class TeacherVo {
 	@Excel(name = "状态 0关闭 1开启")
 	@ApiModelProperty("状态 0关闭 1开启")
 	private Integer status;
-
+	/** 编码MK */
+	@Excel(name = "编码MK")
+	@ApiModelProperty("编码MK")
+	private String encoder;
+	/** 性别 1男 2女 */
+	@Excel(name = "性别 1男 2女")
+	@ApiModelProperty("性别 1男 2女")
+	private Integer sex;
+	/** 教师年龄 */
+	@Excel(name = "教师年龄")
+	@ApiModelProperty("教师年龄")
+	private Long oldYear;
 }

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

@@ -12,6 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="encoder" column="encoder"/>
+        <result property="sex" column="sex"/>
+        <result property="oldYear" column="old_year"/>
     </resultMap>
 
 

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

@@ -0,0 +1,17 @@
+<?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.TeacherProjectMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.TeacherProject" id="TeacherProjectResult">
+        <result property="id" column="id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="teacherId" column="teacher_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="educationId" column="education_id"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/inform/InformMapper.xml

@@ -117,7 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             refund_status = 0
           AND o.user_id =#{userId}
           AND o.goods_id = #{goodsId}
-        and
     </select>
 
     <select id="listGoodsCourse" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo"  resultMap="CourseInformVo">