|
@@ -84,6 +84,8 @@ public class WorkerLogic {
|
|
|
.eq(WebsitUser::getUserId,currentCompanyWechat.getUserId())
|
|
|
.list();
|
|
|
|
|
|
+ Mailbox mailbox = mailboxService.getById("1");
|
|
|
+
|
|
|
List<WorkerRemind> workerReminds = new ArrayList<>();
|
|
|
|
|
|
for (WebsitUser websitUser : websitUsers) {
|
|
@@ -131,11 +133,11 @@ public class WorkerLogic {
|
|
|
workerReminds.add(workerRemind);
|
|
|
}
|
|
|
|
|
|
- // 购买的意外险,七天后过期 每天提醒一次
|
|
|
+ // 购买的意外险,按配置后过期 每天提醒一次
|
|
|
if ( workerPolicyService.lambdaQuery()
|
|
|
.eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
|
|
|
.in(WorkerPolicy::getStatus,"DSX","BZZ")
|
|
|
- .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),7))
|
|
|
+ .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),mailbox.getOverNum()))
|
|
|
.eq(WorkerPolicy::getPolicyType,"AC")
|
|
|
.and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
|
|
|
.count() > 0
|
|
@@ -161,7 +163,7 @@ public class WorkerLogic {
|
|
|
List<WorkerPolicy> list = workerPolicyService.lambdaQuery()
|
|
|
.eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
|
|
|
.in(WorkerPolicy::getStatus,"DSX","BZZ")
|
|
|
- .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),7))
|
|
|
+ .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),mailbox.getOverNum()))
|
|
|
.eq(WorkerPolicy::getPolicyType,"AC")
|
|
|
.and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
|
|
|
.list();
|
|
@@ -180,6 +182,7 @@ public class WorkerLogic {
|
|
|
workerRemind.setWebsitName(adminWebsit.getName());
|
|
|
workerRemind.setRemindIn(2);
|
|
|
workerRemind.setEndTime(workerPolicy.getEndTime());
|
|
|
+ workerRemind.setDay(mailbox.getOverNum());
|
|
|
workerReminds.add(workerRemind);
|
|
|
|
|
|
workerPolicy.setExTime(DateUtil.endOfDay(new Date())).updateById();
|