|
@@ -65,8 +65,7 @@ public class ApiCalculate {
|
|
|
// 将传入的数据转为bean
|
|
|
calculateRequest = data.toBean(CalculateRequest.class);
|
|
|
// 调用计算方法
|
|
|
- CalculateResult resultMap = accuracyPassRateCalculateService.calculate(calculateRequest);
|
|
|
- return resultMap;
|
|
|
+ return accuracyPassRateCalculateService.calculate(calculateRequest);
|
|
|
}
|
|
|
|
|
|
@PostMapping("/assessment")
|
|
@@ -77,11 +76,11 @@ public class ApiCalculate {
|
|
|
if (!CalculateResult.Type.SUCCESS.value().equals(String.valueOf(checkResult.get(CalculateResult.CODE_TAG)))) {
|
|
|
return checkResult;
|
|
|
}
|
|
|
- AssessmentRequest assessmentRequest;
|
|
|
+ AssessmentRequest calculateRequest;
|
|
|
// 将传入的数据转为bean
|
|
|
- assessmentRequest = data.toBean(AssessmentRequest.class);
|
|
|
+ calculateRequest = data.toBean(AssessmentRequest.class);
|
|
|
// 调用计算方法
|
|
|
- CalculateResult resultMap = assessmentCalculateService.calculateAssessment(assessmentRequest);
|
|
|
+ CalculateResult resultMap = assessmentCalculateService.calculateAssessment(calculateRequest);
|
|
|
return resultMap;
|
|
|
}
|
|
|
|