Browse Source

得分统计表添加折算得分和是否量化指标属性

‘xugp 1 year ago
parent
commit
d65179f665

+ 5 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationScoreCount.java

@@ -49,6 +49,11 @@ public class EvaluationScoreCount extends Model {
     private double score;
 
 	/**
+	 * 折算得分
+	 */
+	private double obversionScore;
+
+	/**
 	 * 能否量化
 	 */
 	private Boolean isQuantified;

+ 3 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/schedule/ScoreCalculationSchedule.java

@@ -61,6 +61,7 @@ public class ScoreCalculationSchedule {
 			if (StringUtils.isNotEmpty(id)) {
 				qw1.lambda().eq(EvaluationScoreCount::getOrganizationEvaluationId, id);
 			}
+			qw1.lambda().eq(EvaluationScoreCount::getIsQuantified, true);
 			List<EvaluationScoreCount> evaluationScoreCountList = iEvaluatioinScoreCountService.list(qw1);
 			if (evaluationScoreCountList.size() >0){
 				List<String> idList = evaluationScoreCountList.stream().map(EvaluationScoreCount::getId).collect(Collectors.toList());
@@ -104,6 +105,8 @@ public class ScoreCalculationSchedule {
 									.organizationEvaluationRuleId(entry.getKey())
 									.organizationEvaluationId(organizationEvaluation.getId())
 									.score(Double.parseDouble(calculation))
+									.isQuantified(true)
+									.obversionScore(Double.parseDouble(calculation))
 									.build();
 								save = iEvaluatioinScoreCountService.save(evaluationScoreCount);
 							}