Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -233,7 +233,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
             return new ArrayList<>();
         }
         for (CategoryTopAppealResultDTO r : result) {
-            CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(r.getCategoryId(), r.getCategoryOriginCustomerId());
+            CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(r.getCategoryId(), customerId);
             if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) {
                 log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", r.getCategoryId(), r.getCategoryOriginCustomerId()));
                 continue;

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -488,7 +488,7 @@
     </select>
     <select id="selectGridClosed" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            a.GRID_ID,
+            a.GRID_ID AS "orgId",
             a.count AS "sum",
             IFNULL( b.count, 0 ) AS "count"
         FROM