bug:评分计算修改
This commit is contained in:
+2
-2
@@ -97,8 +97,8 @@ public class QualityEvaluationController extends BaseController<QualityEvaluatio
|
|||||||
|
|
||||||
@ApiOperation("查询评价分数")
|
@ApiOperation("查询评价分数")
|
||||||
@GetMapping("getScore")
|
@GetMapping("getScore")
|
||||||
public ResponseMessage<String> getScore(String lawId){
|
public ResponseMessage<Map<String,Double>> getScore(String lawId){
|
||||||
String score = iQualityEvaluationService.getScore(lawId);
|
Map<String, Double> score = iQualityEvaluationService.getScore(lawId);
|
||||||
|
|
||||||
return Result.success(score);
|
return Result.success(score);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ public interface IQualityEvaluationService extends IService<QualityEvaluation> {
|
|||||||
public List<QualityEvaluation> getEvaluationForm(QualityEvaluation query);
|
public List<QualityEvaluation> getEvaluationForm(QualityEvaluation query);
|
||||||
|
|
||||||
|
|
||||||
String getScore(String lawId);
|
Map<String, Double> getScore(String lawId);
|
||||||
|
|
||||||
ResponseMessage<QualityEvaluation> updateQualityEvaluation();
|
ResponseMessage<QualityEvaluation> updateQualityEvaluation();
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-5
@@ -172,7 +172,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
|
|||||||
private IEvaluationIndexService iEvaluationIndexService;
|
private IEvaluationIndexService iEvaluationIndexService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getScore(String lawId) {
|
public Map<String, Double> getScore(String lawId) {
|
||||||
|
|
||||||
QueryWrapper<QualityEvaluation> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<QualityEvaluation> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.eq("law_id",lawId)
|
queryWrapper.eq("law_id",lawId)
|
||||||
@@ -302,10 +302,11 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
|
|||||||
return score;
|
return score;
|
||||||
} ))));
|
} ))));
|
||||||
Double finalScore = result.get("quality") * 0.9 + result.get("dynamic");
|
Double finalScore = result.get("quality") * 0.9 + result.get("dynamic");
|
||||||
NumberFormat nf = NumberFormat.getNumberInstance();
|
// NumberFormat nf = NumberFormat.getNumberInstance();
|
||||||
nf.setMaximumFractionDigits(2);
|
// nf.setMaximumFractionDigits(2);
|
||||||
nf.setRoundingMode(RoundingMode.UP);
|
// nf.setRoundingMode(RoundingMode.UP);
|
||||||
return nf.format(finalScore);
|
result.put("finalScore", finalScore);
|
||||||
|
return result;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user