學員信息

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

@@ -18,6 +18,7 @@ import com.zhongzheng.modules.user.bo.UserQueryBo;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.GoodsStudyRecordVo;
+import com.zhongzheng.modules.user.vo.SectionStudyRecordVo;
 import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserVo;
 import io.swagger.annotations.Api;
@@ -97,6 +98,17 @@ public class ClassStudentController extends BaseController {
     public TableDataInfo<GoodsStudyRecordVo> list(UserQueryBo bo) {
         startPage();
         List<GoodsStudyRecordVo> list = iUserStudyRecordService.queryGoods(bo);
+        for (GoodsStudyRecordVo goodsStudyRecordVo : list) {
+            SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
+            subjectStudyRecordQueryBo.setGoodId(goodsStudyRecordVo.getGoodsId());
+            subjectStudyRecordQueryBo.setUserId(goodsStudyRecordVo.getUserId());
+            List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+            for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
+                subjectStudyRecordQueryBo.setCourseId(subjectStudyRecordVo.getCourseId());
+                subjectStudyRecordVo.setSectionStudyRecordVo(iUserStudyRecordService.listSection(subjectStudyRecordQueryBo));
+            }
+            goodsStudyRecordVo.setSubjectStudyRecordVos(subjectStudyRecordVos);
+        }
         return getDataTable(list);
     }
 
@@ -119,9 +131,9 @@ public class ClassStudentController extends BaseController {
     @ApiOperation("查询学员课程节学习记录")
     @PreAuthorize("@ss.hasPermi('grade:student:listSection')")
     @GetMapping("/listSection")
-    public TableDataInfo<SubjectStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo) {
+    public TableDataInfo<SectionStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo) {
         startPage();
-        List<SubjectStudyRecordVo> list = iUserStudyRecordService.listSection(bo);
+        List<SectionStudyRecordVo> list = iUserStudyRecordService.listSection(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.user.bo.UserQueryBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.vo.GoodsStudyRecordVo;
+import com.zhongzheng.modules.user.vo.SectionStudyRecordVo;
 import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
 import org.apache.ibatis.annotations.Param;
@@ -28,5 +29,5 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
 
     List<SubjectStudyRecordVo> listSubject(SubjectStudyRecordQueryBo bo);
 
-    List<SubjectStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo);
+    List<SectionStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.vo.GoodsStudyRecordVo;
+import com.zhongzheng.modules.user.vo.SectionStudyRecordVo;
 import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
 import org.apache.ibatis.annotations.Param;
@@ -59,5 +60,5 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	List<SubjectStudyRecordVo> listSubject(SubjectStudyRecordQueryBo bo);
 
-	List<SubjectStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo);
+	List<SectionStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo);
 }

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

@@ -8,10 +8,7 @@ import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
-import com.zhongzheng.modules.user.vo.GoodsStudyRecordVo;
-import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
-import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
-import com.zhongzheng.modules.user.vo.UserVo;
+import com.zhongzheng.modules.user.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -139,7 +136,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     }
 
     @Override
-    public List<SubjectStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo) {
+    public List<SectionStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo) {
         return baseMapper.listSection(bo);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/GoodsStudyRecordVo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
@@ -78,4 +80,10 @@ public class GoodsStudyRecordVo {
     @ApiModelProperty("学习结束时间")
     private Long endTime;
 
+
+    /** 課程科目返回 */
+    @ApiModelProperty("課程科目返回")
+    private List<SubjectStudyRecordVo> subjectStudyRecordVos;
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SubjectStudyRecordVo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】视图对象 mall_package
  *
@@ -57,4 +59,8 @@ public class SubjectStudyRecordVo {
     @ApiModelProperty("已学节数")
     private Long recordNum;
 
+    /** 科目節模塊學習返回 */
+    @ApiModelProperty("科目節模塊學習返回")
+    private List<SectionStudyRecordVo> sectionStudyRecordVo;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -89,27 +89,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and study_duration > 360
     </select>
 
-    <select id="queryGoods" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo"  resultMap="GoodsStudyRecordVoResult">
-        SELECT
-            g.goods_name,
-            g.`code`,
-            g.`year`,
-            g.class_hours,
-            g.study_start_time,
-            g.study_end_time,
-            g.goods_id,
-            u.grade_id,
-            u.user_id,
-            (SELECT i.business_name FROM course_business i where i.id = g.business_id) as business_name,
-            (SELECT p.project_name FROM course_project_type p where p.id = g.business_id) as project_name,
-            (SELECT s.school_name FROM school s  where s.id = g.school_id) as school_name,
-            (SELECT e.education_name FROM course_education_type e  where e.id = g.education_type_id) as education_name,
-            (SELECT r.start_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1 AND g.goods_id=c.goods_id ORDER BY r.start_time ASC) as start_time,
-            (SELECT r.end_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1 AND g.goods_id=c.goods_id ORDER BY r.start_time ASC) as end_time
+    <select id="queryGoods" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo"  resultMap="GoodsStudyRecordVoResult">SELECT
+        g.goods_name,
+        g.`code`,
+        g.`year`,
+        g.class_hours,
+        g.study_start_time,
+        g.study_end_time,
+        g.goods_id,
+        u.grade_id,
+        u.user_id,
+        (SELECT i.business_name FROM course_business i where i.id = g.business_id) as business_name,
+        (SELECT p.project_name FROM course_project_type p where p.id = g.business_id) as project_name,
+        (SELECT s.school_name FROM school s  where s.id = g.school_id) as school_name,
+        (SELECT e.education_name FROM course_education_type e  where e.id = g.education_type_id) as education_name,
+        (SELECT r.start_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1 AND g.goods_id=c.goods_id ORDER BY r.start_time ASC LIMIT 1) as start_time,
+        (SELECT r.end_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1 AND g.goods_id=c.goods_id ORDER BY r.start_time DESC LIMIT 1) as end_time
         FROM
-            class_grade_user u
-                LEFT JOIN class_grade_goods d ON u.grade_id = d.grade_id
-                LEFT JOIN goods g on g.goods_id = d.goods_id
+        class_grade_user u
+        LEFT JOIN class_grade_goods d ON u.grade_id = d.grade_id
+        LEFT JOIN goods g on g.goods_id = d.goods_id
         where 1=1
         <if test="userId != null and userId !=''">
             and u.user_id = #{userId}