fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/DangAnController.java

@@ -6,6 +6,7 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
+import com.zhongzheng.modules.grade.vo.UserPeriodExportV2Vo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderListVo;
@@ -126,11 +127,19 @@ public class DangAnController extends BaseController {
         return getDataTable(list);
     }
 
-
     @ApiOperation("获取证书详细信息")
     @GetMapping("/certificateDetail")
     public AjaxResult<UserCertificateVo> getInfo(UserCertificateQueryBo bo) {
         return AjaxResult.success(iUserCertificateService.selectDetail(bo));
     }
 
+    @ApiOperation("查询学员直播学习记录列表")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/listUserStudyLiveRecord")
+    public TableDataInfo<UserPeriodExportV2Vo> listUserStudyRecordV2Week(ClassGradeUserQueryBo bo) {
+        startPage();
+        List<UserPeriodExportV2Vo> list = iClassGradeUserService.listUserStudyRecordV2Week(bo);
+        return getDataTable(list);
+    }
+
 }

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

@@ -1669,6 +1669,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     private UserPeriodExportV2Vo mergeEamDataV2(Long index, String moduleName, String chapterName, String sectionName, ClassPeriodSectionVo classPeriodSectionVo) {
         //试卷学习记录
         UserBankRecordQueryBo recordQueryBo = BeanUtil.toBean(classPeriodSectionVo, UserBankRecordQueryBo.class);
+        recordQueryBo.setCurrentStatus(1);
         List<UserBankRecordVo> recordList = iUserBankRecordService.queryList(recordQueryBo);
         //录入学时记录
         UserPeriodExportV2Vo userPeriodExportVo = new UserPeriodExportV2Vo();
@@ -1715,6 +1716,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     exportVo.setDurationTime(classPeriodSectionVo.getDurationTime());
                     exportVo.setSectionType(classPeriodSectionVo.getSectionType());
                     exportVo.setFromPlat(vo.getFromPlat());
+                    exportVo.setSectionType(vo.getSectionType());
                     studyList.add(exportVo);
                 }
                 endTime = vo.getEndTime();

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

@@ -135,6 +135,7 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
         lqw.eq(bo.getChapterId() != null, UserBankRecord::getChapterId, bo.getChapterId());
         lqw.eq(bo.getPerformance() != null, UserBankRecord::getPerformance, bo.getPerformance());
         lqw.eq(bo.getGradeId() != null, UserBankRecord::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getOrderGoodsId() != null, UserBankRecord::getOrderGoodsId, bo.getOrderGoodsId());
         lqw.eq(bo.getCurrentStatus() != null, UserBankRecord::getCurrentStatus, bo.getCurrentStatus());
         lqw.between(bo.getSearchWeekStartTime()!= null, UserBankRecord::getUpdateTime,bo.getSearchWeekStartTime(),bo.getSearchWeekEndTime());
         return entity2Vo(this.list(lqw));

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

@@ -2056,13 +2056,18 @@
         SELECT *
         FROM user_study_record
         WHERE user_id = #{userId}
-          AND grade_id = #{gradeId}
           AND course_id = #{courseId}
           AND module_id = #{moduleId}
           AND section_id = #{sectionId}
           AND chapter_id = #{chapterId}
           AND goods_id = #{goodsId}
           AND current_status = 1
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            AND grade_id = #{orderGoodsId}
+        </if>
+        <if test="gradeId != null and gradeId != '' ">
+            AND grade_id = #{gradeId}
+        </if>
         <if test="searchWeekStartTime != null and searchWeekStartTime != '' ">
             AND update_time >= #{searchWeekStartTime}
         </if>