判断重复

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

@@ -202,6 +202,7 @@ public class ClassGradeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('grade:grade:select')")
     @GetMapping("/select")
     public AjaxResult<Integer> select(ClassGradeAddBo bo) {
+        //自己公司的TenantId出现选择官方接口
         boolean tenantId = ServletUtils.getRequest().getHeader("TenantId").equals("867735392558919680");
         return AjaxResult.success(tenantId ? 1 : 0);
     }
@@ -308,9 +309,9 @@ public class ClassGradeController extends BaseController {
     }*/
 
 
-    /**
+   /* *//**
      * 学时审核
-     */
+     *//*
     @ApiOperation("学时审核第一次請求獲得商品的章節")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listPeriodAuditOne")
@@ -320,9 +321,9 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
+    *//**
      * 学时审核
-     */
+     *//*
     @ApiOperation("学时审核獲得商品模塊下的章")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listPeriodAuditChapter")
@@ -332,9 +333,9 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
+    *//**
      * 学时审核
-     */
+     *//*
     @ApiOperation("学时审核獲得商品章下面的節")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listPeriodAuditSection")
@@ -343,7 +344,7 @@ public class ClassGradeController extends BaseController {
         List<ClassPeriodSectionVo> list = iClassGradeUserService.listPeriodAuditSection(bo);
         return getDataTable(list);
     }
-
+*/
     /**
      * 学时审核
      */

