班級列表

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

@@ -8,9 +8,7 @@ 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 com.zhongzheng.modules.grade.vo.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +24,6 @@ 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.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
@@ -65,6 +62,19 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
+
+    /**
+     * 查询班级列表
+     */
+    @ApiOperation("查询班级学员列表")
+    @PreAuthorize("@ss.hasPermi('grade:grade:list')")
+    @GetMapping("/listGrade")
+    public TableDataInfo<ClassGradeStudentVo> listGrade(ClassGradeQueryBo bo) {
+        startPage();
+        List<ClassGradeStudentVo> list = iClassGradeService.listGrade(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 查询学员记录列表
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeEditBo.java

@@ -20,7 +20,7 @@ public class ClassGradeEditBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
-    private Long classId;
+    private Long gradeId;
 
     /** 开班状态 0未开班 1开班 */
     @ApiModelProperty("开班状态 0未开班 1开班")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -40,7 +40,7 @@ public class ClassGradeQueryBo extends BaseEntity {
 
 	/** id */
 	@ApiModelProperty("id")
-	private Long classId;
+	private Long gradeId;
 	/** 开班状态 0未开班 1开班 */
 	@ApiModelProperty("开班状态 0未开班 1开班")
 	private Integer classStatus;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -26,7 +26,7 @@ private static final long serialVersionUID=1L;
 
     /** $column.columnComment */
     @TableId(value = "class_id")
-    private Long classId;
+    private Long gradeId;
     /** 开班状态 0未开班 1开班 */
     private Integer classStatus;
     /** 官方班级 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -4,6 +4,7 @@ import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 
 import java.util.Collection;
@@ -20,4 +21,7 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     Collection<ClassGradeVo> queryList(ClassGradeQueryBo bo);
 
     List<GoodsVo> queryGoodsList(Long classId);
+
+
+    List<ClassGradeStudentVo> listGrade(ClassGradeQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.grade.service;
 
 import com.zhongzheng.modules.grade.domain.ClassGrade;
+import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeAddBo;
@@ -49,4 +50,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<ClassGradeStudentVo> listGrade(ClassGradeQueryBo bo);
 }

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

@@ -13,6 +13,7 @@ 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.grade.vo.ClassGradeStudentVo;
 import com.zhongzheng.modules.system.domain.SysConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,9 +50,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     private IClassGradeGoodsService classGradeGoodsService;
 
     @Override
-    public ClassGradeVo queryById(Long classId){
+    public ClassGradeVo queryById(Long gradeId){
         ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
-        classGradeQueryBo.setClassId(classId);
+        classGradeQueryBo.setGradeId(gradeId);
         return entity2Vo(baseMapper.queryList(classGradeQueryBo)).get(0);
     }
 
@@ -78,7 +79,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             voList = pageVo;
         }
         for (ClassGradeVo classGradeVo : voList) {
-            List<GoodsVo> goodsVoList=baseMapper.queryGoodsList(classGradeVo.getClassId());
+            List<GoodsVo> goodsVoList=baseMapper.queryGoodsList(classGradeVo.getGradeId());
             classGradeVo.setGoodsList(goodsVoList);
         }
         return voList;
@@ -95,7 +96,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         if (bo.getClassGradeGoodsAddBos() != null){
             for (Long classGradeGoodsAddBo : bo.getClassGradeGoodsAddBos()) {
                 ClassGradeGoods classGradeGoods = new ClassGradeGoods();
-                classGradeGoods.setGradeId(add.getClassId());
+                classGradeGoods.setGradeId(add.getGradeId());
                 classGradeGoods.setGoodsId(classGradeGoodsAddBo);
                 classGradeGoods.setCreateTime(DateUtils.getNowTime());
                 classGradeGoods.setUpdateTime(DateUtils.getNowTime());
@@ -104,7 +105,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         }
         if (bo.getSysUserId() != null){
             ClassGradeSys classGradeSys = new ClassGradeSys();
-            classGradeSys.setGradeId(add.getClassId());
+            classGradeSys.setGradeId(add.getGradeId());
             classGradeSys.setCreateBy(SecurityUtils.getUsername());
             classGradeSys.setStartTime(DateUtils.getNowTime());
             classGradeSys.setSysUserId(bo.getSysUserId());
@@ -125,12 +126,12 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         update.setUpdateTime(DateUtils.getNowTime());
         if (bo.getSysUserId() != null){
             LambdaQueryWrapper<ClassGradeSys> lqw = new LambdaQueryWrapper<>();
-            lqw.like(ClassGradeSys::getGradeId,bo.getClassId());
+            lqw.like(ClassGradeSys::getGradeId,bo.getGradeId());
             lqw.like(ClassGradeSys::getSysUserId,bo.getSysUserId());
             lqw.like(ClassGradeSys::getStatus,1);
             if (CollectionUtils.isEmpty(classGradeSysService.list(lqw))){
                 lqw.clear();
-                lqw.like(ClassGradeSys::getGradeId,bo.getClassId());
+                lqw.like(ClassGradeSys::getGradeId,bo.getGradeId());
                 lqw.like(ClassGradeSys::getStatus,1);
                 ClassGradeSys classGradeSys1 = new ClassGradeSys();
                 classGradeSys1.setStatus(0);
@@ -138,7 +139,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 classGradeSysService.update(classGradeSys1,lqw);
 
                 ClassGradeSys classGradeSys = new ClassGradeSys();
-                classGradeSys.setGradeId(bo.getClassId());
+                classGradeSys.setGradeId(bo.getGradeId());
                 classGradeSys.setCreateBy(SecurityUtils.getUsername());
                 classGradeSys.setStartTime(DateUtils.getNowTime());
                 classGradeSys.setSysUserId(bo.getSysUserId());
@@ -167,4 +168,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<ClassGradeStudentVo> listGrade(ClassGradeQueryBo bo) {
+        return baseMapper.listGrade(bo);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 学员记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学员视图对象")
+public class ClassGradeStudentVo {
+	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 studentCode;
+
+	/** 学员编码 */
+	@Excel(name = "学员姓名")
+	@ApiModelProperty("学员姓名")
+	private String realName;
+
+
+	/** 学员编码 */
+	@Excel(name = "学员身份证")
+	@ApiModelProperty("学员身份证")
+	private String idCard;
+
+	/** 学员编码 */
+	@Excel(name = "学员电话")
+	@ApiModelProperty("学员电话")
+	private String telPhone;
+
+	/** 操作人 */
+	@Excel(name = "资料是否变更过")
+	@ApiModelProperty("资料是否变更过 1变更 0未变更")
+	private Integer userStatus;
+
+	/** 学时 */
+	@ApiModelProperty("学时")
+	private Long classHours;
+
+	/** 学时审批状态 0 未通过 1通过 */
+	@ApiModelProperty("学时审批状态 0 未通过 1通过")
+	private Long periodStatus;
+
+	/** 结业状态 0 未结业 1结业 */
+	@ApiModelProperty("结业状态 0 未结业 1结业")
+	private Long finishStatus;
+
+	/** 官方推送状态 1是 0否 */
+	@ApiModelProperty("官方推送状态 1是 0否")
+	private Long officialStatus;
+
+	/** 官方学习账号推送状态 */
+	@ApiModelProperty("官方学习账号推送状态")
+	private Long learnStatus;
+
+	/** 学习进度 */
+	@ApiModelProperty("学习进度")
+	private Long studyNum;
+
+	/** 学习进度 */
+	@ApiModelProperty("总节数")
+	private Long secAllNum;
+
+
+	/** 节数 */
+	@ApiModelProperty("试卷数")
+	private Long examNum;
+
+
+	/** 已做试卷 */
+	@ApiModelProperty("已做试卷")
+	private Long recordNum;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -26,7 +26,7 @@ public class ClassGradeVo {
 
 	/** $pkColumn.columnComment */
 	@ApiModelProperty("$pkColumn.columnComment")
-	private Long classId;
+	private Long gradeId;
 
 	/** 开班状态 0未开班 1开班 */
 	@Excel(name = "开班状态 0未开班 1开班")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputDataAddBo.java

@@ -23,7 +23,7 @@ public class OrderInputDataAddBo {
     private String gradeJson;
 
     @ApiModelProperty("班级ID")
-    private Long classId;
+    private Long gradeId;
     /** 备注 */
     @ApiModelProperty("报考地区")
     private String applyAreasJson;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -72,6 +72,6 @@ private static final long serialVersionUID=1L;
     /** 备注 */
     private String remark;
     /** 班级id */
-    private Long classId;
+    private Long gradeId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -193,7 +193,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             payPrice = payPrice.add(g.getGoodsPrice());
             //视频商品安排班级
             if(goods.getGoodsType()==1){
-                if(g.getGoodsInputData().getClassId()!=null){
+                if(g.getGoodsInputData().getGradeId()!=null){
 
                 }
             }
@@ -244,9 +244,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @param classId
      * @return
      */
-    public boolean joinClass(Long goodsId,Long classId,Long userId){
-        if(classId!=null){
-            ClassGradeVo classGradeVo = iClassGradeService.queryById(classId);
+    public boolean joinClass(Long goodsId,Long gradeId,Long userId){
+        if(gradeId!=null){
+            ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
             if(classGradeVo==null){
                 throw new CustomException("班级不存在");
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -113,5 +113,5 @@ public class OrderGoodsVo {
 	/** 班级id */
 	@Excel(name = "班级id")
 	@ApiModelProperty("班级id")
-	private Long classId;
+	private Long gradeId;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zhongzheng.modules.grade.mapper.ClassGradeMapper">
 
     <resultMap type="com.zhongzheng.modules.grade.domain.ClassGrade" id="ClassGradeResult">
-        <result property="classId" column="class_id"/>
+        <result property="gradeId" column="class_id"/>
         <result property="classStatus" column="class_status"/>
         <result property="officialName" column="official_name"/>
         <result property="className" column="class_name"/>
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
-        <result property="classId" column="class_id"/>
+        <result property="gradeId" column="grade_id"/>
         <result property="classStatus" column="class_status"/>
         <result property="officialName" column="official_name"/>
         <result property="className" column="class_name"/>
@@ -97,6 +97,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="templateType" column="template_type"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeStudentVo" id="ClassGradeStudentVo">
+        <result property="userId" column="user_id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="studentCode" column="student_code"/>
+        <result property="realName" column="realname"/>
+        <result property="idCard" column="id_card"/>
+        <result property="telPhone" column="telphone"/>
+        <result property="userStatus" column="user_status"/>
+        <result property="status" column="status"/>
+        <result property="classHours" column="class_hours"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="finishStatus" column="finish_status"/>
+        <result property="officialStatus" column="official_status"/>
+        <result property="learnStatus" column="learn_status"/>
+        <result property="studyNum" column="study_num"/>
+        <result property="secAllNum" column="sec_all_num"/>
+        <result property="examNum" column="exam_num"/>
+        <result property="recordNum" column="record_num"/>
+    </resultMap>
+
     <select id="queryList" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeQueryBo" resultMap="ClassGradeVoResult">
         SELECT
             g.*,
@@ -116,8 +136,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-        <if test="classId != null and classId !=0 ">
-            AND g.class_id =  #{classId}
+        <if test="gradeId != null and gradeId !=0 ">
+            AND g.grade_id =  #{gradeId}
         </if>
         <if test="className != null and className !='' ">
             AND g.class_name like concat('%', #{className}, '%')
@@ -202,7 +222,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN class_grade_goods o ON o.goods_id = g.goods_id
         WHERE
             1 = 1
-          AND o.grade_id =#{classId}
+          AND o.grade_id =#{gradeId}
+    </select>
+
+    <select id="listGrade"  parameterType="com.zhongzheng.modules.grade.bo.ClassGradeQueryBo" resultMap="ClassGradeStudentVo">
+        SELECT
+        u.student_code,
+        u.user_id,
+        cgu.`status`,
+        u.realname,
+        u.id_card,
+        cgu.grade_id,
+        u.telphone,
+        (case WHEN (select COUNT(uu.id) FROM user_update uu where cgu.user_id = uu.user_id) >0 then 1 ELSE 0 end) as user_status,
+        (SELECT g.class_hours FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where cg.class_id = cgg.grade_id) as class_hours,
+        cgu.period_status,
+        cgu.finish_status,
+        (SELECT g.study_start_time FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where cg.class_id = cgg.grade_id) as study_start_time,
+        (SELECT g.study_end_time FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where cg.class_id = cgg.grade_id) as study_end_time,
+        cg.class_start_time,
+        cg.class_end_time,
+        cgu.official_status,
+        cgu.learn_status
+        FROM
+        class_grade_user cgu
+        LEFT JOIN class_grade cg ON cgu.grade_id = cg.class_id
+        LEFT JOIN `user` u ON u.user_id = cgu.user_id
+        where 1=1
+        and cgu.`status` =1
+        <if test="gradeId != null and gradeId !='' ">
+          and cgu.grade_id = #{gradeId}
+        </if>
     </select>
 
 

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address" column="address"/>
         <result property="company" column="company"/>
         <result property="remark" column="remark"/>
-        <result property="classId" column="class_id"/>
+        <result property="gradeId" column="grade_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="OrderGoodsResultVo">
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessName" column="business_name"/>
         <result property="createBy" column="create_by"/>
         <result property="goodsType" column="goods_type"/>
-        <result property="classId" column="class_id"/>
+        <result property="gradeId" column="grade_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">