评分卡改善提升添加是否纳入单位得分计算代码

src/main/java/com/keymobile/indicators/api/hytobacco/IndicatorsValueCtrl.java

@@ -104,6 +104,6 @@ public class IndicatorsValueCtrl {
 	@PostMapping(value = "/fillExcelFileTen")
 	public void fillExcelXianScore(@RequestBody List<String> indIds,@RequestParam int date,
 			@RequestParam String compareObjString,@RequestParam int groupNum,@RequestParam int type) throws Exception{
-		indicatorsValueService.fillExcelXianJuanYanGroup(indIds, date, compareObjString, groupNum,type);
+		indicatorsValueService.fillExcelXianScore(indIds, date, compareObjString, groupNum,type);
 	}
 }

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

@@ -39,6 +39,7 @@ public class IndScorecard implements Serializable{
 	private double worstIndScore;//最差指标分
 	private String otherCalFormula;//其他计算公式
 	//改善提升
+	private String isIncluScore;//是否纳入单位计分  0：不纳入     1：纳入
 	private double limitScore;//上限分数
 	private List<ImproveScoreDef> improveScoreItem = new ArrayList<>();//改善提升分数
 	

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

@@ -166,6 +166,7 @@ public class IndScorecardService {
 						}
 					}
 					//改善提升
+					if("1".equals(scoreCard.getIsIncluScore())) {//纳入单位得分计算
 						//同期
 						Optional<DriveIndCalResult> sameCompareObjResult = driveIndResultRepo
 								.findByIndIdAndDateAndCompareObj(indId, (date-100), compareObj);
@@ -181,6 +182,9 @@ public class IndScorecardService {
 							indImproveScoreValue = String.format("%.4f",new BigDecimal(improveScore));
 							result.put("improveScore",indImproveScoreValue);
 						}
+					}else {
+						result.put("improveScore","No");//表示不纳入单位得分计算标识
+					}
 				}
 			}else {
 				logger.error("id:"+indScorecardId+" 的评分卡不存在");

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

@@ -94,7 +94,9 @@ public class IndicatorsValueService {
 						.findByIndIdAndDateAndCompareObj(indId, date, compareObj);
 				if(driveIndCalResult.isPresent()) {
 					scoreValue.add(driveIndCalResult.get().getScore());
+					if(!"No".equals(driveIndCalResult.get().getImproveScore())) {//改善提升如果是纳入单位得分计算的
 						improveValue.add(driveIndCalResult.get().getImproveScore());
+					}
 				}else {
 					scoreValue.add("0");
 					improveValue.add("0");