zhongzheng-admin/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -83,17 +83,17 @@ public class PolyvVideoController extends BaseController {
      * 查询保利威视频分类
      */
     @ApiOperation("更新视频分类")
-    @PreAuthorize("@ss.hasPermi('modules.polyv:video:list')")
+    @PreAuthorize("@ss.hasPermi('modules.polyv:video:edit')")
     @PostMapping("/cata")
-    public  AjaxResult<List<PolyvCataData>> list(PolyvVideoQueryBo bo) throws Exception {
+    public  AjaxResult list(@RequestBody PolyvVideoQueryBo bo) throws Exception {
         List<PolyvCataData> list = iPolyvVideoService.queryCataList(bo);
-        return AjaxResult.success(list);
+        return AjaxResult.success();
     }
     /**
      * 查询考试安排列表
      */
     @ApiOperation("同步保利威视频")
-    @PreAuthorize("@ss.hasPermi('polyv:video:list')")
+    @PreAuthorize("@ss.hasPermi('polyv:video:edit')")
     @PostMapping("/importList")
     public TableDataInfo<PolyvVideoVo> listPolyv(@RequestBody PolyvVideoQueryBo bo) throws Exception {
         bo.setPageSize(100000);

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

@@ -201,6 +201,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<ClassPeriodUserVo> listPeriod(ClassGradeUserQueryBo bo) {
+        //班级学员信息
         List<ClassPeriodUserVo> classPeriodUserVos = baseMapper.listPeriod(bo);
         for (ClassPeriodUserVo classPeriodUserVo : classPeriodUserVos) {
             Long secLong = 0L;
@@ -210,6 +211,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             subjectStudyRecordQueryBo.setUserId(bo.getUserId());
             subjectStudyRecordQueryBo.setGradeId(bo.getGradeId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+            //班级下每个课程得学习节数和总节数累加
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
@@ -217,11 +219,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }
             //BigDecimal divide = new BigDecimal(studyLong.toString()).divide(new BigDecimal(secLong.toString()),2,BigDecimal.ROUND_HALF_UP);
             //classGradeStudentVo.setStudyNum(divide.multiply(new BigDecimal("100")).longValue());
+            //总节数
             classPeriodUserVo.setSecAllNum(secLong);
+            //学习节数
             classPeriodUserVo.setStuAllNum(studyLong);
             classPeriodUserVo.setPending(classPeriodUserVo.getSecAllNum()-classPeriodUserVo.getPass()-classPeriodUserVo.getCheat());
             classPeriodUserVo.setExamPending(classPeriodUserVo.getExamNum()-classPeriodUserVo.getExamPass()-classPeriodUserVo.getExamCheat());
-
+                //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
             if (classPeriodUserVo.getStuAllNum().equals(classPeriodUserVo.getSecAllNum()) && classPeriodUserVo.getExamNum().equals(classPeriodUserVo.getRecordNum())){
                 if (classPeriodUserVo.getPending() != 0 || classPeriodUserVo.getExamPending() != 0){
                     classPeriodUserVo.setAllStatus(0);
@@ -239,10 +243,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<ClassPeriodVo> listPeriodAudit(ClassGradeUserQueryBo bo) {
-        //查找最外层课程目录
+        //查找最外层课程目录 模块 章 节
         List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
         classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
         for (ClassPeriodVo classPeriodVo : classPeriodVos) {
+            //为模块搜索下面的章 和节 并搜索学时记录
             if (classPeriodVo.getType() == 1){
                 List<ClassPeriodChapterVo> classPeriodChapterVos = baseMapper.listperiodChapter(classPeriodVo.getId(), bo.getGoodsId(),classPeriodVo.getCourseId(), bo.getUserId(),bo.getGradeId());
                 for (ClassPeriodChapterVo classPeriodChapterVo : classPeriodChapterVos) {
@@ -319,6 +324,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
                 classPeriodVo.setClassPeriods(classPeriodChapterVos);
             }
+            //为章搜索节记录和学时记录
             if (classPeriodVo.getType() == 2){
                 List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
@@ -388,6 +394,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
             }
+
+            //为节搜索学时记录
             if (classPeriodVo.getType() == 3){
                 UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
                 userPeriodQueryBo.setSectionId(classPeriodVo.getId());
@@ -445,12 +453,15 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public ClassPeriodSectionVo listPeriodAuditStatus(UserPeriodQueryBo bo) {
+        //获得审核节的所有记录
         List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(bo);
+        //获得照片记录
         for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
             LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
             lqw.eq(UserStudyRecordPhoto::getPeriodId,userPeriodStatusVo.getId());
             userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
         }
+        //取前端获得需要的第几条记录
         int numIndex = Convert.toInt(bo.getNumIndex()) - 1;
         UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos.get(numIndex);
         ClassPeriodSectionVo classPeriodSectionVo = BeanUtil.toBean(bo, ClassPeriodSectionVo.class);
@@ -467,6 +478,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
         classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
+        //判断是节还是试卷
         if (bo.getSectionId() != null) {
             classPeriodSectionVo.setId(bo.getSectionId());
             classPeriodSectionVo.setType(3L);

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

@@ -132,7 +132,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(UserPeriodEditBo bo) {
-
+        //更改审核状态
         UserPeriodStatus userUp = new UserPeriodStatus();
         userUp.setPeriodStatus(1);
         userUp.setId(bo.getId());
@@ -148,6 +148,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         lqw.eq(userPeriodVo.getGoodsId() != null, UserPeriod::getGoodsId, userPeriodVo.getGoodsId());
         lqw.eq(userPeriodVo.getGradeId() != null, UserPeriod::getGradeId, userPeriodVo.getGradeId());
         List<UserPeriod> listPeriodVo = this.list(lqw);
+        //通过情况下判断是否已经全部审核完成，完成发送消息
         if (bo.getStatus().equals(1)) {
             for (UserPeriod userPeriod : listPeriodVo) {
                 LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
@@ -155,6 +156,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
                 userPeriods.eq(UserPeriodStatus::getStatus, 1);
                 List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
+                //只有有一个不是通过即返回
                 if (CollectionUtils.isEmpty(list1)) {
                     return true;
                 }
@@ -164,9 +166,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
             userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
             userPeriodEditBo.setStatus(bo.getStatus());
+            //发送消息
             sendPeriodSMS(userPeriodEditBo);
             sendPeriodSevenSMS(userPeriodEditBo);
 
+            //修改学员班级审核状态
             LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
             classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
             classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
@@ -176,12 +180,14 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
             iClassGradeUserService.update(classGradeUser1, classGradeUser);
         } else {
+            //作弊情况下判断是否已经全部审核完成，完成发送消息
             for (UserPeriod userPeriod : listPeriodVo) {
                 LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
                 userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
                 userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
                 userPeriods.notIn(UserPeriodStatus::getStatus, 1);
                 List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
+                //只有有一个不是作弊即返回
                 if (CollectionUtils.isEmpty(list1)) {
                     return true;
                 }
@@ -191,8 +197,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriodEditBo.setGoodsId(userPeriodVo.getGoodsId());
             userPeriodEditBo.setGradeId(userPeriodVo.getGradeId());
             userPeriodEditBo.setStatus(bo.getStatus());
+            //发送消息
             sendPeriodSMS(userPeriodEditBo);
             sendPeriodSevenSMS(userPeriodEditBo);
+
+            //更改班级学员为未通过
             LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
             classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
             classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
@@ -226,11 +235,13 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean editPeriodAll(UserPeriodEditBo bo) {
+        //查询所有审核记录
         LambdaQueryWrapper<UserPeriod> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getUserId() != null, UserPeriod::getUserId, bo.getUserId());
         lqw.eq(bo.getGoodsId() != null, UserPeriod::getGoodsId, bo.getGoodsId());
         lqw.eq(bo.getGradeId() != null, UserPeriod::getGradeId, bo.getGradeId());
         List<UserPeriod> list = this.list(lqw);
+        //更改审核状态
         for (UserPeriod userPeriod : list) {
             UserPeriodStatus userPeriodStatus = new UserPeriodStatus();
             userPeriodStatus.setPeriodStatus(1);
@@ -241,6 +252,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
             userPeriodStatusService.update(userPeriodStatus, userPeriods);
         }
+        //更新班级学员信息
         LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
         classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
         classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
@@ -248,6 +260,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         classGradeUser1.setPeriodStatus(bo.getStatus());
         classGradeUser1.setUpdateTime(DateUtils.getNowTime());
         iClassGradeUserService.update(classGradeUser1, classGradeUser);
+        //发送消息
         sendPeriodSMS(bo);
         sendPeriodSevenSMS(bo);
         return true;