Joburgess 5 jaren geleden
bovenliggende
commit
73241f8291

+ 9 - 2
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -215,9 +215,16 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			for (Object examResultConfig : examResultConfigs) {
 				Integer startScore = ((JSONObject) examResultConfig).getInteger("startScore");
 				Integer endScore = ((JSONObject) examResultConfig).getInteger("endScore");
-				if(studentExamResult.getAvgScore()>=startScore&&studentExamResult.getAvgScore()<=endScore){
-					String levelName = ((JSONObject) examResultConfig).getString("levelName");
+				String levelName = ((JSONObject) examResultConfig).getString("levelName");
+				boolean b;
+				if(levelName.equals(ExamEvaluationResultEnum.EXCELLENT.getCode())){
+					b = studentExamResult.getAvgScore()>=startScore&&studentExamResult.getAvgScore()<=endScore;
+				}else{
+					b = studentExamResult.getAvgScore()>=startScore&&studentExamResult.getAvgScore()<endScore;
+				}
+				if(b){
 					studentExamResult.setResult(ExamEvaluationResultEnum.valueOf(levelName));
+					break;
 				}
 			}
 		}

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExaminationBasicController.java

@@ -116,7 +116,7 @@ public class ExaminationBasicController extends BaseController {
     }
 
     @ApiOperation("获取首页进行中项目")
-    @PostMapping(value = "/getHomePageExams")
+    @GetMapping(value = "/getHomePageExams")
     @PreAuthorize("@pcs.hasPermissions('examinationBasic/getHomePageExams')")
     public HttpResponseResult getHomePageExams(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();