修改报表3数据生成

src/main/java/com/keymobile/indicators/api/report/IndicatorReportCtrl.java

@@ -54,7 +54,7 @@ public class IndicatorReportCtrl {
 	@ApiOperation(value = "整合考核指标报表数据3", notes = "整合考核指标报表数据3")
 	@PostMapping(value = "/dealDriveReportThree")
 	public String dealDriveReportThree(@RequestBody List<CompareUnitDef> compareUnitList,
-			@RequestParam String code) {
+			@RequestParam String code) throws Exception{
 		Map<String,String> compareObjMap = new HashMap<>();
 		Integer date = null;
 		for(CompareUnitDef unitDef : compareUnitList) {

src/main/java/com/keymobile/indicators/service/report/IndicatorsReportService.java

@@ -59,7 +59,7 @@ public class IndicatorsReportService {
 		return reportTwoData.getId();
 	}
 	
-	public synchronized void batchSaveOrUpdateReportThree(List<IndicatorsReportThree> reportThreeDatas) {
+	public void batchSaveOrUpdateReportThree(List<IndicatorsReportThree> reportThreeDatas) {
 		List<IndicatorsReportThree> addList = new ArrayList<>();
 		List<IndicatorsReportThree> updateList = new ArrayList<>();
 		for(IndicatorsReportThree reportThreeData : reportThreeDatas) {
@@ -133,7 +133,7 @@ public class IndicatorsReportService {
 	}
 	
 	public void dealDriveIndReportThreeData(String compareId,List<String> indIds,
-			Integer date,String code) {
+			Integer date,String code) throws Exception{
 		List<IndicatorsReportThree> dataList = new ArrayList<>();
 		String type = this.getCompareType(date);
 		for(String indId : indIds) {
@@ -153,6 +153,7 @@ public class IndicatorsReportService {
 					findByIndIdAndDateAndCompareIdAndSort(indId, date, compareId,code);
 			if(!calResults.isEmpty()) {
 				for(DriveIndCalResultDef calResult : calResults) {
+					//判断是否存在
 					IndicatorsReportThree indReportData = reportThreeMapper.getByParam(
 							calResult.getCompareObj(), date, type, code);
 					if(indReportData == null) {
@@ -231,7 +232,6 @@ public class IndicatorsReportService {
 			}
 			//算提升前三末三指标个数
 			if(!improveValue.isEmpty()) {
-				logger.info("进来提升前三末三程序");
 				Map<String,Integer> resultRank = new HashMap<>();
 				resultRank = CalculateUtils.rankValue(improveValue, indRule);
 				//提升前三
@@ -249,6 +249,7 @@ public class IndicatorsReportService {
 				dataList = this.fillImproveHeadAndAfterCount(resultRank, dataList, 1, code);
 				this.batchSaveOrUpdateReportThree(dataList);
 			}
+			Thread.sleep(2000);
 		}
 	}