|
@@ -4395,11 +4395,12 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
for(CourseChapterVo chapterVo : chapterList){
|
|
for(CourseChapterVo chapterVo : chapterList){
|
|
|
DangAnCertificateItemExportVo itemExportVo = BeanUtil.toBean(vo, DangAnCertificateItemExportVo.class);
|
|
DangAnCertificateItemExportVo itemExportVo = BeanUtil.toBean(vo, DangAnCertificateItemExportVo.class);
|
|
|
if(Validator.isEmpty(chapterVo.getCommonSign())||chapterVo.getCommonSign()==0){
|
|
if(Validator.isEmpty(chapterVo.getCommonSign())||chapterVo.getCommonSign()==0){
|
|
|
- totalTime=totalTime.add(new BigDecimal(courseMenuMapper.countChapterTotalTime(chapterVo.getChapterId())));
|
|
|
|
|
|
|
+ totalTime=new BigDecimal(courseMenuMapper.countChapterTotalTime(chapterVo.getChapterId()));
|
|
|
|
|
+ itemExportVo.setChapterName(chapterVo.getName()+"(学时:"+totalTime.divide(new BigDecimal(45*60),BigDecimal.ROUND_HALF_UP)+")");
|
|
|
}else if(chapterVo.getCommonSign()==1){
|
|
}else if(chapterVo.getCommonSign()==1){
|
|
|
- publicTotalTime=publicTotalTime.add(new BigDecimal(courseMenuMapper.countChapterTotalTime(chapterVo.getChapterId())));
|
|
|
|
|
|
|
+ publicTotalTime=new BigDecimal(courseMenuMapper.countChapterTotalTime(chapterVo.getChapterId()));
|
|
|
|
|
+ itemExportVo.setChapterName(chapterVo.getName()+"(学时:"+publicTotalTime.divide(new BigDecimal(45*60),BigDecimal.ROUND_HALF_UP)+")");
|
|
|
}
|
|
}
|
|
|
- itemExportVo.setChapterName(chapterVo.getName()+"(学时:"+totalTime.divide(new BigDecimal(45*60),BigDecimal.ROUND_HALF_UP)+")");
|
|
|
|
|
exportItemList.add(itemExportVo);
|
|
exportItemList.add(itemExportVo);
|
|
|
}
|
|
}
|
|
|
ExcelUtil<DangAnCertificateItemExportVo> util = new ExcelUtil<DangAnCertificateItemExportVo>(DangAnCertificateItemExportVo.class);
|
|
ExcelUtil<DangAnCertificateItemExportVo> util = new ExcelUtil<DangAnCertificateItemExportVo>(DangAnCertificateItemExportVo.class);
|