fix 营销数据

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

@@ -449,7 +449,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         userPeriodExportVo.setSectionName(sectionName);
         userPeriodExportVo.setDurationTime(classPeriodSectionVo.getDurationTime());
         userPeriodExportVo.setStudyTimeTxt(DateUtils.timestampToDate(classPeriodSectionVo.getStudyStartTime())+"-"+DateUtils.timestampToDate(classPeriodSectionVo.getStudyEndTime()));
-        if(Validator.isEmpty(classPeriodSectionVo.getStudyEndTime())){
+        if(Validator.isEmpty(classPeriodSectionVo.getStudyEndTime())||Validator.isEmpty(classPeriodSectionVo.getStudyStartTime())){
             userPeriodExportVo.setStudyTimeLongTxt("无"); //没有学习结束时间
             if(!isExam){
                 userPeriodExportVo.setStudyStatusTxt("未完成");
@@ -575,7 +575,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
             }
 
-            if(!gradePeriodStatus.equals(classPeriodStudentVo.getPeriodStatus())){
+            //更新班级学时状态
+           /* if(!gradePeriodStatus.equals(classPeriodStudentVo.getPeriodStatus())){
                 LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
                 classGradeUser.eq(ClassGradeUser::getUserId, classPeriodStudentVo.getUserId());
                 classGradeUser.eq(ClassGradeUser::getGradeId, classPeriodStudentVo.getGradeId());
@@ -586,7 +587,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
                 classGradeUser1.setUpdateTime(DateUtils.getNowTime());
                 iClassGradeUserService.update(classGradeUser1, classGradeUser);
-            }
+            }*/
            /* if (classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum()) && classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
                 if (classPeriodUserVos.getPending() != 0 || classPeriodUserVos.getExamPending() != 0){
                     classPeriodStudentVo.setAllStatus(0);