|
@@ -318,6 +318,9 @@ public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, Cou
|
|
|
|
|
|
List<CourseTargetWebDto> courseTargetResultList = this.buildByDimensionList(
|
|
List<CourseTargetWebDto> courseTargetResultList = this.buildByDimensionList(
|
|
courseTargetList, dimensionList);
|
|
courseTargetList, dimensionList);
|
|
|
|
+ if (CollectionUtils.isNotEmpty(courseTargetResultList)) {
|
|
|
|
+ subCell.setCourseTargetName(courseTargetResultList.get(0).getTargetName());
|
|
|
|
+ }
|
|
subCell.setTargetList(courseTargetResultList);
|
|
subCell.setTargetList(courseTargetResultList);
|
|
}
|
|
}
|
|
subCell.setMainNumber(mainNumber);
|
|
subCell.setMainNumber(mainNumber);
|
|
@@ -343,7 +346,11 @@ public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, Cou
|
|
|
|
|
|
List<CourseTargetWebDto> courseTargetResultList = this.buildByDimensionList(
|
|
List<CourseTargetWebDto> courseTargetResultList = this.buildByDimensionList(
|
|
courseTargetList, dimensionList);
|
|
courseTargetList, dimensionList);
|
|
|
|
+ if (CollectionUtils.isNotEmpty(courseTargetResultList)) {
|
|
|
|
+ cell.setCourseTargetName(courseTargetResultList.get(0).getTargetName());
|
|
|
|
+ }
|
|
cell.setTargetList(courseTargetResultList);
|
|
cell.setTargetList(courseTargetResultList);
|
|
|
|
+
|
|
}
|
|
}
|
|
cell.setMainNumber(mainNumber);
|
|
cell.setMainNumber(mainNumber);
|
|
cell.setSubNumber(subNumberIndex.getAndIncrement());
|
|
cell.setSubNumber(subNumberIndex.getAndIncrement());
|