fix

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

@@ -1648,6 +1648,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 for (ClassPeriodChapterVo classPeriodChapterVo : classPeriodChapterVos) {
                     if (classPeriodChapterVo.getType() == 2) {
                         Long ChapterEndTime = 0L;
+                        Long ChapterStartTime = 0L;
                         List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodChapterVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                         Collections.sort(classPeriodSectionVos);
                         classPeriodSectionVos.addAll(baseMapper.listperiodExam(classPeriodChapterVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId(), classPeriodVo.getId()));
@@ -1690,6 +1691,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     if(ChapterEndTime.longValue()<classPeriodSectionVo.getStudyEndTime().longValue()){
                                         ChapterEndTime = classPeriodSectionVo.getStudyEndTime();
                                     }
+                                    if(ChapterStartTime==0L||ChapterStartTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
+                                        ChapterStartTime = classPeriodSectionVo.getStudyStartTime();
+                                    }
                                 }
                                 if(userPeriodStatusVos.size()>1){
                             //        int preIndex = userPeriodStatusVos.size() - 2;
@@ -1738,6 +1742,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     if(ChapterEndTime.longValue()<classPeriodSectionVo.getStudyEndTime().longValue()){
                                         ChapterEndTime = classPeriodSectionVo.getStudyEndTime();
                                     }
+                                    if(ChapterStartTime==0L||ChapterStartTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
+                                        ChapterStartTime = classPeriodSectionVo.getStudyStartTime();
+                                    }
                                 }
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
                                 classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
@@ -1746,6 +1753,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             }
                         }
                         classPeriodChapterVo.setStudyEndTime(ChapterEndTime);
+                        classPeriodChapterVo.setStudyStartTime(ChapterStartTime);
                         classPeriodChapterVo.setClassPeriodSectionList(classPeriodSectionVos);
                     }
                     else if (classPeriodChapterVo.getType() == 5) {
@@ -1784,6 +1792,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             //为章搜索节记录和学时记录
             if (classPeriodVo.getType() == 2) {
                 Long ChapterEndTime = 0L;
+                Long ChapterStartTime = 0L;
                 List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 Collections.sort(classPeriodSectionVos);
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
@@ -1823,6 +1832,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         if(ChapterEndTime.longValue()<classPeriodSectionVo.getStudyEndTime().longValue()){
                             ChapterEndTime = classPeriodSectionVo.getStudyEndTime();
                         }
+                        if(ChapterStartTime==0L||ChapterStartTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
+                            ChapterStartTime = classPeriodSectionVo.getStudyStartTime();
+                        }
                     }
                     if(userPeriodStatusVos.size()>1){
                 //        int preIndex = userPeriodStatusVos.size() - 2;
@@ -1873,6 +1885,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         if(ChapterEndTime.longValue()<classPeriodSectionVo.getStudyEndTime().longValue()){
                             ChapterEndTime = classPeriodSectionVo.getStudyEndTime();
                         }
+                        if(ChapterStartTime==0L||ChapterStartTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
+                            ChapterStartTime = classPeriodSectionVo.getStudyStartTime();
+                        }
                     }
                     classPeriodSectionVo.setModuleId(0L);
                     classPeriodSectionVo.setChapterId(classPeriodVo.getId());
@@ -1882,6 +1897,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
                 classPeriodVo.setStudyEndTime(ChapterEndTime);
+                classPeriodVo.setStudyStartTime(ChapterStartTime);
             }
 
             //为节搜索学时记录