单位评分规则添加指标总数计算逻辑

src/main/java/com/keymobile/indicators/model/entity/objscorerule/ScoreRule.java

@@ -24,7 +24,7 @@ public class ScoreRule {
 	
 	private String ruleName;//规则名称
 	private String scoreType;//得分类型：0 指标值直接参与计算    1 指标得分分数参与计算（综合评分和改善提升分开算）  2指标得分分数参与计算（指标分数=综合+改善）
-	private String calType;//计算类型：0 计算组内所有考核指标平均数    1 根据目录类别分类算平均分后根据权重计算考核指标   2单个指标权重计算
+	private String calType;//计算类型：0 计算组内所有考核指标平均数    1 根据目录类别分类算平均分后根据权重计算考核指标   2单个指标权重计算  3指标总得分
 	
 	private String indTypeWeightsJson;
 	private List<IndTypeWeight> indTypeWeights = new ArrayList<>();//目录类别权重数据

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

@@ -121,9 +121,9 @@ public class ScoreRuleService {
 		}
 	}
 	
-	//计算组内考核指标平均值
-	private ObjScoreCalResult calGroupIndAverage(ObjScoreCalResult objResult,ScoreRule scoreRule,List<String> indIds,
-			String compareObj,int date){
+	//计算组内考核指标平均值或者总和 type:0 计算组内所有考核指标平均数     3指标总得分
+	private ObjScoreCalResult calGroupIndAverageOrSum(ObjScoreCalResult objResult,ScoreRule scoreRule,List<String> indIds,
+			String compareObj,int date,String type){
 		objResult.setCompareObj(compareObj);
 		objResult.setScoreValue("0.0");
 		objResult.setImproveValue("0.0");
@@ -175,12 +175,22 @@ public class ScoreRuleService {
 					}
 				}
 			}
-			//计算平均值
-			String averageValue = CalculateUtils.averageValue(values,1);
+			String averageValue = "0.0";
 			String averageImproveValue = "0.0";
+			if("0".equals(type)) {//计算平均值
+				averageValue = CalculateUtils.averageValue(values,1);
+			}
+			if("3".equals(type)){//计算总和
+				averageValue = CalculateUtils.sumValue(values);
+			}
 			if(!improveValues.isEmpty()) {
+				if("0".equals(type)) {
 					averageImproveValue = CalculateUtils.averageValue(improveValues,1);
 				}
+				if("3".equals(type)){
+					averageImproveValue = CalculateUtils.sumValue(improveValues);
+				}
+			}
 			objResult.setScoreValue(averageValue);
 			objResult.setImproveValue(averageImproveValue);
 		}
@@ -376,14 +386,17 @@ public class ScoreRuleService {
 					}
 					//计算类型：0 计算组内所有考核指标平均数 
 					if("0".equals(scoreRule.getCalType())) {
-						objScoreCalResult = this.calGroupIndAverage(objScoreCalResult, scoreRule, 
-								indIds, compareObj, date);
+						objScoreCalResult = this.calGroupIndAverageOrSum(objScoreCalResult, scoreRule, 
+								indIds, compareObj, date, scoreRule.getCalType());
 					}else if("1".equals(scoreRule.getCalType())) {//1 根据目录类别分类算平均分后根据权重计算考核指标
 						objScoreCalResult = this.calIndCatalogTypeAverage(objScoreCalResult, scoreRule, 
 								compareObj, date);
-					}else {//2单个指标权重计算
+					}else if("2".equals(scoreRule.getCalType())){//2单个指标权重计算
 						objScoreCalResult = this.calSingleIndWeight(objScoreCalResult ,scoreRule, 
 								compareObj, date);
+					}else {//3:指标总得分
+						objScoreCalResult = this.calGroupIndAverageOrSum(objScoreCalResult, scoreRule, 
+								indIds, compareObj, date, scoreRule.getCalType());
 					}
 					objScoreCalResult.setCompareId(compareId);