change 3 anni fa
parent
commit
ccaf868d0b

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

@@ -224,6 +224,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
                                 classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
                                 classPeriodSectionVo.setGoodsId(bo.getGoodsId());
+                                classPeriodSectionVo.setGradeId(bo.getGradeId());
                             }else {
                                 UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
                                 userPeriodQueryBo.setExamId(classPeriodSectionVo.getId());
@@ -247,6 +248,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                 classPeriodSectionVo.setModuleId(classPeriodVo.getId());
                                 classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
                                 classPeriodSectionVo.setGoodsId(bo.getGoodsId());
+                                classPeriodSectionVo.setGradeId(bo.getGradeId());
                             }
                         }
 
@@ -280,6 +282,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     classPeriodSectionVo.setModuleId(0L);
                     classPeriodSectionVo.setChapterId(classPeriodVo.getId());
                     classPeriodSectionVo.setGoodsId(bo.getGoodsId());
+                    classPeriodSectionVo.setGradeId(bo.getGradeId());
                 }
                 List<ClassPeriodSectionVo> classPeriodSectionVos1 = baseMapper.listPeriodSectionExam(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos1) {
@@ -305,6 +308,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     classPeriodSectionVo.setModuleId(0L);
                     classPeriodSectionVo.setChapterId(classPeriodVo.getId());
                     classPeriodSectionVo.setGoodsId(bo.getGoodsId());
+                    classPeriodSectionVo.setGradeId(bo.getGradeId());
                 }
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
@@ -332,6 +336,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 classPeriodVo.setModuleId(0L);
                 classPeriodVo.setChapterId(0L);
                 classPeriodVo.setGoodsId(bo.getGoodsId());
+                classPeriodVo.setGradeId(bo.getGradeId());
                 classPeriodVo.setUserPeriodStatusVos(userPeriodStatusVos);
             }
 

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodSectionVo.java

@@ -42,6 +42,10 @@ public class ClassPeriodSectionVo {
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
 
+	/** 班級ID */
+	@ApiModelProperty("班級ID")
+	private Long gradeId;
+
 	/** 模塊ID */
 	@ApiModelProperty("模塊ID")
 	private Long moduleId;

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

@@ -46,6 +46,10 @@ public class ClassPeriodVo {
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
 
+	/** 班級ID */
+	@ApiModelProperty("班級ID")
+	private Long gradeId;
+
 	/** 標題 */
 	@Excel(name = "標題")
 	@ApiModelProperty("標題")