fix 七大员

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -97,6 +97,7 @@ public class ClassGradeController extends BaseController {
         startPage();
         bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
         bo.setPastDue(1L);
+        bo.setAtFull(1L);
         List<ClassGradeVo> list = iClassGradeService.queryList(bo);
         return getDataTable(list);
     }

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

@@ -541,90 +541,188 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         GoodsCourseQueryBo goodsCourseQueryBo = new GoodsCourseQueryBo();
         goodsCourseQueryBo.setGoodsId(goodsVo.getGoodsId());
         List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsCourseQueryBo);
-        for(CourseVo courseVo : courseVoList){
-            CourseMenuQueryBo menuQueryBo = new CourseMenuQueryBo();
-            menuQueryBo.setCourseId(courseVo.getCourseId());
-            List<CourseMenuVo> courseMenuVoList = iCourseMenuService.selectList(menuQueryBo);
-            courseMenuVoList.forEach(courseMenuVo -> {
-                if(courseMenuVo.getType()==1){
-                    //获取章信息
-                    List<CourseModuleChapterVo> courseModuleChapterVoList = iCourseModuleChapterService.getListById(courseMenuVo.getMenuId());
-                    courseModuleChapterVoList.forEach(courseModuleChapterVo -> {
-                        SyncUserChapterList syncUserChapterItem = new SyncUserChapterList();
-                        syncUserChapterItem.setChapterId(courseModuleChapterVo.getChapterId());
-                        syncUserChapterItem.setChapterName(courseModuleChapterVo.getName());
-
-                        UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
-                        userPeriodQueryBo.setCourseId(courseVo.getCourseId());
-                        userPeriodQueryBo.setGoodsId(bo.getGoodsId());
-                        userPeriodQueryBo.setUserId(bo.getUserId());
-                        userPeriodQueryBo.setChapterId(courseModuleChapterVo.getChapterId());
-                        userPeriodQueryBo.setModuleId(courseMenuVo.getMenuId());
-                        userPeriodQueryBo.setGradeId(bo.getGradeId());
-                        userPeriodQueryBo.setType(2);
-                        List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
-                        if (!CollectionUtils.isEmpty(userPeriodStatusVos)&&userPeriodStatusVos.size()>0) {
-                            int numIndex = userPeriodStatusVos.size() - 1;
-                            UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos.get(numIndex);
-                            LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-                            lqw.eq(UserStudyRecordPhoto::getPeriodId, userPeriodStatusVo.getId());
-                            List<UserStudyRecordPhoto> examPhoto = userStudyRecordPhotoService.list(lqw);
-                            if(Validator.isNotEmpty(examPhoto)&&examPhoto.size()>0){
-                                UserStudyRecordPhoto photo = examPhoto.get(0);
-                                syncUserChapterItem.setImageSrc(ossHost+"/"+photo.getPhoto());
-                                syncUserChapterItem.setImageTime(DateUtils.timestampToDateFormat(photo.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
-                                syncUserChapterItem.setMatchData(Validator.isNotEmpty(photo.getSimilarity())?photo.getSimilarity().toString():null);
-                                syncUserChapterItem.setExamTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
-                                syncUserChapterItem.setExamScore(userPeriodStatusVo.getPerformance().toString());
-                                syncUserChapterItem.setStudyIP(userPeriodStatusVo.getIp());
+        //二建
+        if(goodsVo.getBusinessId().longValue()==business.getId().longValue()){
+            for(CourseVo courseVo : courseVoList){
+                CourseMenuQueryBo menuQueryBo = new CourseMenuQueryBo();
+                menuQueryBo.setCourseId(courseVo.getCourseId());
+                List<CourseMenuVo> courseMenuVoList = iCourseMenuService.selectList(menuQueryBo);
+                courseMenuVoList.forEach(courseMenuVo -> {
+                    if(courseMenuVo.getType()==1){
+                        //获取章信息
+                        List<CourseModuleChapterVo> courseModuleChapterVoList = iCourseModuleChapterService.getListById(courseMenuVo.getMenuId());
+                        courseModuleChapterVoList.forEach(courseModuleChapterVo -> {
+                            SyncUserChapterList syncUserChapterItem = new SyncUserChapterList();
+                            syncUserChapterItem.setChapterId(courseModuleChapterVo.getChapterId());
+                            syncUserChapterItem.setChapterName(courseModuleChapterVo.getName());
+
+                            UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
+                            userPeriodQueryBo.setCourseId(courseVo.getCourseId());
+                            userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                            userPeriodQueryBo.setUserId(bo.getUserId());
+                            userPeriodQueryBo.setChapterId(courseModuleChapterVo.getChapterId());
+                            userPeriodQueryBo.setModuleId(courseMenuVo.getMenuId());
+                            userPeriodQueryBo.setGradeId(bo.getGradeId());
+                            userPeriodQueryBo.setType(2);
+                            List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+                            if (!CollectionUtils.isEmpty(userPeriodStatusVos)&&userPeriodStatusVos.size()>0) {
+                                int numIndex = userPeriodStatusVos.size() - 1;
+                                UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos.get(numIndex);
+                                LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                                lqw.eq(UserStudyRecordPhoto::getPeriodId, userPeriodStatusVo.getId());
+                                List<UserStudyRecordPhoto> examPhoto = userStudyRecordPhotoService.list(lqw);
+                                if(Validator.isNotEmpty(examPhoto)&&examPhoto.size()>0){
+                                    UserStudyRecordPhoto photo = examPhoto.get(0);
+                                    syncUserChapterItem.setImageSrc(ossHost+"/"+photo.getPhoto());
+                                    syncUserChapterItem.setImageTime(DateUtils.timestampToDateFormat(photo.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserChapterItem.setMatchData(Validator.isNotEmpty(photo.getSimilarity())?photo.getSimilarity().toString():null);
+                                    syncUserChapterItem.setExamTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserChapterItem.setExamScore(userPeriodStatusVo.getPerformance().toString());
+                                    syncUserChapterItem.setStudyIP(userPeriodStatusVo.getIp());
+                                }
                             }
-                        }
-                        List<ClassPeriodSectionVo> classPeriodSectionVos = classGradeUserMapper.listPeriodSection(courseModuleChapterVo.getChapterId(), bo.getGoodsId(), courseVo.getCourseId(), bo.getUserId());
-                        Collections.sort(classPeriodSectionVos);
-                        List<SyncUserStudyRec> RecList = new ArrayList<>();
-                        for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
-                            SyncUserStudyRec syncUserStudyRec = new SyncUserStudyRec();
-                            syncUserStudyRec.setVideoId(classPeriodSectionVo.getId());
-                            syncUserStudyRec.setVideoKey(classPeriodSectionVo.getRecordingUrl());
-
-                            UserPeriodQueryBo userPeriodQueryBo2 = new UserPeriodQueryBo();
-                            userPeriodQueryBo2.setSectionId(classPeriodSectionVo.getId());
-                            userPeriodQueryBo2.setCourseId(courseVo.getCourseId());
-                            userPeriodQueryBo2.setGoodsId(bo.getGoodsId());
-                            userPeriodQueryBo2.setUserId(bo.getUserId());
-                            userPeriodQueryBo2.setChapterId(courseModuleChapterVo.getChapterId());
-                            userPeriodQueryBo2.setModuleId(courseMenuVo.getMenuId());
-                            userPeriodQueryBo2.setGradeId(bo.getGradeId());
-                            List<UserPeriodStatusVo> userPeriodStatusVos2 = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo2);
-                            if (!CollectionUtils.isEmpty(userPeriodStatusVos2)) {
-                                int numIndex2 = userPeriodStatusVos2.size() - 1;
-                                UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos2.get(numIndex2);
+                            List<ClassPeriodSectionVo> classPeriodSectionVos = classGradeUserMapper.listPeriodSection(courseModuleChapterVo.getChapterId(), bo.getGoodsId(), courseVo.getCourseId(), bo.getUserId());
+                            Collections.sort(classPeriodSectionVos);
+                            List<SyncUserStudyRec> RecList = new ArrayList<>();
+                            for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
+                                SyncUserStudyRec syncUserStudyRec = new SyncUserStudyRec();
+                                syncUserStudyRec.setVideoId(classPeriodSectionVo.getId());
+                                syncUserStudyRec.setVideoKey(classPeriodSectionVo.getRecordingUrl());
+
+                                UserPeriodQueryBo userPeriodQueryBo2 = new UserPeriodQueryBo();
+                                userPeriodQueryBo2.setSectionId(classPeriodSectionVo.getId());
+                                userPeriodQueryBo2.setCourseId(courseVo.getCourseId());
+                                userPeriodQueryBo2.setGoodsId(bo.getGoodsId());
+                                userPeriodQueryBo2.setUserId(bo.getUserId());
+                                userPeriodQueryBo2.setChapterId(courseModuleChapterVo.getChapterId());
+                                userPeriodQueryBo2.setModuleId(courseMenuVo.getMenuId());
+                                userPeriodQueryBo2.setGradeId(bo.getGradeId());
+                                List<UserPeriodStatusVo> userPeriodStatusVos2 = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo2);
+                                if (!CollectionUtils.isEmpty(userPeriodStatusVos2)) {
+                                    int numIndex2 = userPeriodStatusVos2.size() - 1;
+                                    UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos2.get(numIndex2);
+                                    LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                                    lqw.eq(UserStudyRecordPhoto::getPeriodId, userPeriodStatusVo.getId());
+                                    List<UserStudyRecordPhoto> videoPhoto2 = userStudyRecordPhotoService.list(lqw);
+                                    syncUserStudyRec.setCreateTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserStudyRec.setEndTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordEndTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserStudyRec.setStudyIP(userPeriodStatusVo.getIp());
+                                    List<SyncUserImageRc> ImgList = new ArrayList<>();
+                                    for (UserStudyRecordPhoto videoPhoto : videoPhoto2) {
+                                        SyncUserImageRc imageRc = new SyncUserImageRc();
+                                        imageRc.setImgSrc(ossHost+"/"+videoPhoto.getPhoto());
+                                        imageRc.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                        imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
+                                        ImgList.add(imageRc);
+                                    }
+                                    syncUserStudyRec.setImgList(ImgList);
+                                }
+                                RecList.add(syncUserStudyRec);
+                            }
+                            syncUserChapterItem.setRecList(RecList);
+                            ChapterList.add(syncUserChapterItem);
+                        });
+
+                    }
+                });
+            }
+            studyRec.setChapterList(ChapterList);
+        }
+        //七大员
+        if(Validator.isNotEmpty(business7.getId())&&goodsVo.getBusinessId().longValue()==business.getId().longValue()){
+            for(CourseVo courseVo : courseVoList){
+                CourseMenuQueryBo menuQueryBo = new CourseMenuQueryBo();
+                menuQueryBo.setCourseId(courseVo.getCourseId());
+                List<CourseMenuVo> courseMenuVoList = iCourseMenuService.selectList(menuQueryBo);
+                courseMenuVoList.forEach(courseMenuVo -> {
+                    if(courseMenuVo.getType()==1){
+                        SyncUserChapterList syncUserChapterItem = new SyncUserChapterList();
+                        syncUserChapterItem.setChapterId(courseMenuVo.getMenuId());
+                        syncUserChapterItem.setChapterName(courseMenuVo.getMenuName());
+                        List<SyncUserChapterList> ChildChapList = new ArrayList<>();
+                        //获取章信息
+                        List<CourseModuleChapterVo> courseModuleChapterVoList = iCourseModuleChapterService.getListById(courseMenuVo.getMenuId());
+                        courseModuleChapterVoList.forEach(courseModuleChapterVo -> {
+                            SyncUserChapterList syncUserChapterChildItem = new SyncUserChapterList();
+                            syncUserChapterChildItem.setChapterId(courseModuleChapterVo.getChapterId());
+                            syncUserChapterChildItem.setChapterName(courseModuleChapterVo.getName());
+
+                            UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
+                            userPeriodQueryBo.setCourseId(courseVo.getCourseId());
+                            userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                            userPeriodQueryBo.setUserId(bo.getUserId());
+                            userPeriodQueryBo.setChapterId(courseModuleChapterVo.getChapterId());
+                            userPeriodQueryBo.setModuleId(courseMenuVo.getMenuId());
+                            userPeriodQueryBo.setGradeId(bo.getGradeId());
+                            userPeriodQueryBo.setType(2);
+                            List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+                            if (!CollectionUtils.isEmpty(userPeriodStatusVos)&&userPeriodStatusVos.size()>0) {
+                                int numIndex = userPeriodStatusVos.size() - 1;
+                                UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos.get(numIndex);
                                 LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
                                 lqw.eq(UserStudyRecordPhoto::getPeriodId, userPeriodStatusVo.getId());
-                                List<UserStudyRecordPhoto> videoPhoto2 = userStudyRecordPhotoService.list(lqw);
-                                syncUserStudyRec.setCreateTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
-                                syncUserStudyRec.setEndTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordEndTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
-                                syncUserStudyRec.setStudyIP(userPeriodStatusVo.getIp());
-                                List<SyncUserImageRc> ImgList = new ArrayList<>();
-                                for (UserStudyRecordPhoto videoPhoto : videoPhoto2) {
-                                    SyncUserImageRc imageRc = new SyncUserImageRc();
-                                    imageRc.setImgSrc(ossHost+"/"+videoPhoto.getPhoto());
-                                    imageRc.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
-                                    imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
-                                    ImgList.add(imageRc);
+                                List<UserStudyRecordPhoto> examPhoto = userStudyRecordPhotoService.list(lqw);
+                                if(Validator.isNotEmpty(examPhoto)&&examPhoto.size()>0){
+                                    UserStudyRecordPhoto photo = examPhoto.get(0);
+                                    syncUserChapterChildItem.setImageSrc(ossHost+"/"+photo.getPhoto());
+                                    syncUserChapterChildItem.setImageTime(DateUtils.timestampToDateFormat(photo.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserChapterChildItem.setMatchData(Validator.isNotEmpty(photo.getSimilarity())?photo.getSimilarity().toString():null);
+                                    syncUserChapterChildItem.setExamTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserChapterChildItem.setExamScore(userPeriodStatusVo.getPerformance().toString());
+                                    syncUserChapterChildItem.setStudyIP(userPeriodStatusVo.getIp());
                                 }
-                                syncUserStudyRec.setImgList(ImgList);
                             }
-                            RecList.add(syncUserStudyRec);
-                        }
-                        syncUserChapterItem.setRecList(RecList);
-                        ChapterList.add(syncUserChapterItem);
-                    });
+                            List<ClassPeriodSectionVo> classPeriodSectionVos = classGradeUserMapper.listPeriodSection(courseModuleChapterVo.getChapterId(), bo.getGoodsId(), courseVo.getCourseId(), bo.getUserId());
+                            Collections.sort(classPeriodSectionVos);
+                            List<SyncUserStudyRec> RecList = new ArrayList<>();
+                            for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
+                                SyncUserStudyRec syncUserStudyRec = new SyncUserStudyRec();
+                                syncUserStudyRec.setVideoId(classPeriodSectionVo.getId());
+                                syncUserStudyRec.setVideoKey(classPeriodSectionVo.getRecordingUrl());
 
-                }
-            });
+                                UserPeriodQueryBo userPeriodQueryBo2 = new UserPeriodQueryBo();
+                                userPeriodQueryBo2.setSectionId(classPeriodSectionVo.getId());
+                                userPeriodQueryBo2.setCourseId(courseVo.getCourseId());
+                                userPeriodQueryBo2.setGoodsId(bo.getGoodsId());
+                                userPeriodQueryBo2.setUserId(bo.getUserId());
+                                userPeriodQueryBo2.setChapterId(courseModuleChapterVo.getChapterId());
+                                userPeriodQueryBo2.setModuleId(courseMenuVo.getMenuId());
+                                userPeriodQueryBo2.setGradeId(bo.getGradeId());
+                                List<UserPeriodStatusVo> userPeriodStatusVos2 = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo2);
+                                if (!CollectionUtils.isEmpty(userPeriodStatusVos2)) {
+                                    int numIndex2 = userPeriodStatusVos2.size() - 1;
+                                    UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos2.get(numIndex2);
+                                    LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                                    lqw.eq(UserStudyRecordPhoto::getPeriodId, userPeriodStatusVo.getId());
+                                    List<UserStudyRecordPhoto> videoPhoto2 = userStudyRecordPhotoService.list(lqw);
+                                    syncUserStudyRec.setCreateTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserStudyRec.setEndTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordEndTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    syncUserStudyRec.setStudyIP(userPeriodStatusVo.getIp());
+                                    List<SyncUserImageRc> ImgList = new ArrayList<>();
+                                    for (UserStudyRecordPhoto videoPhoto : videoPhoto2) {
+                                        SyncUserImageRc imageRc = new SyncUserImageRc();
+                                        imageRc.setImgSrc(ossHost+"/"+videoPhoto.getPhoto());
+                                        imageRc.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                        imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
+                                        ImgList.add(imageRc);
+                                    }
+                                    syncUserStudyRec.setImgList(ImgList);
+                                }
+                                RecList.add(syncUserStudyRec);
+                            }
+                            syncUserChapterChildItem.setRecList(RecList);
+                            ChildChapList.add(syncUserChapterChildItem);
+                        });
+                        syncUserChapterItem.setChildChapList(ChildChapList);
+                        ChapterList.add(syncUserChapterItem);
+                    }
+                });
+            }
+            studyRec.setChapterList(ChapterList);
         }
-        studyRec.setChapterList(ChapterList);
+
+
+
         //学习记录推送到旧系统
         Map<String, String> params = new HashMap<>();
         Long nowTime = DateUtils.getNowTime();

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

@@ -25,5 +25,7 @@ public class SyncUserChapterList {
 
     private String StudyIP;
 
+    private List<SyncUserChapterList> ChildChapList;
+
     private List<SyncUserStudyRec> RecList;
 }