he2802 пре 2 година
родитељ
комит
24483725de

+ 5 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -225,6 +225,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
                 List<CourseMenuVo> menuVoList = iCourseMenuService.queryList(menuQueryBo);
                 for(CourseMenuVo menuVo : menuVoList){
                     bo.setModuleId(menuVo.getMenuId());
+                    bo.setMoreCertificateStatus(goodsVo.getMoreCertificateStatus());
                     CourseModuleVo moduleVo = iCourseModuleService.queryById(menuVo.getMenuId());
                     //获取章列表
                     List<CourseChapterVo> chapterList =  iClassGradeUserService.findChapterList(bo);
@@ -234,14 +235,16 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
                     }
                     goodsVo.setClassHours(totalTime.divide(new BigDecimal(45*60),BigDecimal.ROUND_HALF_UP));
                     List<Long> tpIds = new ArrayList<>();
-                    tpIds.add(moduleVo.getCertificateTpId());
+                    if(Validator.isNotEmpty(moduleVo.getCertificateTpId())){
+                        tpIds.add(moduleVo.getCertificateTpId());
+                    }
                     CertificateTpQueryBo queryBo = new CertificateTpQueryBo();
                     queryBo.setTpIds(tpIds);
                     queryBo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
                     List<CertificateTpVo> list = selectListByBo(queryBo);
 
                     for(CertificateTpVo tpVo : list){
-                        drawCertificate(tpVo,goodsVo,bo,userVo,studyRecordVo,classGradeUser,chapterList,courseVo.getCourseId());
+                        drawCertificate(tpVo,goodsVo,bo,userVo,studyRecordVo,classGradeUser,chapterList,bo.getModuleId());
                     }
                 }
             }