소스 검색

会员进度导出修改

anderx 1 년 전
부모
커밋
6dc9ccb19c
1개의 변경된 파일4개의 추가작업 그리고 7개의 파일을 삭제
  1. 4 7
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java

+ 4 - 7
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -310,8 +310,8 @@ public class ReleaseUserTask {
 			//处理私有客户
 			pushPrivateUser(lockUserList);
 			//处理每个人重复的天数
-			pushSalesmanPrivateCount(lockUserList);
-			pushSalesmanSignCount(lockSignList);
+			pushSalesmanCount(lockUserList,lockSignList);
+
 			pushChannel(releaseTime, userList);
 			//客户释放
 			List<LockingReleaseBo> lockList = customerService.selectPendinglockUserList();
@@ -330,10 +330,9 @@ public class ReleaseUserTask {
 		LoggerUtils.debug(getClass(), "==============客户释放完成============");
 	}
 
-	private void pushSalesmanSignCount(List<LockingReleaseBo> lockUserList) {
-	}
 
-	private void pushSalesmanPrivateCount(List<LockingReleaseBo> list) {
+	private void pushSalesmanCount(List<LockingReleaseBo> list, List<LockingReleaseBo> list2) {
+		list.addAll(list2);
 		for (LockingReleaseBo e : list) {
 			String sartTime= e.getLockTime();
 			String endTime=e.getLockTime()+" 23:59:59";
@@ -372,9 +371,7 @@ public class ReleaseUserTask {
 	}
 
 
-	private void pushSalesmanCount(List<LockingReleaseBo> aidList) {
 
-	}
 
 	/**
 	 * 处理外联