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

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

@@ -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,24 +389,15 @@ 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){
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){
@@ -451,6 +442,9 @@ public class ClassController {
}
}
return R.ok();
}else {
return r;
}
}
//生成证书图片
@@ -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);
}
}

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 updateClassState(Map<String,Object> params);
R openClass(Map<String,Object> params);
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);
R closeClass(Map<String,Object> params);
}

65
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.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.DateUtils;
import com.peanut.common.utils.R;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.config.DelayQueueConfig;
@@ -237,11 +238,9 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
@Override
@Transactional
public R updateClassState(Map<String, Object> params) {
String state = params.get("state").toString();
public R openClass(Map<String, Object> params) {
ClassEntity classEntity = this.getBaseMapper().selectById(params.get("classId").toString());
ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
if ("1".equals(state)){
//开班校验
int monitorCount = classUserDao.selectCount(new LambdaQueryWrapper<ClassUser>()
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"1"));
@@ -267,8 +266,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
if (classModel.getIsTask()==1){
int taskCount = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
.eq(ClassTask::getClassId,classEntity.getId()).eq(ClassTask::getType,"0"));
if (taskCount<(classModel.getDays()/7.0)){
return R.error("请至少发布"+Math.ceil(classModel.getDays()/7.0)+"个任务。");
if (taskCount<((classModel.getDays()-classModel.getExamDays())/7.0)){
return R.error("请发布"+Math.ceil((classModel.getDays()-classModel.getExamDays())/7.0)+"个任务。");
}
}
@@ -322,29 +321,6 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
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();
}
@@ -864,7 +840,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
}
}
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.setClassId(classEntity.getId());
classTask.setUserId(ShiroUtils.getUId());
@@ -1400,6 +1376,37 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
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) {
return message -> {