diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java index 94853b80d1..23ecd11982 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java @@ -18,7 +18,7 @@ public class EventListResultDTO implements Serializable { /** * 报事标题 */ - private String eventTitle; + private String eventContent; /** * 报事时间 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java index c1312cb0d9..1f5bc47f00 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 居民报事表 @@ -29,5 +33,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventDao extends BaseDao { + + /** + * @Description 查询报事列表 + * @Param orgId + * @Param eventType + * @author zxc + * @date 2021/8/3 4:21 下午 + */ + List eventUnDisposedList(@Param("orgId")String orgId,@Param("eventType")String eventType); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 52a188fdde..4c1a68f950 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -85,15 +85,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl eventList(EventListFormDTO formDTO) { - // 处理中 - if (formDTO.getEventType().equals(EventConstant.EVENT_PROCESSED)){ - - // 待处理 - }else if (formDTO.getEventType().equals(EventConstant.EVENT_UN_DISPOSED)){ - - // 已办结 - }else if (formDTO.getEventType().equals(EventConstant.EVENT_TRANSFERRED)){ - + List result = baseDao.eventUnDisposedList(formDTO.getOrgId(), formDTO.getEventType()); + if (!CollectionUtils.isEmpty(result)){ + return result; } return new ArrayList<>(); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 21c7a902d7..f971e92473 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -3,6 +3,43 @@ - - + + + + + + + + + + + + \ No newline at end of file