事件列表

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

@@ -6,7 +6,9 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
-
+/**
+ * 数据分析-个人档案-上报事件列表入参
+ */
 @Data
 public class PageUserReportEventFormDTO implements Serializable {
     public interface AddUserInternalGroup {

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java

@@ -1,9 +1,35 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
+/**
+ * 数据分析-个人档案-上报事件列表入参
+ */
 @Data
 public class PageUserReportEventResDTO implements Serializable {
+    private String resiEventId;
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 事件上报事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date reportTime;
+
+    /**
+     * true 已转项目；false:未转项目
+     */
+    private Boolean shiftProject;
+
+    /**
+     * 项目id
+     */
+    private String projectId;
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java

@@ -217,7 +217,7 @@ public class ResiEventController {
 
     /**
      * 数据分析-个人档案-上报事件列表
-     *
+     * 根据epmetUserIdList查询
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>>
      * @author yinzuomei

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java

@@ -18,10 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.EventDetailResultDTO;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
-import com.epmet.dto.result.EventListResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.MyReportedResultDTO;
-import com.epmet.dto.result.NewEventsResultDTO;
 import com.epmet.entity.ResiEventEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -88,4 +86,13 @@ public interface ResiEventDao extends BaseDao<ResiEventEntity> {
      * @date 2021/8/5 10:42 上午
      */
     List<NewEventsResultDTO> newEvents(@Param("orgIds")List<String> orgIds);
+
+    /**
+     * 数据分析-个人档案-上报事件列表
+     * 根据epmetUserIdList查询
+     *
+     * @param formDTO
+     * @return
+     */
+    List<PageUserReportEventResDTO> selectUserReported(PageUserReportEventFormDTO formDTO);
 }

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

@@ -131,5 +131,12 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      */
     ResiEventManageRedDotRes queryResiEventManageRedDot(String agencyId);
 
+    /**
+     * 数据分析-个人档案-上报事件列表
+     * 根据epmetUserIdList查询
+     *
+     * @param formDTO
+     * @return
+     */
     PageData<PageUserReportEventResDTO> pageUserReported(PageUserReportEventFormDTO formDTO);
 }

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

@@ -640,10 +640,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return res;
     }
 
+    /**
+     * 数据分析-个人档案-上报事件列表
+     * 根据epmetUserIdList查询
+     *
+     * @param formDTO
+     * @return
+     */
     @Override
     public PageData<PageUserReportEventResDTO> pageUserReported(PageUserReportEventFormDTO formDTO) {
-        //todo
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
-        return null;
+            return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
+        }
+        PageInfo<PageUserReportEventResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO));
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }
 
 

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

@@ -201,4 +201,20 @@
         </foreach>)
         ORDER BY ro.CREATED_TIME DESC
     </select>
+
+    <select id="selectUserReported" parameterType="com.epmet.dto.form.PageUserReportEventFormDTO" resultType="com.epmet.dto.result.PageUserReportEventResDTO">
+        SELECT
+            re.id AS resiEventId,
+            re.EVENT_CONTENT AS eventContent,
+            re.SHIFT_PROJECT AS shiftProject,
+            IFNULL(re.PROJECT_ID,'') AS projectId,
+            re.CREATED_TIME AS  reportTime
+        FROM
+            resi_event re
+        WHERE
+            re.DEL_FLAG = '0'
+        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+            re.REPORT_USER_ID = #{epmetUserId}
+        </foreach>
+    </select>
 </mapper>