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

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

@@ -419,7 +419,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 throw new RuntimeException("在screen_customer_agency表中未查询到该客户下的组织名称：customerId =" + customerId + ", agencyId = " + communityScore.getKey());
             }
             // 补充表中其他字段
-            monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.GRID, communityScore.getKey(),
+            monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.AGENCY, communityScore.getKey(),
                     parentAgencyId, agencyName, monthlyFormDTO);
             // 补充表中其他字段
             monthlyFormDTOList.add(monthlyFormDTO);
@@ -508,7 +508,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 throw new RuntimeException("在screen_customer_dept表中未查询到该客户下的父级信息：customerId =" + customerId + ", deptId = " + deptScore.getKey());
             }
             // 补充表中其他字段
-            monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.GRID, deptScore.getKey(),
+            monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.DEPARTMENT, deptScore.getKey(),
                     parentAgencyId, deptName, monthlyFormDTO);
             monthlyFormDTOList.add(monthlyFormDTO);
         }
@@ -597,7 +597,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 throw new RuntimeException("在screen_customer_agency表中未查询到该客户下的组织名称：customerId =" + customerId + ", agencyId = " + agencyScore.getKey());
             }
             // 补充表中其他字段
-            monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.GRID, agencyScore.getKey(),
+            monthlyFormDTO = this.supplementIndexDataMonthlyTable(monthId, OrgTypeConstant.AGENCY, agencyScore.getKey(),
                     parentAgencyId, agencyName, monthlyFormDTO);
             monthlyFormDTOList.add(monthlyFormDTO);
         }