Commit c7a7367f by zhangkb

修改对标计算逻辑以及计算单位得分逻辑

parent 79fd08f9
...@@ -96,6 +96,17 @@ public class CompareUnitCalActor extends AbstractActor{ ...@@ -96,6 +96,17 @@ public class CompareUnitCalActor extends AbstractActor{
()->new DriveIndIdCalActor(getSelf()))); ()->new DriveIndIdCalActor(getSelf())));
driveIndIdCalActor.tell(driveIndIdCalMsg, getSelf()); driveIndIdCalActor.tell(driveIndIdCalMsg, getSelf());
} }
}else {
//如果是先执行且没有平均分参考对象
if("1".equals(firstExe) && StringUtils.isBlank(averageObj)) {
//发送确认信息给父actor
FirstExeConfirmMsg confirmMsg = new FirstExeConfirmMsg(1,"");
startCompareUnitCalActor.tell(confirmMsg, ActorRef.noSender());
}else {
//发送后执行的确认消息给父actor
AfterExeConfirmMsg afterConfirmMsg = new AfterExeConfirmMsg(1,"");
startCompareUnitCalActor.tell(afterConfirmMsg, ActorRef.noSender());
}
} }
}) })
.match(FirstExeConfirmMsg.class, firstExeConfirmMsg -> { .match(FirstExeConfirmMsg.class, firstExeConfirmMsg -> {
......
...@@ -359,6 +359,7 @@ public class ScoreRuleService { ...@@ -359,6 +359,7 @@ public class ScoreRuleService {
ScoreRule scoreRule = this.getById(scoreRuleId); ScoreRule scoreRule = this.getById(scoreRuleId);
List<ObjScoreCalResult> datas = new ArrayList<>(); List<ObjScoreCalResult> datas = new ArrayList<>();
if(scoreRule!=null) { if(scoreRule!=null) {
if(!indIds.isEmpty() && !compareObjs.isEmpty()) {
for(String compareObj : compareObjs) { for(String compareObj : compareObjs) {
//判断库表是否已存在改结果数据 //判断库表是否已存在改结果数据
ObjScoreCalResult objScoreCalResult = objScoreCalResultMapper. ObjScoreCalResult objScoreCalResult = objScoreCalResultMapper.
...@@ -383,6 +384,7 @@ public class ScoreRuleService { ...@@ -383,6 +384,7 @@ public class ScoreRuleService {
} }
//批量新增或修改 //批量新增或修改
this.batchSaveOrUpdateObjScoreCalResult(datas); this.batchSaveOrUpdateObjScoreCalResult(datas);
}
}else { }else {
logger.info("单位评分卡id:"+scoreRuleId+" 不存在"); logger.info("单位评分卡id:"+scoreRuleId+" 不存在");
} }
......
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