Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev

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

@@ -348,7 +348,8 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 }
             }
             if ("".equals(parentAgencyId)){
-                throw new RuntimeException("在screen_customer_grid表中未查询到该客户下的网格信息：customerId =" + customerId + ", gridId = " + gridScore.getKey());
+                log.error("在screen_customer_grid表中未查询到该客户下的网格信息：customerId =" + customerId + ", gridId = " + gridScore.getKey());
+                continue;
             }
             // 补充表中其他字段
             monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.GRID, gridScore.getKey(),
@@ -480,8 +481,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                     agencyName = agencyScoreDTO.getAgencyName();
                 }
             }
-            if ("".equals(agencyName)){
-                throw new RuntimeException("在screen_customer_agency表中未查询到该客户下的组织名称：customerId =" + customerId + ", agencyId = " + communityScore.getKey());
+            if ("".equals(agencyName)) {
+                log.error("在screen_customer_agency表中未查询到该客户下的组织名称：customerId =" + customerId + ", agencyId = " + communityScore.getKey());
+                continue;
             }
             // 补充表中其他字段
             monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.AGENCY, communityScore.getKey(),