he2802 2 лет назад
Родитель
Сommit
060da877ae

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

@@ -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;
     }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/DangAnStudentExportAllVo.java

@@ -20,7 +20,7 @@ public class DangAnStudentExportAllVo {
 	/** 学员编码 */
 	@Excel(name = "姓名")
 	@ApiModelProperty("姓名")
-	private String realName;
+	private String realname;
 
 	/** 学员编码 */
 	@Excel(name = "身份证号码")

+ 66 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/DangAnStudentExportLiveAllVo.java

@@ -0,0 +1,66 @@
+package com.zhongzheng.modules.grade.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 学员记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+public class DangAnStudentExportLiveAllVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 学员编码 */
+	@Excel(name = "姓名")
+	@ApiModelProperty("姓名")
+	private String realname;
+
+	/** 学员编码 */
+	@Excel(name = "身份证号码")
+	@ApiModelProperty("身份证号码")
+	private String idCard;
+
+
+	@Excel(name = "课程")
+	private String goodsName;
+
+
+
+	@Excel(name = "业务类型")
+	private String businessName;
+
+	@Excel(name = "专业")
+	private String categoryName;
+
+	@Excel(name = "模块标题")
+	@ApiModelProperty("模块标题")
+	private String moduleName;
+	@Excel(name = "章标题")
+	@ApiModelProperty("章标题")
+	private String chapterName;
+	@Excel(name = "节标题")
+	@ApiModelProperty("节标题")
+	private String sectionName;
+	@Excel(name = "类型")
+	@ApiModelProperty("类型")
+	private String sectionType;
+	@Excel(name = "观看时间")
+	@ApiModelProperty("观看时间")
+	private String studyTimeTxt;
+	@Excel(name = "观看时长")
+	@ApiModelProperty("观看时长")
+	private String studyTimeLongTxt;
+
+
+
+	@Excel(name = "学习终端")
+	@ApiModelProperty("学习终端")
+	private String plat;
+}