he2802 1 жил өмнө
parent
commit
bb62ba7f8c

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

@@ -2889,6 +2889,12 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             throw new CustomException("缺少OrderGoodsId");
         }
         OrderGoods og = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderGoodsId, bo.getOrderGoodsId()));
+        String commonGradeName = null;
+        if(Validator.isNotEmpty(og.getSevenClassCopy())&&og.getSevenClassCopy()>1){
+            OrderGoods copyOg = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderGoodsId, og.getSevenClassCopy()));
+            ClassGrade classGrade = iClassGradeService.getOne(new LambdaQueryWrapper<ClassGrade>().eq(ClassGrade::getGradeId, copyOg.getGradeId()));
+            commonGradeName = classGrade.getClassName();
+        }
         //查找最外层课程目录 模块 章 节
         List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
         classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
@@ -2900,6 +2906,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             //为模块搜索下面的章 和节 并搜索学时记录
             if (classPeriodVo.getType() == 1) {
                 CourseModuleVo moduleVo = iCourseModuleService.queryById(classPeriodVo.getId());
+                classPeriodVo.setCommonGradeName(commonGradeName);
                 List<ClassPeriodChapterVo> classPeriodChapterVos = baseMapper.listperiodChapter(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId(), bo.getGradeId(),bo.getOrderGoodsId());
                 Collections.sort(classPeriodChapterVos);
                 classPeriodChapterVos.addAll(baseMapper.listperiodModuleExam(bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId(), classPeriodVo.getId()));

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

@@ -217,6 +217,8 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private Integer doType;
 	@ApiModelProperty("公共标识:1公共章 0非公共章")
 	private Integer commonSign;
+	@ApiModelProperty("复制班级名称")
+	private String commonGradeName;
 	@Override
 	public int compareTo(ClassPeriodVo o) {
 		if(o.getCourseSort()==this.getCourseSort()){