he2802 2 yıl önce
ebeveyn
işleme
651a0f95da

+ 0 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleChapterServiceImpl.java

@@ -149,7 +149,6 @@ public class CourseModuleChapterServiceImpl extends ServiceImpl<CourseModuleChap
                     courseUserModuleChapterVo.setRebuild(1);
                 }
             }
-
         }
         //获得重修目录
         if (bo.getRebuild() != null && bo.getRebuild() == 1){

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

@@ -382,6 +382,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                             userPeriodQueryBo2.setChapterId(bo.getChapterId());
                             userPeriodQueryBo2.setModuleId(bo.getModuleId());
                             userPeriodQueryBo2.setGradeId(bo.getGradeId());
+                            userPeriodQueryBo2.setOrderGoodsId(bo.getOrderGoodsId());
                             List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo2);
                             if (!CollectionUtils.isEmpty(userPeriodStatusVos)&&userPeriodStatusVos.size()>0) {
                                 int numIndex = userPeriodStatusVos.size() - 1;

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

@@ -430,8 +430,8 @@
         <if test="gradeId != null and gradeId !='' ">
             and cgu.grade_id = #{gradeId}
         </if>
-        <if test="orderGoodsId != null and orderGoodsId != ''">
-            AND cgu.order_goods_id = #{orderGoodsId}
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND cgu.order_goods_id =  #{orderGoodsId}
         </if>
         LIMIT 1
     </select>
@@ -473,8 +473,8 @@
         <if test="gradeId != null and gradeId !=''">
             AND grade_id = #{gradeId}
         </if>
-        <if test="orderGoodsId != null and orderGoodsId != ''">
-            AND order_goods_id = #{orderGoodsId}
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND order_goods_id =  #{orderGoodsId}
         </if>
         AND course_id = #{courseId} ORDER BY record_id DESC LIMIT 9999 ) usr
         GROUP BY
@@ -519,8 +519,8 @@
         <if test="gradeId != null and gradeId !=''">
             AND grade_id = #{gradeId}
         </if>
-        <if test="orderGoodsId != null and orderGoodsId != ''">
-            AND order_goods_id = #{orderGoodsId}
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND order_goods_id =  #{orderGoodsId}
         </if>
         AND module_id = 0
         AND course_id = #{courseId} ORDER BY record_id DESC LIMIT 9999 ) usr
@@ -569,6 +569,9 @@
         <if test="gradeId != null and gradeId !=''">
             AND grade_id = #{gradeId}
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND order_goods_id =  #{orderGoodsId}
+        </if>
         AND course_id = #{courseId} ORDER BY record_id DESC LIMIT 9999 ) usr
         GROUP BY
         usr.section_id,usr.module_id,
@@ -1116,6 +1119,9 @@
                 AND usr.goods_id = 0
             </otherwise>
         </choose>
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND usr.order_goods_id =  #{orderGoodsId}
+        </if>
         AND usr.plan_id =#{planId}
     </select>