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

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-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java

@@ -29,4 +29,6 @@ public class NewEventsResultDTO implements Serializable {
      * 事件图片
      */
     private List<String> eventImgs;
+
+    private String eventId;
 }

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
@@ -159,6 +160,7 @@
     <resultMap id="newEventsMap" type="com.epmet.dto.result.NewEventsResultDTO">
         <result property="eventContent" column="eventContent"/>
         <result property="eventTime" column="eventTime"/>
+        <result property="eventId" column="eventId"/>
         <collection property="eventImgs" ofType="java.lang.String">
             <result column="img"/>
         </collection>
@@ -167,7 +169,8 @@
         SELECT
         IFNULL(re.EVENT_CONTENT,'') AS eventContent,
         DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime,
-        IFNULL(ea.ATTACHMENT_URL,'') AS img
+        IFNULL(ea.ATTACHMENT_URL,'') AS img,
+        re.id as eventId
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
         LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND