Merge remote-tracking branch 'origin/dev_resi_event' into develop

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java

@@ -26,4 +26,7 @@ public class EventListFormDTO implements Serializable {
 
     @NotBlank(message = "",groups = EventListForm.class)
     private String orgId;
+
+    private Integer pageNo;
+    private Integer pageSize;
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -101,6 +101,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public List<EventListResultDTO> eventList(EventListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
         List<EventListResultDTO> result = baseDao.eventUnDisposedList(formDTO.getOrgId(), formDTO.getEventType());
         if (!CollectionUtils.isEmpty(result)){
             return result;

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -25,6 +25,7 @@
         FROM resi_event_report_org ro
         INNER JOIN resi_event re ON (ro.RESI_EVENT_ID = re.ID AND re.DEL_FLAG = '0')
         AND ro.DEL_FLAG = '0'
+        and ro.ORG_ID = #{orgId}
         <if test='eventType == "undisposed" '>
             AND ro.ORG_READ = 'un_read'
             ORDER BY re.CREATED_TIME