Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserStudyRecordController.java

@@ -131,6 +131,17 @@ public class UserStudyRecordController extends BaseController {
         return AjaxResult.success(iUserStudyRecordService.menuAllList(bo));
     }
 
+    /**
+     * 查询课程目录结构列表
+     */
+    @ApiOperation("查询课程所有子目录带试卷结构列表")
+    @GetMapping("/menuAllListWithExam")
+    public AjaxResult<List<ClassPeriodVo>> menuAllListWithExam(UserStudyRecordQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iUserStudyRecordService.menuAllListWithExam(bo));
+    }
+
     @ApiOperation("查询用户每天学习记录列表")
     @GetMapping("/listUserRecord")
     public TableDataInfo<SectionStudyRecordVo> listUserRecord(UserStudyRecordQueryBo bo) {

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

@@ -113,8 +113,8 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 
 
 	/** 1模块 2章 3节 4卷 */
-	@Excel(name = "1模块 2章 3节 4卷")
-	@ApiModelProperty("1模块 2章 3节 4卷")
+	@Excel(name = "1模块 2章 3节 4章卷 5模块卷")
+	@ApiModelProperty("1模块 2章 3节 4章卷 5模块卷")
 	private Long type;
 
 	/** 當前位置 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordAddBo.java

@@ -92,5 +92,5 @@ public class UserStudyRecordAddBo {
     /** 相似度 */
     @ApiModelProperty("相似度")
     private Integer similarity;
-
+    private Boolean erJianErZao;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -34,12 +34,11 @@ import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
+import com.zhongzheng.modules.grade.mapper.ClassGradeUserMapper;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
-import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
-import com.zhongzheng.modules.grade.vo.ClassPeriodVo;
-import com.zhongzheng.modules.grade.vo.UserPeriodStatusVo;
+import com.zhongzheng.modules.grade.vo.*;
 import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
 import com.zhongzheng.modules.inform.bo.InformUserAddBo;
 import com.zhongzheng.modules.inform.service.IInformRemindService;
@@ -151,6 +150,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Autowired
     private ICourseMenuExamService courseMenuExamService;
 
+    @Autowired
+    private ClassGradeUserMapper classGradeUserMapper;
+
     @Override
     public UserStudyRecordVo queryById(Long recordId) {
         UserStudyRecord db = this.baseMapper.selectById(recordId);
@@ -315,7 +317,6 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer insertByAddBo(UserStudyRecordAddBo bo) {
-        Boolean erJianErZao = false;
         CourseSectionVo courseSectionVo =iCourseSectionService.queryById(bo.getSectionId());
         //判断录播拍照是否达标
         if(courseSectionVo.getSectionType()==1&&Validator.isNotEmpty(bo.getStatus())&&bo.getStatus()==1){
@@ -326,7 +327,6 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 String fullName = iCourseBusinessService.queryFullName(queryBo);
                 if(Validator.isNotEmpty(fullName)){
                     if(fullName.equals("继续教育二级建造师")||fullName.equals("继续教育二级造价师")){
-                        erJianErZao = true;
                         if(Validator.isNotEmpty(courseSectionVo.getDurationTime())||Validator.isNotEmpty(bo.getVideoCurrentTime())){
                             Long videoTime = 0L;
                             if(Validator.isNotEmpty(courseSectionVo.getDurationTime())&&courseSectionVo.getDurationTime().longValue()>0){
@@ -434,7 +434,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             UserStudyRecordVo lastVo = queryLast(queryBo);
             if(Validator.isEmpty(lastVo)||Validator.isNotEmpty(bo.getPhoto())||Validator.isEmpty(lastVo.getVideoCurrentTime())||lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue()){
                 //如果没有历史数据或者之前播放时长比现在晚，或者携带照片则新增观看记录
-                if(erJianErZao&&Validator.isEmpty(bo.getPhoto())&&(lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue())){
+                if(Validator.isNotEmpty(lastVo)&&Validator.isNotEmpty(bo.getErJianErZao())&&bo.getErJianErZao()&&Validator.isEmpty(bo.getPhoto())&&(lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue())){
                     return 0;
                 }else{
                     this.save(add);
@@ -708,9 +708,24 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                         classSectionVo.setModuleId(classPeriodVo.getId());
                         classSectionVo.setChapterId(classChapterVo.getId());
                         classSectionVo.setSectionId(classSectionVo.getId());
+                        classSectionVo.setType(3L);
+                        sectionList.add(classSectionVo);
+                    }
+                    List<ClassPeriodSectionVo> cExamList= classGradeUserMapper.listperiodExam(classChapterVo.getId(), null, classPeriodVo.getCourseId(), null, classPeriodVo.getId());
+                    for (ClassPeriodSectionVo sectionVo : cExamList) {
+                        ClassPeriodVo classSectionVo = BeanUtil.toBean(sectionVo,ClassPeriodVo.class);
+                        classSectionVo.setType(4L);
+                        classSectionVo.setExamId(sectionVo.getId());
                         sectionList.add(classSectionVo);
                     }
                 }
+                List<ClassPeriodChapterVo> mExamList =  classGradeUserMapper.listperiodModuleExam( null, classPeriodVo.getCourseId(), null, classPeriodVo.getId());
+                for (ClassPeriodChapterVo chapterVo : mExamList) {
+                    ClassPeriodVo classSectionVo = BeanUtil.toBean(chapterVo,ClassPeriodVo.class);
+                    classSectionVo.setType(5L);
+                    classSectionVo.setExamId(chapterVo.getId());
+                    sectionList.add(classSectionVo);
+                }
             }
             //为章搜索节记录
             if (classPeriodVo.getType() == 2){
@@ -723,8 +738,17 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                     classSectionVo.setModuleId(0L);
                     classSectionVo.setChapterId(classPeriodVo.getId());
                     classSectionVo.setSectionId(classSectionVo.getId());
+                    classSectionVo.setType(3L);
+                    sectionList.add(classSectionVo);
+                }
+                List<ClassPeriodSectionVo> cExamList= classGradeUserMapper.listperiodExam(classPeriodVo.getId(), null, classPeriodVo.getCourseId(), null, 0L);
+                for (ClassPeriodSectionVo sectionVo : cExamList) {
+                    ClassPeriodVo classSectionVo = BeanUtil.toBean(sectionVo,ClassPeriodVo.class);
+                    classSectionVo.setType(4L);
+                    classSectionVo.setExamId(sectionVo.getId());
                     sectionList.add(classSectionVo);
                 }
+
             }
             //为节搜索学时记录
             if (classPeriodVo.getType() == 3){