修改对标单元计算取数逻辑

src/main/java/com/keymobile/indicators/akka/actor/indicators/DriveIndIdObjCalActor.java

@@ -153,14 +153,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{
 						logger.info(baseIndValueMsg.getConfirmMessage());
 					}
 					String indValue = baseIndValueMsg.getValue();
-					//如果指标值返回空值，那么就不进行下面的计算了，直接返回给父actor
+					//如果指标值返回空值
 					if(StringUtils.isBlank(indValue)) {
-						CalIndAverageAndRankMsg driveIndAverageAndRankMsg = 
-								new CalIndAverageAndRankMsg(-1,
-										compareId,driveIndId,compareObj,date,"NaN",
-										unit,indType,scoreCardId,averageDriveIndFormula,compCalLogId);
-						driveIndIdCalActor.tell(driveIndAverageAndRankMsg,ActorRef.noSender());
-					}else {
+						indValue="0.0";
+					}
 					try {
 						driveIndFormula = driveIndFormula.replace("["+baseIndValueMsg.getIndId()+"]", 
 								indValue);
@@ -269,7 +265,6 @@ public class DriveIndIdObjCalActor extends AbstractActor{
 							driveIndIdCalActor.tell(driveIndAverageAndRankMsg,ActorRef.noSender());
 						}
 					}
-					}
 				})
 				.build();
 	}

src/main/java/com/keymobile/indicators/akka/actor/indicators/GetBaseIndValueActor.java

@@ -21,10 +21,15 @@ public class GetBaseIndValueActor extends AbstractActor{
 					Map<String,Object> indValueMap = indicatorsValueService.getIndicatorsValue(
 							getBaseIndValueMsg.getIndId(), getBaseIndValueMsg.getDimValue());
 					if(indValueMap!=null) {
+						if(indValueMap.get("value")==null) {//如果指标值为空，返回失败结果
 							//返回指标值结果
 							getSender().tell(new BaseIndValueMsg(getBaseIndValueMsg.getIndId()
-								,indValueMap.get("value")==null? null: indValueMap.get("value").toString(),
+									,null,indValueMap.get("compareObjDesc").toString(),0,""),getSelf());
+						}else {
+							getSender().tell(new BaseIndValueMsg(getBaseIndValueMsg.getIndId()
+									,indValueMap.get("value").toString(),
 									indValueMap.get("compareObjDesc").toString(),1,""),getSelf());
+						}
 					}else {
 						//返回指标值结果
 						getSender().tell(new BaseIndValueMsg(getBaseIndValueMsg.getIndId(),null,null,