事件列表bug修改

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java

@@ -141,7 +141,7 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * @param formDto
      * @return
      */
-    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
+    List<IssuePendingResponseResultDTO> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
 
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -433,7 +433,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             list = SecurityUser.getUser().getDeptIdList();
         }
         formDto.setDeptIdList(list);
-        return baseDao.listIssuePendingResponse(formDto);
+        return new Result<List<IssuePendingResponseResultDTO>>().ok(baseDao.listIssuePendingResponse(formDto));
     }
 
     @Override

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -300,7 +300,7 @@
             #{id}
         </foreach>
         AND EVENT_STATE = #{state}
-        <if test="formDto.timestamp != null">
+        <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         order by CREATED_TIME