修改对标计算逻辑

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

@@ -96,11 +96,6 @@ public class BeforeCompareUnitCalActor extends AbstractActor{
 									indicatorsReportService.dealDriveIndReportTwoData(
 											unitDef.getCompareId(), Arrays.asList(unitDef.getIndIds().split(",")),
 											Arrays.asList(unitDef.getCompareObjs().split(",")), unitDef.getDate());
-									
-									//整合考核指标报表数据3
-									indicatorsReportService.dealDriveIndReportThreeData(
-											unitDef.getCompareId(), Arrays.asList(unitDef.getIndIds().split(",")), 
-											unitDef.getDate());
 								}
 							}
 							
@@ -110,6 +105,15 @@ public class BeforeCompareUnitCalActor extends AbstractActor{
 								List<String> compareObjs = new ArrayList<String>(compareObjMap.keySet());
 								indicatorsReportService.dealBaseIndReportOneData(currentDate, compareObjs);
 							}
+							
+							//整合考核指标报表数据3
+							logger.info("进行date:"+currentDate+" 指标报表3数据整合");
+							for(CompareUnitDef unitDef : currentCompareUnitDef) {
+								indicatorsReportService.dealDriveIndReportThreeData(
+										unitDef.getCompareId(), Arrays.asList(unitDef.getIndIds().split(",")), 
+										unitDef.getDate());
+							}
+							
 							logger.info("本期同期对标单元计算完成");
 						}
 					}