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

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

@@ -376,6 +376,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      */
     @Override
     public List<MyReportedResultDTO> queryMyReported(MyReportedFormDTO formDTO) {
+        // 未处理： 发了没有人看过的时间
+        // 处理中: 有人看，正在处理中的
+        // 已办结：有人看，已经办结了的
         PageInfo<MyReportedResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(),
                     formDTO.getStatusCondition()));

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

@@ -83,6 +83,7 @@
                 and re.READ_FLAG='0'
             </if>
             <if test='statusCondition != "un_read" '>
+                and re.READ_FLAG='1'
                 and re.`STATUS`=#{statusCondition}
             </if>
             order by re.LATEST_OPERATED_TIME desc