测试报表一没数据

src/main/java/com/keymobile/indicators/service/hytobacco/IndScorecardService.java

@@ -276,6 +276,9 @@ public class IndScorecardService {
 								}
 								indImproveScoreValue = String.format("%.4f",new BigDecimal(improveScore));
 								result.put("improveScore",indImproveScoreValue);
+							}else{
+								//没有同期值
+								result.put("improveScore","No");//表示不纳入单位得分计算标识
 							}
 						}else {
 							result.put("improveScore","No");//表示不纳入单位得分计算标识

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

@@ -7,6 +7,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +31,7 @@ import com.keymobile.indicators.model.mapper.report.ReportTwoMapper;
 import com.keymobile.indicators.service.hytobacco.BaseIndDataService;
 import com.keymobile.indicators.utils.CalculateUtils;
 
+@Slf4j
 @Service
 public class IndicatorsReportService {
 	private Logger logger = LoggerFactory.getLogger(IndicatorsReportService.class);
@@ -547,6 +549,7 @@ public class IndicatorsReportService {
 	@Async
 	public String dealReportOne(String compareId,List<String> indIds,
 			List<String> compareObjs,Integer date,String code) {
+		int count=0;
 		for(String indId : indIds) {
 			Map<String,Object> paramMap = new HashMap<>();
 			paramMap.put("indId", indId);
@@ -602,8 +605,10 @@ public class IndicatorsReportService {
 					}
 				}
 			}
+			count += datas.size();
 			this.batchSaveOrUpdate(datas);//批量新增或修改
 		}
+		log.info("compareId={}：date={}报表一完成,生成{}条数据",compareId,date,count);
 		return "deal indicators report one success";
 	}
 	
@@ -1029,7 +1034,8 @@ public class IndicatorsReportService {
 			if(StringUtils.isNotBlank(sameCalData.getScore())) {
 				indReportData.setLastSameScore(new BigDecimal(sameCalData.getScore()));
 			}
-			if(StringUtils.isNotBlank(sameCalData.getImproveScore())) {
+			if(StringUtils.isNotBlank(sameCalData.getImproveScore())
+					&&!"No".equals(sameCalData.getImproveScore())) {
 				indReportData.setLastSameImprove(new BigDecimal(sameCalData.getImproveScore()));
 			}
 			//算同比