he2802 1 năm trước cách đây
mục cha
commit
b803433e0e

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

@@ -1790,9 +1790,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (classPeriodSectionVo.getSectionType() == 2 || classPeriodSectionVo.getSectionType() == 3) {
             //默认加上直播
             UserPeriodItemExportVo exportVo = new UserPeriodItemExportVo();
-            exportVo.setSectionType(2);
             exportVo.setStatus(0); //直播未参与
             exportVo.setDurationTime(classPeriodSectionVo.getRealDuration());
+            exportVo.setSectionType(classPeriodSectionVo.getSectionType());
             studyList.add(exportVo);
             Long startTime = null;
             Long endTime = null;
@@ -1813,7 +1813,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             exportItemVo.setStudyStartTime(startTime);
                             exportItemVo.setStatus(0);
                             exportItemVo.setDurationTime(classPeriodSectionVo.getDurationTime());
-                            exportVo.setSectionType(3);
+                            exportItemVo.setSectionType(3);
+                            exportItemVo.setFromPlat(vo.getFromPlat());
+                            exportItemVo.setVideoCurrentTime(vo.getVideoCurrentTime());
                             studyList.add(exportItemVo);
                         }
                         endTime = vo.getEndTime();
@@ -4428,9 +4430,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     if(Validator.isNotEmpty(rVo.getVideoCurrentTime())){
                         item.setStudyTimeLongTxt(DateUtils.secToTime(rVo.getVideoCurrentTime().intValue()));
                     }
-                    if(ObjectUtils.isNull(rVo.getFromPlat())){
-                        item.setPlat("PC");
-                    }
+
                     else if(rVo.getFromPlat()==1){
                         item.setPlat("小程序");
                     }

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

@@ -25,7 +25,7 @@ public class DangAnHandoutsListExportVo {
 	private String idCard;
 
 
-	@Excel(name = "直播")
+	@Excel(name = "资料")
 	private String goodsName;
 
 	@Excel(name = "业务类型")