diff --git a/src/main/java/com/subsidy/controller/AdministerController.java b/src/main/java/com/subsidy/controller/AdministerController.java index 5f33bfd..bce4b88 100644 --- a/src/main/java/com/subsidy/controller/AdministerController.java +++ b/src/main/java/com/subsidy/controller/AdministerController.java @@ -110,7 +110,7 @@ public class AdministerController { @PostMapping("exportClassDetail") @ApiOperation("** 班级管理--班级成员--导出 id 班级id userName") - @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) +// @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) public void exportClassDetail(@RequestBody ClassDetailDTO classDetailDTO)throws Exception{ classDetailDTO.setFlag(true); administerService.exportClassDetail(classDetailDTO); diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java index 790411d..84a990a 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java @@ -351,12 +351,19 @@ public class AdministerServiceImpl extends ServiceImpl0){ + for (GetMaxScoreVO getMaxScoreVO : getMaxScoreVOS){ + if (getMaxScoreVO.getScore()<60){ + flag = false; + } } + }else { + flag = false; } + + if (flag){ classDetailVO.setResult("合格"); }else { @@ -434,12 +441,18 @@ public class AdministerServiceImpl extends ServiceImpl0){ + for (GetMaxScoreVO getMaxScoreVO : getMaxScoreVOS){ + stringBuilder.append(getMaxScoreVO.getPaperName()+":"+getMaxScoreVO.getScore()); + if (getMaxScoreVO.getScore()<60){ + flag = false; + } + stringBuilder.append(" "); } - stringBuilder.append(" "); + + }else { + flag = false; } if (flag){ @@ -448,6 +461,8 @@ public class AdministerServiceImpl extends ServiceImpl() .lambda()