Jelajahi Sumber

班级列表

change 3 tahun lalu
induk
melakukan
3931fc2eae
20 mengubah file dengan 1017 tambahan dan 4 penghapusan
  1. 35 4
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java
  2. 46 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeSysAddBo.java
  3. 49 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeSysEditBo.java
  4. 55 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeSysQueryBo.java
  5. 36 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserAddBo.java
  6. 41 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserEditBo.java
  7. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java
  8. 50 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeSys.java
  9. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeUser.java
  10. 19 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeSysMapper.java
  11. 19 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java
  12. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeSysService.java
  13. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeUserService.java
  14. 38 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java
  15. 97 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeSysServiceImpl.java
  16. 97 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java
  17. 69 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeSysVo.java
  18. 65 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserVo.java
  19. 54 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeSysMapper.xml
  20. 50 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

+ 35 - 4
zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -4,9 +4,13 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceQueryBo;
+import com.zhongzheng.modules.grade.bo.*;
 import com.zhongzheng.modules.grade.service.IClassGradeInterfaceService;
+import com.zhongzheng.modules.grade.service.IClassGradeSysService;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeInterfaceVo;
+import com.zhongzheng.modules.grade.vo.ClassGradeSysVo;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +27,6 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
-import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
-import com.zhongzheng.modules.grade.bo.ClassGradeAddBo;
-import com.zhongzheng.modules.grade.bo.ClassGradeEditBo;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
@@ -48,6 +49,10 @@ public class ClassGradeController extends BaseController {
 
     private final IClassGradeInterfaceService iClassGradeInterfaceService;
 
+    private final IClassGradeSysService iClassGradeSysService;
+
+    private final IClassGradeUserService iClassGradeUserService;
+
     /**
      * 查询班级列表
      */
@@ -60,6 +65,32 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询学员记录列表
+     */
+    @ApiOperation("查询学员记录列表")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/listUser")
+    public TableDataInfo<ClassGradeUserVo> list(ClassGradeUserQueryBo bo) {
+        startPage();
+        List<ClassGradeUserVo> list = iClassGradeUserService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 查询班主任记录列表
+     */
+    @ApiOperation("查询班主任记录列表")
+    @PreAuthorize("@ss.hasPermi('system:sys:list')")
+    @GetMapping("/listSys")
+    public TableDataInfo<ClassGradeSysVo> list(ClassGradeSysQueryBo bo) {
+        startPage();
+        List<ClassGradeSysVo> list = iClassGradeSysService.queryList(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 查询班级列表
      */

+ 46 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeSysAddBo.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 班主任记录添加对象 class_grade_sys
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班主任记录添加对象")
+public class ClassGradeSysAddBo {
+
+    /** 绑定班级 */
+    @ApiModelProperty("绑定班级")
+    private Long gradeId;
+    /** 账号id */
+    @ApiModelProperty("账号id")
+    private Long sysUserId;
+    /** 指派时间 */
+    @ApiModelProperty("指派时间")
+    private Long startTime;
+    /** 任职最后时间 */
+    @ApiModelProperty("任职最后时间")
+    private Long endTime;
+    /** 指派操作者 */
+    @ApiModelProperty("指派操作者")
+    private String createBy;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 0无效 1有效 */
+    @ApiModelProperty("0无效 1有效")
+    private Integer status;
+}

+ 49 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeSysEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 班主任记录编辑对象 class_grade_sys
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班主任记录编辑对象")
+public class ClassGradeSysEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 绑定班级 */
+    @ApiModelProperty("绑定班级")
+    private Long gradeId;
+
+    /** 账号id */
+    @ApiModelProperty("账号id")
+    private Long sysUserId;
+
+    /** 指派时间 */
+    @ApiModelProperty("指派时间")
+    private Long startTime;
+
+    /** 任职最后时间 */
+    @ApiModelProperty("任职最后时间")
+    private Long endTime;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 0无效 1有效 */
+    @ApiModelProperty("0无效 1有效")
+    private Integer status;
+
+
+}

+ 55 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeSysQueryBo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 班主任记录分页查询对象 class_grade_sys
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("班主任记录分页查询对象")
+public class ClassGradeSysQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 绑定班级 */
+	@ApiModelProperty("绑定班级")
+	private Long gradeId;
+	/** 账号id */
+	@ApiModelProperty("账号id")
+	private Long sysUserId;
+	/** 指派时间 */
+	@ApiModelProperty("指派时间")
+	private Long startTime;
+	/** 任职最后时间 */
+	@ApiModelProperty("任职最后时间")
+	private Long endTime;
+
+	/** 0无效 1有效 */
+	@ApiModelProperty("0无效 1有效")
+	private Integer status;
+}

+ 36 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 学员记录添加对象 class_grade_user
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学员记录添加对象")
+public class ClassGradeUserAddBo {
+
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+    /** 班级id */
+    @ApiModelProperty("班级id")
+    private Long gradeId;
+    /** 1 进入 0移除 */
+    @ApiModelProperty("1 进入 0移除")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

+ 41 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserEditBo.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 学员记录编辑对象 class_grade_user
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学员记录编辑对象")
+public class ClassGradeUserEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+
+    /** 班级id */
+    @ApiModelProperty("班级id")
+    private Long gradeId;
+
+    /** 1 进入 0移除 */
+    @ApiModelProperty("1 进入 0移除")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 学员记录分页查询对象 class_grade_user
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("学员记录分页查询对象")
+public class ClassGradeUserQueryBo 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 userId;
+	/** 班级id */
+	@ApiModelProperty("班级id")
+	private Long gradeId;
+	/** 1 进入 0移除 */
+	@ApiModelProperty("1 进入 0移除")
+	private Integer status;
+}

+ 50 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeSys.java

@@ -0,0 +1,50 @@
+package com.zhongzheng.modules.grade.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+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;
+
+/**
+ * 班主任记录对象 class_grade_sys
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("class_grade_sys")
+public class ClassGradeSys implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 绑定班级 */
+    private Long gradeId;
+    /** 账号id */
+    private Long sysUserId;
+    /** 指派时间 */
+    private Long startTime;
+    /** 任职最后时间 */
+    private Long endTime;
+    /** 指派操作者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 0无效 1有效 */
+    private Integer status;
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeUser.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 学员记录对象 class_grade_user
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("class_grade_user")
+public class ClassGradeUser implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 学员ID */
+    private Long userId;
+    /** 班级id */
+    private Long gradeId;
+    /** 1 进入 0移除 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 指派操作者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+}

+ 19 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeSysMapper.java

@@ -0,0 +1,19 @@
+package com.zhongzheng.modules.grade.mapper;
+
+import com.zhongzheng.modules.grade.bo.ClassGradeSysQueryBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeSys;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeSysVo;
+
+import java.util.Collection;
+
+/**
+ * 班主任记录Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface ClassGradeSysMapper extends BaseMapper<ClassGradeSys> {
+
+    Collection<ClassGradeSysVo> select(ClassGradeSysQueryBo bo);
+}

+ 19 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -0,0 +1,19 @@
+package com.zhongzheng.modules.grade.mapper;
+
+import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
+
+import java.util.Collection;
+
+/**
+ * 学员记录Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
+
+    Collection<ClassGradeUserVo> select(ClassGradeUserQueryBo bo);
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeSysService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.grade.service;
+
+import com.zhongzheng.modules.grade.domain.ClassGradeSys;
+import com.zhongzheng.modules.grade.vo.ClassGradeSysVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeSysQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeSysAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeSysEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 班主任记录Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface IClassGradeSysService extends IService<ClassGradeSys> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ClassGradeSysVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ClassGradeSysVo> queryList(ClassGradeSysQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入班主任记录
+	 * @param bo 班主任记录新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ClassGradeSysAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改班主任记录
+	 * @param bo 班主任记录编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ClassGradeSysEditBo 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/grade/service/IClassGradeUserService.java

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

+ 38 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -4,12 +4,16 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.*;
 import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
+import com.zhongzheng.modules.grade.domain.ClassGradeSys;
 import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
+import com.zhongzheng.modules.grade.service.IClassGradeSysService;
+import com.zhongzheng.modules.system.domain.SysConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,6 +42,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     @Autowired
     private  IGoodsService iGoodsService;
 
+    @Autowired
+    private IClassGradeSysService classGradeSysService;
+
     @Autowired
     private IClassGradeGoodsService classGradeGoodsService;
 
@@ -95,6 +102,18 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 classGradeGoodsService.save(classGradeGoods);
             }
         }
+        if (bo.getSysUserId() != null){
+            ClassGradeSys classGradeSys = new ClassGradeSys();
+            classGradeSys.setGradeId(add.getClassId());
+            classGradeSys.setCreateBy(SecurityUtils.getUsername());
+            classGradeSys.setStartTime(DateUtils.getNowTime());
+            classGradeSys.setSysUserId(bo.getSysUserId());
+            classGradeSys.setStatus(1);
+
+            classGradeSys.setCreateTime(DateUtils.getNowTime());
+            classGradeSys.setUpdateTime(DateUtils.getNowTime());
+            classGradeSysService.save(classGradeSys);
+        }
 
         return save;
     }
@@ -104,6 +123,25 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         ClassGrade update = BeanUtil.toBean(bo, ClassGrade.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        if (bo.getSysUserId() != null){
+            LambdaQueryWrapper<ClassGradeSys> lqw = new LambdaQueryWrapper<>();
+            lqw.like(ClassGradeSys::getGradeId,bo.getClassId());
+            lqw.like(ClassGradeSys::getSysUserId,bo.getSysUserId());
+            if (CollectionUtils.isEmpty(classGradeSysService.list(lqw))){
+                ClassGradeSys classGradeSys = new ClassGradeSys();
+                classGradeSys.setGradeId(bo.getClassId());
+                classGradeSys.setCreateBy(SecurityUtils.getUsername());
+                classGradeSys.setStartTime(DateUtils.getNowTime());
+                classGradeSys.setSysUserId(bo.getSysUserId());
+                classGradeSys.setStatus(1);
+                classGradeSys.setCreateTime(DateUtils.getNowTime());
+                classGradeSys.setUpdateTime(DateUtils.getNowTime());
+                classGradeSysService.save(classGradeSys);
+                ClassGradeSys classGradeSys1 = new ClassGradeSys();
+                classGradeSys1.setStatus(0);
+                classGradeSysService.update(classGradeSys1,lqw);
+            }
+        }
         return this.updateById(update);
     }
 

+ 97 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeSysServiceImpl.java

@@ -0,0 +1,97 @@
+package com.zhongzheng.modules.grade.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.grade.bo.ClassGradeSysAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeSysQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeSysEditBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeSys;
+import com.zhongzheng.modules.grade.mapper.ClassGradeSysMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeSysVo;
+import com.zhongzheng.modules.grade.service.IClassGradeSysService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 班主任记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Service
+public class ClassGradeSysServiceImpl extends ServiceImpl<ClassGradeSysMapper, ClassGradeSys> implements IClassGradeSysService {
+
+    @Override
+    public ClassGradeSysVo queryById(Long id){
+        ClassGradeSys db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ClassGradeSysVo.class);
+    }
+
+    @Override
+    public List<ClassGradeSysVo> queryList(ClassGradeSysQueryBo bo) {
+        return entity2Vo(baseMapper.select(bo));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ClassGradeSysVo> entity2Vo(Collection<ClassGradeSysVo> collection) {
+        List<ClassGradeSysVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ClassGradeSysVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ClassGradeSysVo> page = (Page<ClassGradeSysVo>)collection;
+            Page<ClassGradeSysVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ClassGradeSysAddBo bo) {
+        ClassGradeSys add = BeanUtil.toBean(bo, ClassGradeSys.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ClassGradeSysEditBo bo) {
+        ClassGradeSys update = BeanUtil.toBean(bo, ClassGradeSys.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ClassGradeSys entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 97 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -0,0 +1,97 @@
+package com.zhongzheng.modules.grade.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.grade.bo.ClassGradeUserAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserEditBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeUser;
+import com.zhongzheng.modules.grade.mapper.ClassGradeUserMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 学员记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Service
+public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper, ClassGradeUser> implements IClassGradeUserService {
+
+    @Override
+    public ClassGradeUserVo queryById(Long id){
+        ClassGradeUser db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ClassGradeUserVo.class);
+    }
+
+    @Override
+    public List<ClassGradeUserVo> queryList(ClassGradeUserQueryBo bo) {
+        return entity2Vo(baseMapper.select(bo));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ClassGradeUserVo> entity2Vo(Collection<ClassGradeUserVo> collection) {
+        List<ClassGradeUserVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ClassGradeUserVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ClassGradeUserVo> page = (Page<ClassGradeUserVo>)collection;
+            Page<ClassGradeUserVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ClassGradeUserAddBo bo) {
+        ClassGradeUser add = BeanUtil.toBean(bo, ClassGradeUser.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ClassGradeUserEditBo bo) {
+        ClassGradeUser update = BeanUtil.toBean(bo, ClassGradeUser.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ClassGradeUser entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 69 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeSysVo.java

@@ -0,0 +1,69 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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-10
+ */
+@Data
+@ApiModel("班主任记录视图对象")
+public class ClassGradeSysVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 绑定班级 */
+	@Excel(name = "绑定班级")
+	@ApiModelProperty("绑定班级")
+	private Long gradeId;
+	/** 账号id */
+	@Excel(name = "账号id")
+	@ApiModelProperty("账号id")
+	private Long sysUserId;
+	/** 指派时间 */
+	@Excel(name = "指派时间")
+	@ApiModelProperty("指派时间")
+	private Long startTime;
+	/** 任职最后时间 */
+	@Excel(name = "任职最后时间")
+	@ApiModelProperty("任职最后时间")
+	private Long endTime;
+
+	/** 指派操作者 */
+	@ApiModelProperty("指派人")
+	private String createBy;
+
+	/** 指派操作者 */
+	@ApiModelProperty("指派人")
+	private String createByName;
+
+
+	@ApiModelProperty("班主任")
+	private String sysUserName;
+
+	@ApiModelProperty("角色")
+	private String role;
+
+
+	/** 0无效 1有效 */
+	@ApiModelProperty("0无效 1有效")
+	private Integer status;
+
+	/** 0无效 1有效 */
+	@ApiModelProperty("賬號編碼")
+	private String code;
+}

+ 65 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserVo.java

@@ -0,0 +1,65 @@
+package com.zhongzheng.modules.grade.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-10
+ */
+@Data
+@ApiModel("学员记录视图对象")
+public class ClassGradeUserVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 学员ID */
+	@Excel(name = "学员ID")
+	@ApiModelProperty("学员ID")
+	private Long userId;
+	/** 班级id */
+	@Excel(name = "班级id")
+	@ApiModelProperty("班级id")
+	private Long gradeId;
+	/** 1 进入 0移除 */
+	@Excel(name = "1 进入 0移除")
+	@ApiModelProperty("1 进入 0移除")
+	private Integer status;
+
+	/** 学员编码 */
+	@Excel(name = "学员编码")
+	@ApiModelProperty("学员编码")
+	private String code;
+
+	/** 学员编码 */
+	@Excel(name = "学员姓名")
+	@ApiModelProperty("学员姓名")
+	private String realName;
+
+
+	/** 学员编码 */
+	@Excel(name = "学员身份证")
+	@ApiModelProperty("学员身份证")
+	private String idCard;
+
+	/** 学员编码 */
+	@Excel(name = "学员电话")
+	@ApiModelProperty("学员电话")
+	private String telPhone;
+
+	/** 学员编码 */
+	@Excel(name = "学员电话")
+	@ApiModelProperty("学员电话")
+	private String createBy;
+}

