|
|
@@ -4407,7 +4407,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
//next
|
|
|
for (ExamStudyRecordVo classPeriodStudentVo : list) {
|
|
|
String goodsDirPath = dirPath+"/"+classPeriodStudentVo.getGoodsName();
|
|
|
- List<DangAnStudentExportAllVo> studyList = new ArrayList<>();
|
|
|
+ List<DangAnStudentExportLiveAllVo> studyList = new ArrayList<>();
|
|
|
ClassGradeUserQueryBo classGradeUserQueryBo1 = new ClassGradeUserQueryBo();
|
|
|
classGradeUserQueryBo1.setUserId(classPeriodStudentVo.getUserId());
|
|
|
classGradeUserQueryBo1.setGoodsId(classPeriodStudentVo.getGoodsId());
|
|
|
@@ -4415,7 +4415,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
List<UserPeriodExportV2Vo> periodVoList = listUserStudyRecordV2Week(classGradeUserQueryBo1);
|
|
|
for (UserPeriodExportV2Vo cVo : periodVoList) {
|
|
|
for (UserPeriodItemExportVo rVo : cVo.getRecordList()) {
|
|
|
- DangAnStudentExportAllVo item = BeanUtil.toBean(classPeriodStudentVo, DangAnStudentExportAllVo.class);
|
|
|
+ DangAnStudentExportLiveAllVo item = BeanUtil.toBean(classPeriodStudentVo, DangAnStudentExportLiveAllVo.class);
|
|
|
item.setBusinessName(classPeriodStudentVo.getEducationName()+"-"+classPeriodStudentVo.getProjectName()+"-"+classPeriodStudentVo.getBusinessName());
|
|
|
item.setModuleName(cVo.getModuleName());
|
|
|
item.setChapterName(cVo.getChapterName());
|
|
|
@@ -4424,10 +4424,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
if(Validator.isNotEmpty(rVo.getVideoCurrentTime())){
|
|
|
item.setStudyTimeLongTxt(DateUtils.secToTime(rVo.getVideoCurrentTime().intValue()));
|
|
|
}
|
|
|
- item.setScore(rVo.getScore());
|
|
|
- if(Validator.isNotEmpty(rVo.getRightRate())){
|
|
|
- item.setRate(rVo.getRightRate()+"");
|
|
|
- }
|
|
|
if(ObjectUtils.isNull(rVo.getFromPlat())){
|
|
|
item.setPlat("PC");
|
|
|
}
|
|
|
@@ -4458,9 +4454,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
studyList.add(item);
|
|
|
}
|
|
|
}
|
|
|
- ExcelUtil<DangAnStudentExportAllVo> util2 = new ExcelUtil<DangAnStudentExportAllVo>(DangAnStudentExportAllVo.class);
|
|
|
+ ExcelUtil<DangAnStudentExportLiveAllVo> util2 = new ExcelUtil<DangAnStudentExportLiveAllVo>(DangAnStudentExportLiveAllVo.class);
|
|
|
String filePath2 = goodsDirPath+"/直播记录"+DateUtils.getNowTime()+".xlsx";
|
|
|
- util2.exportEasyExcelUtil(studyList,DangAnStudentExportAllVo.class,filePath2);
|
|
|
+ util2.exportEasyExcelUtil(studyList,DangAnStudentExportLiveAllVo.class,filePath2);
|
|
|
}
|
|
|
return true;
|
|
|
}
|