fix

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

@@ -879,7 +879,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     item.setModuleName(cVo.getModuleName());
                     item.setChapterName(cVo.getChapterName());
                     item.setSectionName(cVo.getSectionName());
-                    item.setDurationTime(cVo.getDurationTime());
+                    item.setDurationTime(Validator.isEmpty(cVo.getDurationTime())?0:((float)(cVo.getDurationTime()/3600)));
                     item.setStudyTimeTxt(cVo.getStudyTimeTxt());
                     item.setStudyTimeLongTxt(cVo.getStudyTimeLongTxt());
                     item.setStudyStatusTxt(cVo.getStudyStatusTxt());
@@ -1914,7 +1914,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         if((startTotalTime==0L&&Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime()))||(Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime())&&startTotalTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue())){
                             startTotalTime = classPeriodSectionVo.getStudyStartTime();
                         }
-                        if(endTotalTime==0L||(Validator.isNotEmpty(classPeriodSectionVo.getStudyEndTime())&&endTotalTime.longValue()<classPeriodSectionVo.getStudyEndTime().longValue())){
+                        if((Validator.isNotEmpty(classPeriodSectionVo.getStudyEndTime())&&endTotalTime==0L)||(Validator.isNotEmpty(classPeriodSectionVo.getStudyEndTime())&&endTotalTime.longValue()<classPeriodSectionVo.getStudyEndTime().longValue())){
                             endTotalTime = classPeriodSectionVo.getStudyEndTime();
                         }
                         classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentExportAllVo.java

@@ -73,9 +73,9 @@ public class ClassPeriodStudentExportAllVo {
 	@Excel(name = "节标题")
 	@ApiModelProperty("节标题")
 	private String sectionName;
-	@Excel(name = "节时长(秒)")
-	@ApiModelProperty("节时长(秒)")
-	private Long durationTime;
+	@Excel(name = "节时长(小时)")
+	@ApiModelProperty("节时长(小时)")
+	private Float durationTime;
 	@Excel(name = "学习/做题时间")
 	@ApiModelProperty("学习/做题时间")
 	private String studyTimeTxt;