+ 54 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeSysMapper.xml

@@ -0,0 +1,54 @@
+<?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.grade.mapper.ClassGradeSysMapper">
+
+    <resultMap type="com.zhongzheng.modules.grade.domain.ClassGradeSys" id="ClassGradeSysResult">
+        <result property="id" column="id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="sysUserId" column="sys_user_id"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+    <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeSysVo" id="ClassGradeSysVoResult">
+        <result property="id" column="id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="sysUserId" column="sys_user_id"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createByName" column="create_by_name"/>
+        <result property="code" column="code"/>
+        <result property="sysUserName" column="sys_user_name"/>
+        <result property="role" column="role"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+    <select id="select" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeSysQueryBo" resultMap="ClassGradeSysVoResult">
+        SELECT
+            s.*,
+            ( SELECT nick_name FROM sys_user u WHERE s.sys_user_id = u.user_id ) AS sys_user_name,
+            ( SELECT nick_name FROM sys_user u WHERE s.create_by = u.user_id ) AS create_by_name,
+            ( SELECT role_name FROM sys_role u LEFT JOIN sys_user_role r ON r.role_id = u.role_id WHERE r.user_id = s.sys_user_id ) AS role,
+            ( SELECT CODE FROM sys_user u WHERE s.sys_user_id = u.user_id ) AS CODE
+        FROM
+            class_grade_sys s
+        where 1=1
+        <if test="status != null and status.size()!=0 ">
+            AND b.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="gradeId != null and gradeId != ''">
+            AND b.grade_id = #{gradeId}
+        </if>
+    </select>
+</mapper>

+ 50 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -0,0 +1,50 @@
+<?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.grade.mapper.ClassGradeUserMapper">
+
+    <resultMap type="com.zhongzheng.modules.grade.domain.ClassGradeUser" id="ClassGradeUserResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeUserVo" id="ClassGradeUserVoResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="status" column="status"/>
+        <result property="code" column="code"/>
+        <result property="realName" column="real_name"/>
+        <result property="idCard" column="id_card"/>
+        <result property="createBy" column="create_by"/>
+        <result property="telPhone" column="tel_phone"/>
+    </resultMap>
+
+    <select id="select" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="ClassGradeUserVoResult">
+        SELECT
+            g.*,
+            u.student_code,
+            u.realname,
+            u.id_card,
+            u.telphone
+        FROM
+            class_grade_user g
+                LEFT JOIN `user` u ON g.user_id = u.user_id
+        WHERE
+            1 = 1
+        <if test="status != null and status.size()!=0 ">
+            AND b.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="gradeId != null and gradeId != ''">
+            AND b.grade_id = #{gradeId}
+        </if>
+    </select>
+</mapper>