Commit ffdaa94e by zhangkb

修改对标单元计算逻辑

parent e04a722c
...@@ -139,7 +139,6 @@ public class DriveIndIdObjCalActor extends AbstractActor{ ...@@ -139,7 +139,6 @@ public class DriveIndIdObjCalActor extends AbstractActor{
if(compCalLogId!=null) { if(compCalLogId!=null) {
compCalLog = compareUnitCalLogService.findById(compCalLogId); compCalLog = compareUnitCalLogService.findById(compCalLogId);
} }
if(baseIndValueMsg.getIsFinish()==0) { if(baseIndValueMsg.getIsFinish()==0) {
//日志填充 //日志填充
if(compCalLog!=null) { if(compCalLog!=null) {
...@@ -184,6 +183,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{ ...@@ -184,6 +183,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{
"formula:"+driveIndFormula+";"+ "formula:"+driveIndFormula+";"+
"errorValue:"+indValue+";"+"paramEnv:"+env+"</n>"); "errorValue:"+indValue+";"+"paramEnv:"+env+"</n>");
} }
//保存日志
if(compCalLog!=null) {
compareUnitCalLogService.saveOrUndate(compCalLog);
}
} }
confirmList.add(baseIndValueMsg.getIsFinish()); confirmList.add(baseIndValueMsg.getIsFinish());
if (++numberOfConfirm >= indIdSize) {//子actor全部返回 if (++numberOfConfirm >= indIdSize) {//子actor全部返回
...@@ -246,6 +249,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{ ...@@ -246,6 +249,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{
compCalLog.setLogInfo("计算考核指标出错:driveIndId:"+driveIndId+";"+ compCalLog.setLogInfo("计算考核指标出错:driveIndId:"+driveIndId+";"+
"paramEnv:"+env+";formula:"+driveIndFormula+"</n>"); "paramEnv:"+env+";formula:"+driveIndFormula+"</n>");
} }
//保存日志
if(compCalLog!=null) {
compareUnitCalLogService.saveOrUndate(compCalLog);
}
//表示计算错误,不生成考核结果 //表示计算错误,不生成考核结果
CalIndAverageAndRankMsg driveIndAverageAndRankMsg = CalIndAverageAndRankMsg driveIndAverageAndRankMsg =
new CalIndAverageAndRankMsg(-1, new CalIndAverageAndRankMsg(-1,
...@@ -263,10 +270,6 @@ public class DriveIndIdObjCalActor extends AbstractActor{ ...@@ -263,10 +270,6 @@ public class DriveIndIdObjCalActor extends AbstractActor{
} }
} }
} }
//保存日志
if(compCalLog!=null) {
compareUnitCalLogService.saveOrUndate(compCalLog);
}
}) })
.build(); .build();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment