题库列表

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

@@ -76,31 +76,32 @@ public class ClassGradeController extends BaseController {
     }
 
     /**
-     * 查询学员记录列表
+     * 查询学时学员记录列表
      */
-    @ApiOperation("查询学员记录列表")
+    @ApiOperation("查询学员学时列表")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
-    @GetMapping("/listUser")
-    public TableDataInfo<ClassGradeUserVo> list(ClassGradeUserQueryBo bo) {
+    @GetMapping("/listUserPeriod")
+    public TableDataInfo<ClassPeriodStudentVo> listUserPeriod(ClassGradeUserQueryBo bo) {
         startPage();
-        List<ClassGradeUserVo> list = iClassGradeUserService.queryList(bo);
+        List<ClassPeriodStudentVo> list = iClassGradeUserService.listUserPeriod(bo);
         return getDataTable(list);
     }
 
     /**
-     * 查询学时学员记录列表
+     * 查询学员记录列表
      */
     @ApiOperation("查询学员记录列表")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
-    @GetMapping("/listUserPeriod")
-    public TableDataInfo<ClassGradeUserVo> listUserPeriod(ClassGradeUserQueryBo bo) {
+    @GetMapping("/listUser")
+    public TableDataInfo<ClassGradeUserVo> list(ClassGradeUserQueryBo bo) {
         startPage();
-        List<ClassGradeUserVo> list = iClassGradeUserService.listUserPeriod(bo);
+        List<ClassGradeUserVo> list = iClassGradeUserService.queryList(bo);
         return getDataTable(list);
     }
 
 
 
+
     /**
      * 查询班主任记录列表
      */

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

@@ -21,8 +21,12 @@ import com.zhongzheng.common.annotation.Excel;
 @TableName("class_grade_goods")
 public class ClassGradeGoods implements Serializable {
 
-private static final long serialVersionUID=1L;
+    private static final long serialVersionUID=1L;
 
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
     /** $column.columnComment */
     private Long gradeId;
     /** $column.columnComment */

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

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
+import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,4 +21,6 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     Collection<ClassGradeUserVo> select(ClassGradeUserQueryBo bo);
 
     List<ClassGradeUserGoodsVo> listUser(ClassGradeUserQueryBo bo);
+
+    List<ClassPeriodStudentVo> listUserPeriod(ClassGradeUserQueryBo bo);
 }

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

@@ -7,6 +7,7 @@ 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 com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -53,5 +54,5 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
     List<ClassGradeUserGoodsVo> listUser(ClassGradeUserQueryBo bo);
 
-	List<ClassGradeUserVo> listUserPeriod(ClassGradeUserQueryBo bo);
+	List<ClassPeriodStudentVo> listUserPeriod(ClassGradeUserQueryBo bo);
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
+import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -102,7 +103,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
     @Override
-    public List<ClassGradeUserVo> listUserPeriod(ClassGradeUserQueryBo bo) {
-        return null;
+    public List<ClassPeriodStudentVo> listUserPeriod(ClassGradeUserQueryBo bo) {
+        return baseMapper.listUserPeriod(bo);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -207,7 +207,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                         s= s.concat(examType + ",");
                     }
                 }
-                examSonStudyRecordVo.setExamType(s.substring(0, s.length() - 1));
+                if (StringUtils.isNotBlank(s)) {
+                    examSonStudyRecordVo.setExamType(s.substring(0, s.length() - 1));
+                }
             }
             examStudyRecordVo.setExamSonStudyRecordVos(examSonStudyRecordVos);
         }

zhongzheng-system/src/main/resources/mapper/modules/bank/ExamMapper.xml

@@ -70,13 +70,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_business cb ON qb.business_id = cb.id
                 LEFT JOIN course_subject cs ON cs.id = qb.subject_id
         <if test="educationTypeId != null and educationTypeId != ''">
-            AND qb.education_type_id = #{educationTypeId}
+            AND cet.education_type_id = #{educationTypeId}
         </if>
         <if test="subjectId != null and subjectId != ''">
-            AND qb.subject_id = #{subjectId}
+            AND cs.subject_id = #{subjectId}
         </if>
         <if test="businessId != null and businessId != ''">
-            AND qb.business_id = #{businessId}
+            AND cb.business_id = #{businessId}
         </if>
         <if test="projectId != null and projectId != ''">
             AND cpt.project_id = #{projectId}

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

@@ -111,7 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"/>

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

@@ -47,6 +47,25 @@
         <result property="createBy" column="create_by"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo" id="ClassPeriodStudentVo">
+        <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="secAllNum" column="sec_all_num"/>
+        <result property="examNum" column="exam_num"/>
+        <result property="recordNum" column="record_num"/>
+    </resultMap>
+
     <select id="select" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
             resultMap="ClassGradeUserVoResult">
         SELECT
@@ -107,4 +126,42 @@
         </if>
         order by u.update_time desc
     </select>
+
+
+    <select id="listUserPeriod"  parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="ClassPeriodStudentVo">
+        SELECT
+        u.student_code,
+        u.user_id,
+        cgu.`status`,
+        u.realname,
+        (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id) as goods_id,
+        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.grade_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.grade_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.grade_id = cgg.grade_id) as study_end_time,
+        cg.class_start_time,
+        cg.class_end_time,
+        cgu.official_status,
+        cgu.learn_status,
+        (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
+        (SELECT COUNT(DISTINCT ubr.record_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1) as record_num
+        FROM
+        class_grade_user cgu
+        LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_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>
+        order by cgu.update_time
+    </select>
+
+
+
 </mapper>