fix 修复

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

@@ -77,4 +77,6 @@ public class SectionStudyRecordVo {
     private String goodsName;
     @ApiModelProperty("班级ID")
     private Long gradeId;
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityRecommendMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN goods g ON rg.goods_id = g.goods_id
         WHERE
             rg.recommend_id = #{recommend_id}
-        order by rg.sort asc 
+        order by rg.sort asc
     </select>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo" resultMap="ActivityRecommendVoResult">
@@ -75,6 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="platform != null and platform != ''">
             AND ar.platform = #{platform}
         </if>
+        <if test="businessId != null and businessId != ''">
+            AND ar.business_id = #{businessId}
+        </if>
     </select>
 
     <select id="getDetail" parameterType="com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo" resultMap="ActivityRecommendVoResult">

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

@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleId" column="module_id"/>
         <result property="chapterId" column="chapter_id"/>
         <result property="gradeId" column="grade_id"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.ExamStudyRecordVo" id="ExamStudyRecordVoResult">
@@ -1177,11 +1178,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.cover_url,
             cs.duration_time,
             r.*,
-            g.goods_name
+            g.goods_name,
+            cgu.order_goods_id
         FROM
             (
                 SELECT
                     from_unixtime( usr.update_time, '%Y-%m-%d' ) date,
+        MAX( usr.update_time ) sort_time,
 		section_id,
 		MAX( usr.video_current_time ) video_current_time,
 		usr.goods_id,
@@ -1200,11 +1203,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     usr.course_id,
                     usr.module_id,
                     usr.chapter_id,
+                    usr.grade_id,
                     usr.grade_id
+
             ) r
                 LEFT JOIN course_section cs ON r.section_id = cs.section_id
                 LEFT JOIN goods g ON g.goods_id = r.goods_id
+                LEFT JOIN class_grade_user cgu ON cgu.grade_id = r.grade_id and cgu.user_id = #{userId}
         ORDER BY
-            r.date DESC
+            r.sort_time DESC
     </select>
 </mapper>