Commit 7bf459d9 by zhangkb

测试报表3数据生成

parent 22b8d12a
...@@ -130,10 +130,13 @@ public class BeforeCompareUnitCalActor extends AbstractActor{ ...@@ -130,10 +130,13 @@ public class BeforeCompareUnitCalActor extends AbstractActor{
indicatorsReportService.deleteReportThreeDataByParam(currentDate, indicatorsReportService.deleteReportThreeDataByParam(currentDate,
new ArrayList<String>(compareObjMap.keySet()),code); new ArrayList<String>(compareObjMap.keySet()),code);
for(CompareUnitDef unitDef : currentCompareUnitDef) { for(CompareUnitDef unitDef : currentCompareUnitDef) {
indicatorsReportService.dealDriveIndReportThreeData( int result = indicatorsReportService.dealDriveIndReportThreeData(
unitDef.getCompareId(), Arrays.asList(unitDef.getIndIds().split(",")), unitDef.getCompareId(), Arrays.asList(unitDef.getIndIds().split(",")),
unitDef.getDate(),code); unitDef.getDate(),code);
Thread.sleep(2000); if(result==1) {
logger.info("下一个对标单元报表3数据计算");
continue;
}
} }
} }
if("0".equals(isTest)) { if("0".equals(isTest)) {
......
...@@ -132,7 +132,7 @@ public class IndicatorsReportService { ...@@ -132,7 +132,7 @@ public class IndicatorsReportService {
reportThreeMapper.deleteByParam(paramMap); reportThreeMapper.deleteByParam(paramMap);
} }
public void dealDriveIndReportThreeData(String compareId,List<String> indIds, public int dealDriveIndReportThreeData(String compareId,List<String> indIds,
Integer date,String code) { Integer date,String code) {
List<IndicatorsReportThree> dataList = new ArrayList<>(); List<IndicatorsReportThree> dataList = new ArrayList<>();
String type = this.getCompareType(date); String type = this.getCompareType(date);
...@@ -251,6 +251,7 @@ public class IndicatorsReportService { ...@@ -251,6 +251,7 @@ public class IndicatorsReportService {
} }
this.batchSaveOrUpdateReportThree(dataList); this.batchSaveOrUpdateReportThree(dataList);
} }
return 1;
} }
//type:0 前三 1末三 //type:0 前三 1末三
......
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