From 92e0dacc1a57722e1c162ed2cb638571ad83722f Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Sat, 12 Oct 2024 15:17:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=BE=E7=BD=AE=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=90=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/ClassController.java | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/controller/ClassController.java b/src/main/java/com/peanut/modules/common/controller/ClassController.java index 90d40f50..fc18c6d7 100644 --- a/src/main/java/com/peanut/modules/common/controller/ClassController.java +++ b/src/main/java/com/peanut/modules/common/controller/ClassController.java @@ -414,30 +414,35 @@ public class ClassController { //查询小班下得课程信息 List> classCourseInfoLlist = classEntityService.classCourseInfoClassId(classEntity.getId(),0); for (Map classCourseInfo:classCourseInfoLlist){ - String certificateNo = classEntityService.getNextCertificateNo(type,classCourseInfo.get("titleAbbr").toString()); - userCertificate.setCertificateNo(certificateNo); - userCertificate.setCourseId((Integer) classCourseInfo.get("courseId")); - if (StringUtils.isNotEmpty(user.getPhoto())&&StringUtils.isNotEmpty(user.getName())){ - String startYear = DateUtil.year(classEntity.getStartTime())+""; - String startMonth = DateUtil.month(classEntity.getStartTime())+1+""; - String startDay = DateUtil.dayOfMonth(classEntity.getStartTime())+""; - String endYear = DateUtil.year(classEntity.getEndTime())+""; - String endMonth = DateUtil.month(classEntity.getEndTime())+1+""; - String endDay = DateUtil.dayOfMonth(classEntity.getEndTime())+""; - double keshiTotal = (double)classCourseInfo.get("keshi"); - String keshi = (keshiTotal+"").replace(".0",""); - String courseTitle = classCourseInfo.get("courseTitle").toString(); - if (courseTitle.contains("【")){ - courseTitle = courseTitle.substring(0,courseTitle.indexOf("【")); + if (StringUtils.isNotEmpty(classCourseInfo.get("titleAbbr").toString()) + &&StringUtils.isNotEmpty(classCourseInfo.get("courseETitle").toString())){ + String certificateNo = classEntityService.getNextCertificateNo(type,classCourseInfo.get("titleAbbr").toString()); + userCertificate.setCertificateNo(certificateNo); + userCertificate.setCourseId((Integer) classCourseInfo.get("courseId")); + if (StringUtils.isNotEmpty(user.getPhoto())&&StringUtils.isNotEmpty(user.getName())){ + String startYear = DateUtil.year(classEntity.getStartTime())+""; + String startMonth = DateUtil.month(classEntity.getStartTime())+1+""; + String startDay = DateUtil.dayOfMonth(classEntity.getStartTime())+""; + String endYear = DateUtil.year(classEntity.getEndTime())+""; + String endMonth = DateUtil.month(classEntity.getEndTime())+1+""; + String endDay = DateUtil.dayOfMonth(classEntity.getEndTime())+""; + double keshiTotal = (double)classCourseInfo.get("keshi"); + String keshi = (keshiTotal+"").replace(".0",""); + String courseTitle = classCourseInfo.get("courseTitle").toString(); + if (courseTitle.contains("【")){ + courseTitle = courseTitle.substring(0,courseTitle.indexOf("【")); + } + String[] des = {startYear,startMonth,startDay,endYear,endMonth,endDay, + classEntity.getTitle(),courseTitle,keshi}; + String[] edes = {classCourseInfo.get("courseETitle").toString(),keshi}; + String url = userCertificateService.generateCertificate(type,certificateNo,user.getPhoto(),user.getName(), + des, edes, endYear,endMonth,endDay); + userCertificate.setCertificateUrl(url); } - String[] des = {startYear,startMonth,startDay,endYear,endMonth,endDay, - classEntity.getTitle(),courseTitle,keshi}; - String[] edes = {classCourseInfo.get("courseETitle").toString(),keshi}; - String url = userCertificateService.generateCertificate(type,certificateNo,user.getPhoto(),user.getName(), - des, edes, endYear,endMonth,endDay); - userCertificate.setCertificateUrl(url); + userCertificateService.save(userCertificate); + }else { + R.error("课程未设置英文名或缩写"); } - userCertificateService.save(userCertificate); } } }