diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index a5d3d0f3b3..46d3acb93d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -658,8 +658,9 @@ public class IcEventController { public Result> getEventListByTypeOrStatus(@RequestParam("orgId") String orgId, @RequestParam("orgType") String orgType, @RequestParam("sourceType") String sourceType, - @RequestParam("status") String status) { - return new Result>().ok(icEventService.getListByStatus(orgId, orgType, sourceType, status)); + @RequestParam("status") String status, + @RequestParam("categoryCode") String categoryCode) { + return new Result>().ok(icEventService.getListByStatus(orgId, orgType, sourceType, status,categoryCode)); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index 40e6b3c65a..a1eb5c4f10 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -211,9 +211,11 @@ public interface IcEventDao extends BaseDao { @Param("sourceType") String sourceType, @Param("manageType") String manageType); - List getListByStatus(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, @Param("status") String status); + List getListByStatus(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, + @Param("status") String status, @Param("categoryCode") String categoryCode); - List getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, @Param("eventType") String eventType); + List getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath, + @Param("sourceType") String sourceType, @Param("eventType") String eventType); List getEventRateByGridIds(@Param("orgIds") List orgIds); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index 5b484e85d1..d212984b1c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -282,7 +282,7 @@ public interface IcEventService extends BaseService { * @param status 事件处理状态 * @return */ - List getListByStatus(String orgId, String orgType, String sourceType, String status); + List getListByStatus(String orgId, String orgType, String sourceType, String status,String categoryCode); List getListBySourceTypeOrEventType(String orgId, String orgType, String sourceType, String eventType); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index ea9d011ae0..64bd171199 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -2019,7 +2019,7 @@ public class IcEventServiceImpl extends BaseServiceImpl ids = orgs.stream().map(IcEventAnalysisOrgResDTO::getOrgId).collect(Collectors.toList()); List resultList = baseDao.getEventRateByGridIds(ids); - if(null != resultList && resultList.size()> 0){ + if (null != resultList && resultList.size() > 0) { for (GridOrVillageEventRateResultDTO dto : resultList) { if (null != dto) { dto.setAgencyName(namesMap.get(dto.getOrgId())); @@ -2032,8 +2032,8 @@ public class IcEventServiceImpl extends BaseServiceImpl{ + } else { + namesMap.keySet().forEach(key -> { GridOrVillageEventRateResultDTO dto = new GridOrVillageEventRateResultDTO(); dto.setOrgId(key); dto.setAgencyName(namesMap.get(key)); @@ -2049,8 +2049,8 @@ public class IcEventServiceImpl extends BaseServiceImpl getListByStatus(String orgId, String orgType, String sourceType, String status) { - return baseDao.getListByStatus(getOrgPath(orgId, orgType), sourceType, status); + public List getListByStatus(String orgId, String orgType, String sourceType, String status, String categoryCode) { + return baseDao.getListByStatus(getOrgPath(orgId, orgType), sourceType, status, categoryCode); } @Override diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index ab3f0b13df..59bcd8c1b1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -646,6 +646,9 @@ AND r.MANAGE_STATUS = #{status} + + AND c.CATEGORY_CODE = #{categoryCode} + GROUP BY e.ID,c.ic_event_id,r.ic_event_id ORDER BY r.MANAGE_TIME DESC,e.CREATED_TIME DESC