zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

结班发证书合并

Browse Source 
生成作业时减去考试周时间
This commit is contained in:
wuchunlei
2024-10-12 14:13:21 +08:00
parent c44390aa74
commit 5f4c7ec304
3 changed files with 174 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/main/java/com/peanut/modules/common/controller/ClassController.java
View File

@@ -157,10 +157,10 @@ public class ClassController {
return classEntityService.addClass(classEntity); return classEntityService.addClass(classEntity);
} }
//修改班级状态 //开班
@RequestMapping("/updateClassState") @RequestMapping("/openClass")
public R updateClassState(@RequestBody Map<String,Object> params){ public R openClass(@RequestBody Map<String,Object> params){
return classEntityService.updateClassState(params); return classEntityService.openClass(params);
} }
//修改班级 //修改班级
@@ -389,68 +389,62 @@ public class ClassController {
return R.ok().put("result",classEntityService.userScoreList(params)); return R.ok().put("result",classEntityService.userScoreList(params));
} }
//获取小班证书 //结班
@RequestMapping("/getUserCertificateByClassId") @RequestMapping("/closeClass")
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")
@Transactional @Transactional
public R generateCertificateByClassEnd(@RequestBody Map<String,Object> params){ public R closeClass(@RequestBody Map<String,Object> params){
ClassEntity classEntity = classEntityService.getById(params.get("classId").toString()); //结班限制
//给合格学员发放证书 R r = classEntityService.closeClass(params);
List<Map<String,Object>> userScoreList = classEntityService.userScoreList(params); //结班后给合格学员发放证书
for (Map<String, Object> userScoreMap : userScoreList) { if ("0".equals(r.get("code").toString())){
if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(60))>=0){ ClassEntity classEntity = classEntityService.getById(params.get("classId").toString());
UserCertificate userCertificate = new UserCertificate(); List<Map<String,Object>> userScoreList = classEntityService.userScoreList(params);
userCertificate.setTitle(classEntity.getTitle()); for (Map<String, Object> userScoreMap : userScoreList) {
String type = "B"; if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(60))>=0){
if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(70))>=0){ UserCertificate userCertificate = new UserCertificate();
type = "A"; userCertificate.setTitle(classEntity.getTitle());
} String type = "B";
userCertificate.setType(type); if (new BigDecimal(userScoreMap.get("userScore").toString()).compareTo(new BigDecimal(70))>=0){
MyUserEntity user = (MyUserEntity)userScoreMap.get("user"); type = "A";
userCertificate.setUserId(user.getId()); }
userCertificate.setClassId(classEntity.getId()); userCertificate.setType(type);
//查询小班下得课程信息 MyUserEntity user = (MyUserEntity)userScoreMap.get("user");
List<Map<String,Object>> classCourseInfoLlist = classEntityService.classCourseInfoClassId(classEntity.getId(),0); userCertificate.setUserId(user.getId());
for (Map<String,Object> classCourseInfo:classCourseInfoLlist){ userCertificate.setClassId(classEntity.getId());
String certificateNo = classEntityService.getNextCertificateNo(type,classCourseInfo.get("titleAbbr").toString()); //查询小班下得课程信息
userCertificate.setCertificateNo(certificateNo); List<Map<String,Object>> classCourseInfoLlist = classEntityService.classCourseInfoClassId(classEntity.getId(),0);
userCertificate.setCourseId((Integer) classCourseInfo.get("courseId")); for (Map<String,Object> classCourseInfo:classCourseInfoLlist){
if (StringUtils.isNotEmpty(user.getPhoto())&&StringUtils.isNotEmpty(user.getName())){ String certificateNo = classEntityService.getNextCertificateNo(type,classCourseInfo.get("titleAbbr").toString());
String startYear = DateUtil.year(classEntity.getStartTime())+""; userCertificate.setCertificateNo(certificateNo);
String startMonth = DateUtil.month(classEntity.getStartTime())+1+""; userCertificate.setCourseId((Integer) classCourseInfo.get("courseId"));
String startDay = DateUtil.dayOfMonth(classEntity.getStartTime())+""; if (StringUtils.isNotEmpty(user.getPhoto())&&StringUtils.isNotEmpty(user.getName())){
String endYear = DateUtil.year(classEntity.getEndTime())+""; String startYear = DateUtil.year(classEntity.getStartTime())+"";
String endMonth = DateUtil.month(classEntity.getEndTime())+1+""; String startMonth = DateUtil.month(classEntity.getStartTime())+1+"";
String endDay = DateUtil.dayOfMonth(classEntity.getEndTime())+""; String startDay = DateUtil.dayOfMonth(classEntity.getStartTime())+"";
double keshiTotal = (double)classCourseInfo.get("keshi"); String endYear = DateUtil.year(classEntity.getEndTime())+"";
String keshi = (keshiTotal+"").replace(".0",""); String endMonth = DateUtil.month(classEntity.getEndTime())+1+"";
String courseTitle = classCourseInfo.get("courseTitle").toString(); String endDay = DateUtil.dayOfMonth(classEntity.getEndTime())+"";
if (courseTitle.contains("【")){ double keshiTotal = (double)classCourseInfo.get("keshi");
courseTitle = courseTitle.substring(0,courseTitle.indexOf("【")); String keshi = (keshiTotal+"").replace(".0","");
} String courseTitle = classCourseInfo.get("courseTitle").toString();
String[] des = {startYear,startMonth,startDay,endYear,endMonth,endDay, if (courseTitle.contains("【")){
classEntity.getTitle(),courseTitle,keshi}; courseTitle = courseTitle.substring(0,courseTitle.indexOf("【"));
String[] edes = {classCourseInfo.get("courseETitle").toString(),keshi}; }
String url = userCertificateService.generateCertificate(type,certificateNo,user.getPhoto(),user.getName(), String[] des = {startYear,startMonth,startDay,endYear,endMonth,endDay,
des, edes, endYear,endMonth,endDay); classEntity.getTitle(),courseTitle,keshi};
userCertificate.setCertificateUrl(url); 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(); 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);
}
} }

4
src/main/java/com/peanut/modules/common/service/ClassEntityService.java
View File

@@ -25,7 +25,7 @@ public interface ClassEntityService extends IService<ClassEntity> {
R addClass(ClassEntity classEntity); R addClass(ClassEntity classEntity);
R updateClassState(Map<String,Object> params); R openClass(Map<String,Object> params);
String getNextCertificateNo(String type,String courseNamePinyin); String getNextCertificateNo(String type,String courseNamePinyin);
@@ -99,4 +99,6 @@ public interface ClassEntityService extends IService<ClassEntity> {
List<Map<String,Object>> classCourseInfoClassId(int classId,int courseId); List<Map<String,Object>> classCourseInfoClassId(int classId,int courseId);
R closeClass(Map<String,Object> params);
} }

201
src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.DateUtils;
import com.peanut.common.utils.R; import com.peanut.common.utils.R;
import com.peanut.common.utils.ShiroUtils; import com.peanut.common.utils.ShiroUtils;
import com.peanut.config.DelayQueueConfig; import com.peanut.config.DelayQueueConfig;
@@ -237,113 +238,88 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
@Override @Override
@Transactional @Transactional
public R updateClassState(Map<String, Object> params) { public R openClass(Map<String, Object> params) {
String state = params.get("state").toString();
ClassEntity classEntity = this.getBaseMapper().selectById(params.get("classId").toString()); ClassEntity classEntity = this.getBaseMapper().selectById(params.get("classId").toString());
ClassModel classModel = classModelDao.selectById(classEntity.getModelId()); ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
if ("1".equals(state)){ //开班校验
//开班校验 int monitorCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>()
int monitorCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>() .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"1"));
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"1")); if (monitorCount<1){
if (monitorCount<1){ return R.error("请先设置班长");
return R.error("请先设置班长"); }
} int dmonitorCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>()
int dmonitorCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>() .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"2"));
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"2")); if (dmonitorCount<1){
if (dmonitorCount<1){ return R.error("请先设置副班长");
return R.error("请先设置副班长"); }
} int studyCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>()
int studyCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>() .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"3"));
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"3")); if (studyCount<1){
if (studyCount<1){ return R.error("请先设置学习委员");
return R.error("请先设置学习委员"); }
} int commentCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>()
int commentCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>() .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"4"));
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"4")); if (commentCount<3){
if (commentCount<3){ return R.error("请先设置3位评分员");
return R.error("请先设置3位评分员"); }
}
if (classModel.getIsTask()==1){ if (classModel.getIsTask()==1){
int taskCount = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>() int taskCount = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
.eq(ClassTask::getClassId,classEntity.getId()).eq(ClassTask::getType,"0")); .eq(ClassTask::getClassId,classEntity.getId()).eq(ClassTask::getType,"0"));
if (taskCount<(classModel.getDays()/7.0)){ if (taskCount<((classModel.getDays()-classModel.getExamDays())/7.0)){
return R.error("请至少发布"+Math.ceil(classModel.getDays()/7.0)+"个任务。"); return R.error("请发布"+Math.ceil((classModel.getDays()-classModel.getExamDays())/7.0)+"个任务。");
}
} }
}
int studentCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>() int studentCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>()
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0")); .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0"));
if (studentCount<classEntity.getNumber()){ if (studentCount<classEntity.getNumber()){
return R.error("学生人数未满"); return R.error("学生人数未满");
} }
List<ClassUser> userList = classUserDao.selectList(new LambdaQueryWrapper<ClassUser>() List<ClassUser> userList = classUserDao.selectList(new LambdaQueryWrapper<ClassUser>()
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0")); .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0"));
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if (userList.size() > 0) { if (userList.size() > 0) {
for (ClassUser classUser:userList){ for (ClassUser classUser:userList){
MyUserEntity user = myUserDao.selectById(classUser.getUserId()); MyUserEntity user = myUserDao.selectById(classUser.getUserId());
if ("0".equals(user.getVip())||"3".equals(user.getVip())){ if ("0".equals(user.getVip())||"3".equals(user.getVip())){
//不是vip查询每门课是否购买 //不是vip查询每门课是否购买
boolean flag = false; boolean flag = false;
List<ClassCourse> courses = classCourseDao.selectList(new LambdaQueryWrapper<ClassCourse>() List<ClassCourse> courses = classCourseDao.selectList(new LambdaQueryWrapper<ClassCourse>()
.eq(ClassCourse::getModelId,classEntity.getModelId())); .eq(ClassCourse::getModelId,classEntity.getModelId()));
for (ClassCourse classCourse:courses){ for (ClassCourse classCourse:courses){
List<CourseCatalogueEntity> catalogues = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>() List<CourseCatalogueEntity> catalogues = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>()
.eq(CourseCatalogueEntity::getCourseId,classCourse.getCourseId())); .eq(CourseCatalogueEntity::getCourseId,classCourse.getCourseId()));
for (CourseCatalogueEntity catalog:catalogues){ for (CourseCatalogueEntity catalog:catalogues){
int ucbCount = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>() int ucbCount = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
.eq(UserCourseBuyEntity::getUserId,classUser.getUserId()) .eq(UserCourseBuyEntity::getUserId,classUser.getUserId())
.eq(UserCourseBuyEntity::getCatalogueId,catalog.getId())); .eq(UserCourseBuyEntity::getCatalogueId,catalog.getId()));
if (ucbCount == 0){ if (ucbCount == 0){
flag = true; flag = true;
CourseEntity c = courseDao.selectById(classCourse.getCourseId()); CourseEntity c = courseDao.selectById(classCourse.getCourseId());
sb.append("用户"+ user.getTel()+"未购买课程"+c.getTitle()+"-"+catalog.getTitle()+";\n"); sb.append("用户"+ user.getTel()+"未购买课程"+c.getTitle()+"-"+catalog.getTitle()+";\n");
}
} }
} }
if (flag) { }
return R.error(sb.toString()); if (flag) {
} return R.error(sb.toString());
} }
} }
} }
classEntity.setState("1"); }
Date startTime = new Date(); classEntity.setState("1");
classEntity.setStartTime(startTime); Date startTime = new Date();
this.getBaseMapper().updateById(classEntity); classEntity.setStartTime(startTime);
if (classModel.getIsExam()==1){ this.getBaseMapper().updateById(classEntity);
//根据设置的天数将班级状态从进行中设置成考试中 if (classModel.getIsExam()==1){
rabbitTemplate.convertAndSend( //根据设置的天数将班级状态从进行中设置成考试中
DelayQueueConfig.COMMON_EXCHANGE, rabbitTemplate.convertAndSend(
DelayQueueConfig.COMMON_ROUTING_KEY, DelayQueueConfig.COMMON_EXCHANGE,
"examDays"+","+classEntity.getId(), DelayQueueConfig.COMMON_ROUTING_KEY,
messagePostProcessor((classModel.getDays()-classModel.getExamDays())*24*60*60*1000) "examDays"+","+classEntity.getId(),
); messagePostProcessor((classModel.getDays()-classModel.getExamDays())*24*60*60*1000)
} );
}else {
//结班限制
int classExamUsers = classExamUserDao.selectCount(new LambdaQueryWrapper<ClassExamUser>()
.eq(ClassExamUser::getRelationId,classEntity.getId())
.eq(ClassExamUser::getScoreSuccess,0));
if (classExamUsers>0){
return R.error("有学员正在考试，请稍后再试");
}
int taskReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
.eq(ClassTaskAndQuesReply::getType,0)
.ne(ClassTaskAndQuesReply::getScoreSuccess,2));
int questionReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
.eq(ClassTaskAndQuesReply::getType,1)
.eq(ClassTaskAndQuesReply::getScoreSuccess,0));
if (taskReplys>0||questionReplys>0){
return R.error("学员打分未完成，请完成打分后结班");
}
classEntity.setState("2");
classEntity.setEndTime(new Date());
this.getBaseMapper().updateById(classEntity);
} }
return R.ok(); return R.ok();
} }
@@ -864,7 +840,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
} }
} }
ClassModel classModel = classModelDao.selectById(classEntity.getModelId()); ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
for (int i = 1; i <= Math.ceil((classModel.getDays()/7.0));i++){ for (int i = 1; i <= Math.ceil(((classModel.getDays()-classModel.getExamDays())/7.0));i++){
ClassTask classTask = new ClassTask(); ClassTask classTask = new ClassTask();
classTask.setClassId(classEntity.getId()); classTask.setClassId(classEntity.getId());
classTask.setUserId(ShiroUtils.getUId()); classTask.setUserId(ShiroUtils.getUId());
@@ -1400,6 +1376,37 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
return res; return res;
} }
@Override
public R closeClass(Map<String, Object> params) {
ClassEntity classEntity = this.getBaseMapper().selectById(params.get("classId").toString());
ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
if (DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()).getTime() < new Date().getTime()){
return R.error("教学时间未完");
}
//结班限制
int classExamUsers = classExamUserDao.selectCount(new LambdaQueryWrapper<ClassExamUser>()
.eq(ClassExamUser::getRelationId,classEntity.getId())
.eq(ClassExamUser::getScoreSuccess,0));
if (classExamUsers>0){
return R.error("有学员正在考试，请稍后再试");
}
int taskReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
.eq(ClassTaskAndQuesReply::getType,0)
.ne(ClassTaskAndQuesReply::getScoreSuccess,2));
int questionReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
.eq(ClassTaskAndQuesReply::getType,1)
.eq(ClassTaskAndQuesReply::getScoreSuccess,0));
if (taskReplys>0||questionReplys>0){
return R.error("学员打分未完成，请完成打分后结班");
}
classEntity.setState("2");
classEntity.setEndTime(new Date());
this.getBaseMapper().updateById(classEntity);
return R.ok();
}
private MessagePostProcessor messagePostProcessor(long date) { private MessagePostProcessor messagePostProcessor(long date) {
return message -> { return message -> {