考试显示

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -56,6 +56,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
     @Override
     public List<ExamApplyVo> queryList(ExamApplyQueryBo bo) {
         List<ExamApplyVo> examApplyVos = baseMapper.queryExam(bo);
+        //过期修改状态
         for (ExamApplyVo examApplyVo : examApplyVos) {
             Calendar calendar = Calendar.getInstance();
             calendar.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
@@ -106,14 +107,17 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
     public Boolean updateByEditBo(ExamApplyEditBo bo) {
         ExamApply update = BeanUtil.toBean(bo, ExamApply.class);
         if (bo.getStatus() == 1){
+            //判断是否有设置商品
             Long contGoodsId = baseMapper.countGoods(bo.getApplyId());
             if (contGoodsId < 1){
                 throw new RuntimeException("请先设置适用商品");
             }
+            //判断是否有设置考试地点和时间
             List<ExamApplySiteVo> examApplySite = baseMapper.addressExam(bo.getApplyId(),1L);
             if (CollectionUtils.isEmpty(examApplySite)){
                 throw new RuntimeException("请先设置考试地点和时间");
             }
+            //考试计划内的商品是否被其他计划使用
             List<Long> contGoods = baseMapper.countGoodsHold(bo.getApplyId());
             if (CollectionUtils.isNotEmpty(contGoods)){
                 String goodsName ="";
@@ -183,18 +187,22 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
 
     @Override
     public ExamUserApplyVo subscribe(ExamApplyQueryBo bo) {
+        //查询学时通过情况
         Integer countGradePeriod = baseMapper.countGradePeriod(bo);
         if (countGradePeriod < 1){
             throw new IllegalArgumentException("学时审核未通过，不可以报名参加考试");
         }
+        //查询考试通过情况
         Integer countSubscribe = baseMapper.countSubscribe(bo);
         if (countSubscribe > 0){
             throw new IllegalArgumentException("考试已通过，不需要重考");
         }
+        //查询是否已预约考试
         Integer countHaveSubscribe = baseMapper.countHaveSubscribe(bo);
         if (countHaveSubscribe > 0){
             throw new IllegalArgumentException("您所报考的专业，已经预约成功，您可在“我的-我的考试预约”中查询详情");
         }
+        //查询是否有考试计划
         ExamUserApplyVo examUserApplyVo = baseMapper.selectExamUserApplyVo(bo);
         if (examUserApplyVo == null){
             throw new IllegalArgumentException("商品无考试计划，无需预约考试");

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamBeforeServiceImpl.java

@@ -96,14 +96,17 @@ public class ExamBeforeServiceImpl extends ServiceImpl<ExamBeforeMapper, ExamBef
     public Boolean updateByEditBo(ExamBeforeEditBo bo) {
         ExamBefore update = BeanUtil.toBean(bo, ExamBefore.class);
         if (bo.getStatus() == 1) {
+            //是否已经设置商品
             if (baseMapper.countBeforeGoods(bo.getBeforeId()) < 1) {
                 throw new IllegalArgumentException("请先设置适用商品");
             }
+            //是否商品被启用考培
             if (baseMapper.beforeGoods(bo.getBeforeId()) > 0){
                 throw new IllegalArgumentException("该商品已启用考培，请重新创建");
             }
         }
         if (bo.getStatus() != -1){
+            //标题是否重复
             List<ExamBefore> list = this.list(new LambdaQueryWrapper<ExamBefore>()
                     .eq(ExamBefore::getBeforeName, bo.getBeforeName())
                     .eq(ExamBefore::getBeforeId, update.getBeforeId()));

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamKnowledgeServiceImpl.java

@@ -82,6 +82,7 @@ public class ExamKnowledgeServiceImpl extends ServiceImpl<ExamKnowledgeMapper, E
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ExamKnowledgeAddBo bo) {
+        //批量添加知识点
         for (String s : bo.getKnowledgeName()) {
 
             LambdaQueryWrapper<ExamKnowledge> lqw = Wrappers.lambdaQuery();
@@ -98,6 +99,7 @@ public class ExamKnowledgeServiceImpl extends ServiceImpl<ExamKnowledgeMapper, E
             examKnowledge.setCreateTime(DateUtils.getNowTime());
             examKnowledge.setUpdateTime(DateUtils.getNowTime());
             boolean save = this.save(examKnowledge);
+            //知识点绑定业务
             for (ExamKnowledgeBusinessAddBo examKnowledgeBusinessAddBo : bo.getExamKnowledgeBusinessAddBoList()) {
                 examKnowledgeBusinessAddBo.setKnowledgeId(examKnowledge.getKnowledgeId());
                 examKnowledgeBusinessAddBo.setUpdateTime(DateUtils.getNowTime());
@@ -112,6 +114,7 @@ public class ExamKnowledgeServiceImpl extends ServiceImpl<ExamKnowledgeMapper, E
     public Boolean updateByEditBo(ExamKnowledgeEditBo bo) {
         ExamKnowledge update = BeanUtil.toBean(bo, ExamKnowledge.class);
 
+        //去重
         LambdaQueryWrapper<ExamKnowledge> lqwExam = Wrappers.lambdaQuery();
         lqwExam.eq(ExamKnowledge::getKnowledgeName, bo.getKnowledgeName());
         lqwExam.eq(ExamKnowledge::getKnowledgeId, bo.getKnowledgeId());

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

@@ -269,6 +269,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
                                     classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
                                     classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
+                                    classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                                     classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
                                 }
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
@@ -299,6 +300,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                     classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
                                     classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
                                     classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
+                                    classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                                     classPeriodChapterVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
                                 }
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
@@ -338,6 +340,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
                         classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
                         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
+                        classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                         classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
                     }
                     classPeriodSectionVo.setModuleId(0L);
@@ -369,6 +372,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
                         classPeriodSectionVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
                         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
+                        classPeriodSectionVo.setPeriodStatusId(userPeriodStatusVo.getId());
                         classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
                         classPeriodVo.setPerformance(Convert.toBigDecimal(userPeriodStatusVo.getPerformance()));
                     }
@@ -403,6 +407,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     classPeriodVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
                     classPeriodVo.setPeriodStatus(userPeriodStatusVo.getPeriodStatus());
                     classPeriodVo.setPeriodId(userPeriodStatusVo.getPeriodId());
+                    classPeriodVo.setPeriodStatusId(userPeriodStatusVo.getId());
                     classPeriodVo.setAuditTime(userPeriodStatusVo.getAuditTime());
                 }
                 classPeriodVo.setModuleId(0L);
@@ -457,6 +462,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         classPeriodSectionVo.setUserStudyRecordPhotoList(userPeriodStatusVo.getUserStudyRecordPhotoList());
         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/vo/ClassPeriodSectionVo.java

@@ -121,6 +121,12 @@ public class ClassPeriodSectionVo {
 	@ApiModelProperty("當前審核ID")
 	private Long periodId;
 
+	/** 当前节状态 1 当前状态 0过往状态 */
+	/** 审核时间 */
+	@Excel(name = "當前審核状态ID")
+	@ApiModelProperty("當前審核状态ID")
+	private Long periodStatusId;
+
 	/** 审核时间 */
 	@Excel(name = "审核照片")
 	@ApiModelProperty("审核照片")

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

@@ -51,6 +51,12 @@ public class ClassPeriodVo {
 	@ApiModelProperty("班級ID")
 	private Long gradeId;
 
+	/** 当前节状态 1 当前状态 0过往状态 */
+	/** 审核时间 */
+	@Excel(name = "當前審核状态ID")
+	@ApiModelProperty("當前審核状态ID")
+	private Long periodStatusId;
+
 	/** 標題 */
 	@Excel(name = "標題")
 	@ApiModelProperty("標題")