Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -77,7 +77,6 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
             log.warn("cpcIndexCalculate customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
             throw new RenException("客户【党员相关】指标权重信息不存在");
         }
-        Map<String, CpcScoreEntity> cpcScoreTotalMap = new HashMap<>();
         Map<String, IndexGroupDetailEntity> indexWeightMap = parentIndexDetails.stream().collect(Collectors.toMap(IndexGroupDetailEntity::getIndexCode, o -> o));
         int pageNo = NumConstant.ONE;
         int pageSize = IndexCalConstant.PAGE_SIZE;
@@ -89,6 +88,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
         //当前第一条记录
         //CpcScoreEntity currentFirstCpcScore = null;
         do {
+            Map<String, CpcScoreEntity> cpcScoreTotalMap = new HashMap<>();
             //获取数据
             list = cpcScoreDao.getPartScore(formDTO.getCustomerId(), formDTO.getMonthId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode(), (pageNo - NumConstant.ONE) * pageSize, pageSize);
             pageNo++;