根据时间范围筛选

ch-dao/src/main/java/com/wwdz/ch/db/impl/ImRecordDaoImpl.java

@@ -34,17 +34,24 @@ public class ImRecordDaoImpl implements ImRecordDao {
         ImRecordExample.Criteria criteria = imRecordExample.createCriteria();
         criteria.andFromAccountEqualTo(dto.getFromAccount())
                 .andToAccountEqualTo(dto.getToAccount());
+        if (StringUtils.hasLength(dto.getStartTime())) {
+            criteria.andMsgTimeGreaterThanOrEqualTo(DateUtils.parseString(dto.getStartTime()));
+        }
+        if (StringUtils.hasLength(dto.getEndTime())) {
+            criteria.andMsgTimeLessThanOrEqualTo(DateUtils.parseString(dto.getEndTime()));
+        }
 
-        imRecordExample.or(imRecordExample.createCriteria()
+        ImRecordExample.Criteria orCriteria = imRecordExample.createCriteria();
+        imRecordExample.or(orCriteria
                 .andFromAccountEqualTo(dto.getToAccount())
                 .andToAccountEqualTo(dto.getFromAccount()));
         if (StringUtils.hasLength(dto.getStartTime())) {
-            imRecordExample.createCriteria().andMsgTimeGreaterThanOrEqualTo(DateUtils.parseString(dto.getStartTime()));
+            orCriteria.andMsgTimeGreaterThanOrEqualTo(DateUtils.parseString(dto.getStartTime()));
         }
         if (StringUtils.hasLength(dto.getEndTime())) {
-            imRecordExample.createCriteria().andMsgTimeLessThanOrEqualTo(DateUtils.parseString(dto.getEndTime()));
+            orCriteria.andMsgTimeLessThanOrEqualTo(DateUtils.parseString(dto.getEndTime()));
         }
-        imRecordExample.orderBy("msg_time asc");
+        imRecordExample.orderBy("msg_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return imRecordMapper.selectByExampleWithBLOBs(imRecordExample);
     }