过滤重复记录

resources/mapper/modules/call/CallDao.xml

@@ -179,7 +179,8 @@
 	          WHERE r.end_status !='INIT'
 	          and r.create_name = #{createName}
 	          and p.username = #{username}
-	          and r.start_time = #{endTime}
+	          and r.start_time <= #{endTime}
+	          ORDER BY r.start_time DESC
     </select>
     
     <!-- 通过通话的电话号查询用户信息 -->

src/com/ejweb/modules/call/service/CallService.java

 package com.ejweb.modules.call.service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sound.midi.VoiceStatus;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ejweb.core.base.BaseService;
 import com.ejweb.core.base.PageEntity;
 import com.ejweb.core.util.IdWorker;
@@ -22,17 +8,18 @@ import com.ejweb.modules.call.bean.CallFindPhoneInfoBean;
 import com.ejweb.modules.call.bean.CallPhoneBean;
 import com.ejweb.modules.call.bean.CallRecordListBean;
 import com.ejweb.modules.call.dao.CallDao;
-import com.ejweb.modules.call.entity.CallPhoneAreaEntity;
-import com.ejweb.modules.call.entity.CallPhoneInfoListEntity;
-import com.ejweb.modules.call.entity.CallRecordEntity;
-import com.ejweb.modules.call.entity.CallRecordListEntity;
-import com.ejweb.modules.call.entity.CallSoundRecordBean;
-import com.ejweb.modules.call.entity.HuaweiNumListEntity;
-import com.ejweb.modules.call.entity.MemberEntity;
+import com.ejweb.modules.call.entity.*;
 import com.ejweb.modules.call.util.PhoneAreaEntity;
 import com.ejweb.modules.call.util.PhoneAreaUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
 
 @Service
 @Transactional(readOnly = true)
@@ -84,14 +71,18 @@ public class CallService extends BaseService<CallDao> {
         //过滤重复记录
         List<CallRecordListEntity> templist = new ArrayList<CallRecordListEntity>();
         for (CallRecordListEntity callRecordListEntity : list) {
-        	List<CallRecordListEntity> entity = dao.get(callRecordListEntity);
-			if(entity.size()>0){
-				templist.add(callRecordListEntity);
-			}
+            if ("FAILD".equals(callRecordListEntity.getEndStatus())) {
+                List<CallRecordListEntity> entity = dao.get(callRecordListEntity);
+                if(entity.size()>0 && "SUCCESS".equals(entity.get(0).getEndStatus())){
+                    templist.add(callRecordListEntity);
+                }
+            }
 		}
         if(templist.size()>0){
         	list.removeAll(templist);
-		}
+            pageInfo.setSize(list.size());
+            pageInfo.setTotal(list.size());
+        }
         PageEntity<CallRecordListEntity> page = new PageEntity<CallRecordListEntity>();
         page.setPageNo(pageInfo.getPageNum());
         page.setPageSize(pageInfo.getPageSize());