Commit 62afc730 by 涂亚平

导出结果没有分数

1 parent c497f779
...@@ -110,7 +110,7 @@ public class AdministerController { ...@@ -110,7 +110,7 @@ public class AdministerController {
@PostMapping("exportClassDetail") @PostMapping("exportClassDetail")
@ApiOperation("** 班级管理--班级成员--导出 id 班级id userName") @ApiOperation("** 班级管理--班级成员--导出 id 班级id userName")
@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) // @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE})
public void exportClassDetail(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{ public void exportClassDetail(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{
classDetailDTO.setFlag(true); classDetailDTO.setFlag(true);
administerService.exportClassDetail(classDetailDTO); administerService.exportClassDetail(classDetailDTO);
......
...@@ -351,11 +351,18 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -351,11 +351,18 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
classDetailVO.setGetMaxScoreVOS(getMaxScoreVOS); classDetailVO.setGetMaxScoreVOS(getMaxScoreVOS);
Boolean flag = true; Boolean flag = true;
if (getMaxScoreVOS.size()>0){
for (GetMaxScoreVO getMaxScoreVO : getMaxScoreVOS){ for (GetMaxScoreVO getMaxScoreVO : getMaxScoreVOS){
if (getMaxScoreVO.getScore()<60){ if (getMaxScoreVO.getScore()<60){
flag = false; flag = false;
} }
} }
}else {
flag = false;
}
if (flag){ if (flag){
classDetailVO.setResult("合格"); classDetailVO.setResult("合格");
...@@ -434,6 +441,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -434,6 +441,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
Boolean flag = true; Boolean flag = true;
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
if (getMaxScoreVOS.size()>0){
for (GetMaxScoreVO getMaxScoreVO : getMaxScoreVOS){ for (GetMaxScoreVO getMaxScoreVO : getMaxScoreVOS){
stringBuilder.append(getMaxScoreVO.getPaperName()+":"+getMaxScoreVO.getScore()); stringBuilder.append(getMaxScoreVO.getPaperName()+":"+getMaxScoreVO.getScore());
if (getMaxScoreVO.getScore()<60){ if (getMaxScoreVO.getScore()<60){
...@@ -442,12 +451,18 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -442,12 +451,18 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
stringBuilder.append(" "); stringBuilder.append(" ");
} }
}else {
flag = false;
}
if (flag){ if (flag){
classDetailVO.setResult("合格"); classDetailVO.setResult("合格");
}else { }else {
classDetailVO.setResult("不合格"); classDetailVO.setResult("不合格");
} }
classDetailVO.setScore(stringBuilder.toString());
//答疑 //答疑
Integer count = answeringQuestionMapper.selectCount(new QueryWrapper<AnsweringQuestionDO>() Integer count = answeringQuestionMapper.selectCount(new QueryWrapper<AnsweringQuestionDO>()
.lambda() .lambda()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!