课程设置英文名校验
This commit is contained in:
@@ -414,30 +414,35 @@ public class ClassController {
|
|||||||
//查询小班下得课程信息
|
//查询小班下得课程信息
|
||||||
List<Map<String,Object>> classCourseInfoLlist = classEntityService.classCourseInfoClassId(classEntity.getId(),0);
|
List<Map<String,Object>> classCourseInfoLlist = classEntityService.classCourseInfoClassId(classEntity.getId(),0);
|
||||||
for (Map<String,Object> classCourseInfo:classCourseInfoLlist){
|
for (Map<String,Object> classCourseInfo:classCourseInfoLlist){
|
||||||
String certificateNo = classEntityService.getNextCertificateNo(type,classCourseInfo.get("titleAbbr").toString());
|
if (StringUtils.isNotEmpty(classCourseInfo.get("titleAbbr").toString())
|
||||||
userCertificate.setCertificateNo(certificateNo);
|
&&StringUtils.isNotEmpty(classCourseInfo.get("courseETitle").toString())){
|
||||||
userCertificate.setCourseId((Integer) classCourseInfo.get("courseId"));
|
String certificateNo = classEntityService.getNextCertificateNo(type,classCourseInfo.get("titleAbbr").toString());
|
||||||
if (StringUtils.isNotEmpty(user.getPhoto())&&StringUtils.isNotEmpty(user.getName())){
|
userCertificate.setCertificateNo(certificateNo);
|
||||||
String startYear = DateUtil.year(classEntity.getStartTime())+"";
|
userCertificate.setCourseId((Integer) classCourseInfo.get("courseId"));
|
||||||
String startMonth = DateUtil.month(classEntity.getStartTime())+1+"";
|
if (StringUtils.isNotEmpty(user.getPhoto())&&StringUtils.isNotEmpty(user.getName())){
|
||||||
String startDay = DateUtil.dayOfMonth(classEntity.getStartTime())+"";
|
String startYear = DateUtil.year(classEntity.getStartTime())+"";
|
||||||
String endYear = DateUtil.year(classEntity.getEndTime())+"";
|
String startMonth = DateUtil.month(classEntity.getStartTime())+1+"";
|
||||||
String endMonth = DateUtil.month(classEntity.getEndTime())+1+"";
|
String startDay = DateUtil.dayOfMonth(classEntity.getStartTime())+"";
|
||||||
String endDay = DateUtil.dayOfMonth(classEntity.getEndTime())+"";
|
String endYear = DateUtil.year(classEntity.getEndTime())+"";
|
||||||
double keshiTotal = (double)classCourseInfo.get("keshi");
|
String endMonth = DateUtil.month(classEntity.getEndTime())+1+"";
|
||||||
String keshi = (keshiTotal+"").replace(".0","");
|
String endDay = DateUtil.dayOfMonth(classEntity.getEndTime())+"";
|
||||||
String courseTitle = classCourseInfo.get("courseTitle").toString();
|
double keshiTotal = (double)classCourseInfo.get("keshi");
|
||||||
if (courseTitle.contains("【")){
|
String keshi = (keshiTotal+"").replace(".0","");
|
||||||
courseTitle = courseTitle.substring(0,courseTitle.indexOf("【"));
|
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,
|
userCertificateService.save(userCertificate);
|
||||||
classEntity.getTitle(),courseTitle,keshi};
|
}else {
|
||||||
String[] edes = {classCourseInfo.get("courseETitle").toString(),keshi};
|
R.error("课程未设置英文名或缩写");
|
||||||
String url = userCertificateService.generateCertificate(type,certificateNo,user.getPhoto(),user.getName(),
|
|
||||||
des, edes, endYear,endMonth,endDay);
|
|
||||||
userCertificate.setCertificateUrl(url);
|
|
||||||
}
|
}
|
||||||
userCertificateService.save(userCertificate);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user