不算同期单位得分

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

@@ -25,44 +25,44 @@ import akka.actor.Props;
 
 public class StartCompareUnitCalActor extends AbstractActor{
 	private Logger logger = LoggerFactory.getLogger(StartCompareUnitCalActor.class);
-	
+
 	private ScoreRuleService scoreRuleServer = SpringUtil.getBean(ScoreRuleService.class);
-	
+
 	private TestScoreRuleService testScoreRuleServer = SpringUtil.getBean(TestScoreRuleService.class);
 
 	private CompareUnitCalLogService compareUnitCalLogService = SpringUtil.getBean(CompareUnitCalLogService.class);
 
 	private List<CompareUnitDef> firstExeList = new ArrayList<>();//先执行对标单元list
-	
+
 	private List<CompareUnitDef> afterExeList = new ArrayList<>();//后执行对标单元list
-	
+
 	private int numberOfConfirm = 0;//定义返回确认消息的子actor
-	
+
 	private int firstExeUnitSize = 0;//需要先执行对标单元个数
-	
+
 	private int numberOfAfterConfirm = 0;//定义后执行返回确认消息的子actor
-	
+
 	private int afterExeUnitSize = 0;//后执行的对标单元个数
-	
+
 	private List<CompareUnitDef> calTypeExeList = new ArrayList<>();//存储对标单元单位评分规则calType不为0的对标单元list
-	
+
 	private String code = null;//机构编码
-	
+
 	private String isTest = null;//试运行，0：试运行    1：正式运行
 	private Integer compCalLogId = null;
 	private String path = null;//对标单元目录
 	private Integer currentDate = null;//当前对标时间
-	
+
 	private final ActorRef beforeCompareUnitActor;//定义父actor
-	
+
 	static public Props props(ActorRef beforeCompareUnitActor) {
 		return Props.create(StartCompareUnitCalActor.class,()->new StartCompareUnitCalActor(beforeCompareUnitActor));
 	}
-	
+
 	public StartCompareUnitCalActor(ActorRef beforeCompareUnitActor) {
 		this.beforeCompareUnitActor = beforeCompareUnitActor;
 	}
-	
+
 	@Override
 	public Receive createReceive() {
 		Receive receive = null;
@@ -120,7 +120,7 @@ public class StartCompareUnitCalActor extends AbstractActor{
 									compareUnitCalMsg.setCompCalLogId(compCalLogId);
 									//设置对标单元目录
 									compareUnitCalMsg.setPath(path);
-									
+
 									ActorRef compareUnitCalActor = this.getContext()
 											.actorOf(Props.create(CompareUnitCalActor.class,
 													() -> new CompareUnitCalActor(getSelf())));
@@ -148,7 +148,7 @@ public class StartCompareUnitCalActor extends AbstractActor{
 									compareUnitCalMsg.setCompCalLogId(compCalLogId);
 									//设置对标单元目录
 									compareUnitCalMsg.setPath(path);
-									
+
 									ActorRef compareUnitCalActor = this.getContext()
 											.actorOf(Props.create(CompareUnitCalActor.class,
 													() -> new CompareUnitCalActor(getSelf())));
@@ -160,11 +160,11 @@ public class StartCompareUnitCalActor extends AbstractActor{
 									logger.info("进行后执行对标单元计算....");
 								}
 							} else {
-								if (!calTypeExeList.isEmpty()) {
+								if (!calTypeExeList.isEmpty()&&calTypeExeList.get(0).getDate().equals(currentDate)) {
 									if ("0".equals(isTest)) {
-										logger.info("计算试运行对标单元单位评分......");
+										logger.info("计算试运行对标单元单位评分......date={}",calTypeExeList.get(0).getDate());
 									} else {
-										logger.info("计算对标单元单位评分......");
+										logger.info("计算对标单元单位评分......date={}",calTypeExeList.get(0).getDate());
 									}
 									for (CompareUnitDef unitDef : calTypeExeList) {
 										//试运行
@@ -208,13 +208,13 @@ public class StartCompareUnitCalActor extends AbstractActor{
 										testScoreRuleServer.testCalObjScore(path,unitDef.getCompareId(),
 												Arrays.asList(unitDef.getIndIds().split(",")),
 												Arrays.asList(unitDef.getCompareObjs().split(",")),
-												unitDef.getDate(), unitDef.getObjScoreRuleId(), 
+												unitDef.getDate(), unitDef.getObjScoreRuleId(),
 												code, currentDate);
 									} else {
 										scoreRuleServer.calObjScore(path,unitDef.getCompareId(),
 												Arrays.asList(unitDef.getIndIds().split(",")),
 												Arrays.asList(unitDef.getCompareObjs().split(",")),
-												unitDef.getDate(), unitDef.getObjScoreRuleId(), 
+												unitDef.getDate(), unitDef.getObjScoreRuleId(),
 												code, currentDate);
 									}
 								}