和代码

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;
 
     /**
      * 报事时间

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;
 
 /**
  * 居民报事表
@@ -30,4 +34,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ResiEventDao extends BaseDao<ResiEventEntity> {
 
+    /**
+     * @Description  查询报事列表
+     * @Param orgId
+     * @Param eventType
+     * @author zxc
+     * @date 2021/8/3 4:21 下午
+     */
+    List<EventListResultDTO> eventUnDisposedList(@Param("orgId")String orgId,@Param("eventType")String eventType);
+	
 }

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

@@ -82,15 +82,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public List<EventListResultDTO> 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<EventListResultDTO> result = baseDao.eventUnDisposedList(formDTO.getOrgId(), formDTO.getEventType());
+        if (!CollectionUtils.isEmpty(result)){
+            return result;
         }
         return new ArrayList<>();
     }

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

@@ -3,6 +3,43 @@
 
 <mapper namespace="com.epmet.dao.ResiEventDao">
 
-
-
+    <!-- 查询报事列表 -->
+    <resultMap id="eventUnDisposedListMap" type="com.epmet.dto.result.EventListResultDTO">
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventId" column="eventId"/>
+        <result property="eventTime" column="eventTime"/>
+        <result property="isProject" column="isProject"/>
+        <result property="redDot" column="redDot"/>
+        <collection property="eventImgs" ofType="java.lang.String">
+            <result column="img"/>
+        </collection>
+    </resultMap>
+    <select id="eventUnDisposedList" resultMap="eventUnDisposedListMap">
+        SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM
+        (SELECT
+        re.EVENT_CONTENT AS eventContent,
+        IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
+        re.ID AS eventId,
+        (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
+        (CASE WHEN ro.RED_DOT = 1 THEN TRUE ELSE FALSE END) AS redDot
+        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'
+        <if test='eventType == "undisposed" '>
+            AND ro.ORG_READ = 'un_read'
+            ORDER BY re.CREATED_TIME
+        </if>
+        <if test='eventType == "processed" '>
+            AND ro.ORG_READ = 'read'
+            AND re.`STATUS` = 'processing'
+            ORDER BY re.LATEST_OPERATED_TIME
+        </if>
+        <if test='eventType == "transferred" '>
+            AND ro.ORG_READ = 'read'
+            AND re.`STATUS` = 'closed_case'
+            ORDER BY re.CLOSE_CASE_TIME
+        </if>
+        )t
+        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
+    </select>
 </mapper>