指标评分规则公式综合评分添加平均值函数计算和综合评分分数上限属性

src/main/java/com/keymobile/indicators/model/entity/scorecard/IndScorecard.java

@@ -24,6 +24,9 @@ public class IndScorecard {
 	
 	private String cardName;
 	private String cardDesc;
+	//author:zhangkb  time:2020-8-10  desc:综合评价添加上限分数
+	private Double compLimitScore;
+	
 	private String scoreType;//综合评分类型  0:定义    1：公式
 	//定义综合评价
 	private Double indBaseScore;//基础分

src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java

@@ -244,6 +244,12 @@ public class IndScorecardService {
 										}
 									}
 								}
+								//判断是否有设置综合评分分数上限，有的话判断上限分和实际分
+								if(scoreCard.getCompLimitScore()!=null) {
+									if(baseScoreValue>scoreCard.getCompLimitScore()) {
+										baseScoreValue = scoreCard.getCompLimitScore();
+									}
+								}
 							}
 						}
 						//改善提升
@@ -368,7 +374,7 @@ public class IndScorecardService {
 			List<DriveIndCalResultDef> currentDriveResult,String acsType) {
 		double value = 0;
 		Map<String, Object> env = Maps.newHashMap();
-		//解析X,MIN,MAX
+		//解析X,MIN,MAX,AVG
 		if(formula.indexOf("X")>=0) {
 			//获取指标值
 			double x = Double.valueOf(resultObject.getValue());
@@ -394,6 +400,13 @@ public class IndScorecardService {
 			}
 			env.put("MAX", max);
 		}
+		if(formula.indexOf("AVG")>=0) {//获取组内平均值
+			double avg = 0;
+			if(!currentDriveResult.isEmpty()) {
+				avg = Double.valueOf(currentDriveResult.get(0).getAverage());
+			}
+			env.put("AVG", avg);
+		}
 		if(!env.isEmpty()) {
 			value = (Double)AviatorEvaluator.execute(formula, env);
 		}