|
|
@@ -69,29 +69,28 @@ public class ReleaseUserTask {
|
|
|
for (User u : userList) {
|
|
|
if (StringUtils.isNotBlank(u.getId())) {
|
|
|
userTmpList = customerService.selectReleaseUserDays(u.getId());
|
|
|
- }
|
|
|
- for (userDaysBo ub : userTmpList) {
|
|
|
- String str=null;
|
|
|
- if (ub.getChannel() == 0) {
|
|
|
- str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时跟进或者限时签单!", "私有", ub.getName());
|
|
|
- }else {
|
|
|
- str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时跟进或者限时签单!", "渠道", ub.getName());
|
|
|
+ for (userDaysBo ub : userTmpList) {
|
|
|
+ String str=null;
|
|
|
+ if (ub.getChannel() == 0) {
|
|
|
+ str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时跟进或者限时签单!", "私有", ub.getName());
|
|
|
+ }else {
|
|
|
+ str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时跟进或者限时签单!", "渠道", ub.getName());
|
|
|
+ }
|
|
|
+ ln.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, ub.getAid(),
|
|
|
+ NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode(), str,ub.getUid()));
|
|
|
}
|
|
|
- ln.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, ub.getAid(),
|
|
|
- NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode(), str,ub.getUid()));
|
|
|
}
|
|
|
}
|
|
|
- //查询15天未跟进
|
|
|
+ //查询15天未跟进,私有跟释放前15天重复,去除
|
|
|
List<userDaysBo> userChannelList = new ArrayList<userDaysBo>();
|
|
|
for (User u : userList) {
|
|
|
if (StringUtils.isNotBlank(u.getId())) {
|
|
|
+
|
|
|
userChannelList = customerService.selectChannelNotFollow(u.getId());
|
|
|
}
|
|
|
for (userDaysBo ub : userChannelList) {
|
|
|
String str=null;
|
|
|
- if (ub.getChannel() == 0) {
|
|
|
- str = String.format("您的%s客户【%s】已经十五天未跟进,请及时跟进或者限时签单!", "私有", ub.getName());
|
|
|
- }else {
|
|
|
+ if (ub.getChannel() == 1) {
|
|
|
str = String.format("您的%s客户【%s】已经十五天未跟进,请及时跟进或者限时签单!", "渠道", ub.getName());
|
|
|
}
|
|
|
ln.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, ub.getAid(),
|