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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankExtractServiceImpl.java

@@ -167,7 +167,7 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 		//项目数
 		List<OrgStatisticsResultDTO> projectList = factOriginProjectMainDailyService.getOrgProjectCount(customerId, monthId, OrgTypeConstant.COMMUNITY);
 		if (CollectionUtils.isNotEmpty(projectList)) {
-			list.forEach(entity -> projectList.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto ->
+			list.forEach(entity -> projectList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto ->
 				entity.setProjectTotal(dto.getCount())
 			));
 		}
@@ -234,7 +234,7 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 		//项目数
 		List<OrgStatisticsResultDTO> projectList = factOriginProjectMainDailyService.getOrgProjectCount(customerId, monthId, OrgTypeConstant.STREET);
 		if (CollectionUtils.isNotEmpty(projectList)) {
-			list.forEach(entity -> projectList.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto ->
+			list.forEach(entity -> projectList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto ->
 				entity.setProjectTotal(dto.getCount())
 			));
 		}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -234,7 +234,7 @@
             ip.created_time as createTime,
             (case when i.RESOLVE_TYPE = 'resolved' then 'closed_resolved'
               when i.RESOLVE_TYPE = 'unresolved' then 'closed_unresolved'
-              else i.ISSUE_STATUS end ) AS actionCode
+              else ip.ISSUE_STATUS end ) AS actionCode
         FROM
             issue_process ip
             LEFT JOIN issue i ON i.id = ip.issue_id