fix

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

@@ -2904,6 +2904,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             ClassGrade classGrade = iClassGradeService.getOne(new LambdaQueryWrapper<ClassGrade>().eq(ClassGrade::getGradeId, copyOg.getGradeId()));
             commonGradeName = classGrade.getClassName();
         }
+        GoodsVo goodsVo = iGoodsService.queryById(bo.getGoodsId());
+        CourseBusinessQueryBo businessQueryBo = new CourseBusinessQueryBo();
+        businessQueryBo.setId(goodsVo.getBusinessId());
+        String fullName = iCourseBusinessService.queryFullName(businessQueryBo);
+
         //查找最外层课程目录 模块 章 节
         List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
         classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
@@ -2959,7 +2964,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
                                     classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
                                     if (Validator.isNotEmpty(photoList) && photoList.size() > 0) {
-                                        classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                                        if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
+                                            classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
+                                        }else{
+                                            classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                                        }
                                     }
                                     if ((startTotalTime == 0L && Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime())) || (Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime()) && (startTotalTime.longValue() > classPeriodSectionVo.getStudyStartTime().longValue()))) {
                                         if(og.getSevenClassCopy()==1||moduleVo.getCommonSign()==0){
@@ -3118,7 +3127,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
                         classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
                         if (Validator.isNotEmpty(photoList) && photoList.size() > 0) {
-                            classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                            if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
+                                classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
+                            }else{
+                                classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                            }
                         }
                         if ((startTotalTime == 0L && Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime())) || (Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime()) && startTotalTime.longValue() > classPeriodSectionVo.getStudyStartTime().longValue())) {
                             if(og.getSevenClassCopy()==1||classPeriodVo.getCommonSign()==0){
@@ -3235,7 +3248,12 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     classPeriodVo.setNumList(Convert.toLong(userPeriodStatusVos.size()));
                     classPeriodVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
                     if (photoList.size() > 0) {
-                        classPeriodVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                        if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
+                            classPeriodVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
+                        }else{
+                            classPeriodVo.setStudyStartTime(photoList.get(0).getCreateTime());
+                        }
+
                     }
                     if ((Validator.isNotEmpty(classPeriodVo.getStudyStartTime()) && startTotalTime == 0L) || (Validator.isNotEmpty(classPeriodVo.getStudyStartTime()) && startTotalTime.longValue() > classPeriodVo.getStudyStartTime().longValue())) {
                         startTotalTime = classPeriodVo.getStudyStartTime();