Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -204,6 +204,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         if (NumConstant.SIX != monthId.length()){
             throw new RuntimeException("入参monthId格式不正确：monthId =" + monthId);
         }
+        allParentIds.cleanUp();
         // 根据网格类型，删除 指数-指数数据(每月数值)表中 匹配的数据
         this.batchDelIndexDataMonthly(customerId, monthId, OrgTypeConstant.GRID);
         // 开始处理 网格相关分值表