fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseBusinessServiceImpl.java

@@ -59,7 +59,7 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
         queryBo.setId(id);
         String fullName = queryFullName(queryBo);
         if(Validator.isNotEmpty(fullName)){
-            if(fullName.equals("继续教育二级建造师")||fullName.equals("继续教育二级造价师")){
+            if(fullName.equals("继续教育二级建造师")||fullName.equals("继续教育二级造价师")||fullName.equals("考前培训七大员施工现场专业人员")){
                 vo.setGoodsLearningOrder(2);
             }
         }

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

@@ -1759,7 +1759,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setNumList(Convert.toLong(userPeriodStatusVos.size()));
                                     classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
                                     classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
-                                    if(startTotalTime==0L||startTotalTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
+                                    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())){
@@ -1774,7 +1774,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     if(Validator.isNotEmpty(classPeriodSectionVo.getStudyEndTime())&&ChapterEndTime.longValue()<classPeriodSectionVo.getStudyEndTime().longValue()){
                                         ChapterEndTime = classPeriodSectionVo.getStudyEndTime();
                                     }
-                                    if(ChapterStartTime==0L||ChapterStartTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue()){
+                                    if((Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime())&&ChapterStartTime==0L)||(Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime())&&ChapterStartTime.longValue()>classPeriodSectionVo.getStudyStartTime().longValue())){
                                         ChapterStartTime = classPeriodSectionVo.getStudyStartTime();
                                     }
                                 }