Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontStudentController.java

@@ -358,6 +358,13 @@ public class FrontStudentController extends BaseController {
         return AjaxResult.success(learnStatService.getRecordPlanStudy(SecurityUtils.getUserId(), year, month));
     }
 
+    @ApiOperation("练习列表")
+    @GetMapping("record/practice")
+    public TableDataInfo practice()
+    {
+        return getDataTable(learnStatService.selectStudentPractices(SecurityUtils.getUserId()));
+    }
+
     @ApiOperation("56 记录-视频学习")
     @GetMapping("record/video")
     public AjaxResult getRecordVideo()

ie-admin/src/main/java/com/ruoyi/web/service/LearnStatService.java

@@ -31,6 +31,9 @@ public class LearnStatService {
         this.learnStudentService = learnStudentService;
         this.learnTeacherService = learnTeacherService1;
     }
+    public List<JSONObject> selectStudentPractices(Long studentId) {
+        return examineeMapper.selectStudentPractices(studentId);
+    }
 
     public List<JSONObject> getSimulatedClassRecord(Long teacherId) {
         return examineeMapper.selectSimulatedStats(teacherId);

ie-system/src/main/java/com/ruoyi/learn/mapper/LearnExamineeMapper.java

@@ -20,6 +20,7 @@ public interface LearnExamineeMapper
     public List<JSONObject> selectSimulatedStuSubjectStats(@Param("studentId") Long studentId);
 
     public List<JSONObject> selectExamRankingStats(@Param("studentId") Integer stuScore, @Param("paperIds") Collection<Long> paperIds);
+    public List<JSONObject> selectStudentPractices(@Param("studentId") Long studentId);
 
     /**
      * 查询答卷

ie-system/src/main/resources/mapper/learn/LearnExamineeMapper.xml

@@ -93,6 +93,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY e2.`paper_id`
     </select>
 
+    <select id="selectStudentPractices" resultType="com.alibaba.fastjson2.JSONObject">
+        SELECT e.`examinee_id` examineeId, e.`end_time` endTime, SUBSTRING_INDEX(SUBSTRING_INDEX(p.`paperName`, '-', 2), '-', -1) paperName, LENGTH(SUBSTRING_INDEX(SUBSTRING_INDEX(p.`direct_key`, '_', 2), '_', -1)) > 0 AS directed
+          FROM `learn_examinee` e
+          JOIN `learn_paper` p ON e.`paper_id` = p.`id`
+         WHERE e.student_id = #{studentId} and e.`paper_type` = '50' AND e.`state` &gt;= 4
+        ORDER BY e.`end_time` DESC
+    </select>
+
     <select id="selectLearnExamineeByExamineeId" parameterType="Long" resultMap="LearnExamineeResult">
         <include refid="selectLearnExamineeVo"/>
         where examinee_id = #{examineeId}