结班发证书合并
生成作业时减去考试周时间
This commit is contained in:
wuchunlei
@@ -157,10 +157,10 @@ public class ClassController {
|
||||
return classEntityService.addClass(classEntity);
|
||||
}
|
||||
|
||||
//修改班级状态
|
||||
@RequestMapping("/updateClassState")
|
||||
public R updateClassState(@RequestBody Map<String,Object> params){
|
||||
return classEntityService.updateClassState(params);
|
||||
//开班
|
||||
@RequestMapping("/openClass")
|
||||
public R openClass(@RequestBody Map<String,Object> params){
|
||||
return classEntityService.openClass(params);
|
||||
}
|
||||
|
||||
//修改班级
|
||||
@@ -389,68 +389,62 @@ public class ClassController {
|
||||
return R.ok().put("result",classEntityService.userScoreList(params));
|
||||
}
|
||||
|
||||
//获取小班证书
|
||||
@RequestMapping("/getUserCertificateByClassId")
|
||||
public R getUserCertificateByClassId(@RequestBody Map<String,Object> params) {
|
||||
LambdaQueryWrapper<UserCertificate> wrapper = new LambdaQueryWrapper<>();
|
||||
if (StringUtils.isNotBlank(params.get("classId").toString())){
|
||||
wrapper.eq(UserCertificate::getClassId,params.get("classId"));
|
||||
}
|
||||
wrapper.eq(UserCertificate::getUserId,params.get("userId"));
|
||||
List<UserCertificate> userCertificate = userCertificateService.list(wrapper);
|
||||
return R.ok().put("userCertificate",userCertificate);
|
||||
}
|
||||
|
||||
//结班后发放证书
|
||||
@RequestMapping("/generateCertificateByClassEnd")
|
||||
//结班
|
||||
@RequestMapping("/closeClass")
|
||||
@Transactional
|
||||
public R generateCertificateByClassEnd(@RequestBody Map<String,Object> params){
|
||||
ClassEntity classEntity = classEntityService.getById(params.get("classId").toString());
|
||||
//给合格学员发放证书
|
||||
List<Map<String,Object>> userScoreList = classEntityService.userScoreList(params);
|
||||
for (Map<String, Object> userScoreMap : userScoreList) {
|
||||
if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(60))>=0){
|
||||
UserCertificate userCertificate = new UserCertificate();
|
||||
userCertificate.setTitle(classEntity.getTitle());
|
||||
String type = "B";
|
||||
if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(70))>=0){
|
||||
type = "A";
|
||||
}
|
||||
userCertificate.setType(type);
|
||||
MyUserEntity user = (MyUserEntity)userScoreMap.get("user");
|
||||
userCertificate.setUserId(user.getId());
|
||||
userCertificate.setClassId(classEntity.getId());
|
||||
//查询小班下得课程信息
|
||||
List<Map<String,Object>> classCourseInfoLlist = classEntityService.classCourseInfoClassId(classEntity.getId(),0);
|
||||
for (Map<String,Object> 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("【"));
|
||||
}
|
||||
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);
|
||||
public R closeClass(@RequestBody Map<String,Object> params){
|
||||
//结班限制
|
||||
R r = classEntityService.closeClass(params);
|
||||
//结班后给合格学员发放证书
|
||||
if ("0".equals(r.get("code").toString())){
|
||||
ClassEntity classEntity = classEntityService.getById(params.get("classId").toString());
|
||||
List<Map<String,Object>> userScoreList = classEntityService.userScoreList(params);
|
||||
for (Map<String, Object> userScoreMap : userScoreList) {
|
||||
if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(60))>=0){
|
||||
UserCertificate userCertificate = new UserCertificate();
|
||||
userCertificate.setTitle(classEntity.getTitle());
|
||||
String type = "B";
|
||||
if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(70))>=0){
|
||||
type = "A";
|
||||
}
|
||||
userCertificate.setType(type);
|
||||
MyUserEntity user = (MyUserEntity)userScoreMap.get("user");
|
||||
userCertificate.setUserId(user.getId());
|
||||
userCertificate.setClassId(classEntity.getId());
|
||||
//查询小班下得课程信息
|
||||
List<Map<String,Object>> classCourseInfoLlist = classEntityService.classCourseInfoClassId(classEntity.getId(),0);
|
||||
for (Map<String,Object> 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("【"));
|
||||
}
|
||||
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);
|
||||
}
|
||||
userCertificateService.save(userCertificate);
|
||||
}
|
||||
}
|
||||
return R.ok();
|
||||
}else {
|
||||
return r;
|
||||
}
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
//生成证书图片
|
||||
@@ -504,6 +498,18 @@ public class ClassController {
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
//获取小班证书
|
||||
@RequestMapping("/getUserCertificateByClassId")
|
||||
public R getUserCertificateByClassId(@RequestBody Map<String,Object> params) {
|
||||
LambdaQueryWrapper<UserCertificate> wrapper = new LambdaQueryWrapper<>();
|
||||
if (StringUtils.isNotBlank(params.get("classId").toString())){
|
||||
wrapper.eq(UserCertificate::getClassId,params.get("classId"));
|
||||
}
|
||||
wrapper.eq(UserCertificate::getUserId,params.get("userId"));
|
||||
List<UserCertificate> userCertificate = userCertificateService.list(wrapper);
|
||||
return R.ok().put("userCertificate",userCertificate);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user