|
|
@@ -92,20 +92,17 @@ public class ReleaseUserTask {
|
|
|
List<User> users = userMapper.selectClueUserByClueType(admin.getId());
|
|
|
for (User u : users) {
|
|
|
String aid=null;
|
|
|
- LocalDateTime clueTime = null;
|
|
|
+ LocalDateTime clueTime=u.getClueTransferTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDateTime();
|
|
|
//已分配的通知人与时间不同,
|
|
|
if (u.getClueProcess()==1){
|
|
|
aid=u.getAid();
|
|
|
- clueTime=u.getClueTransferTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDateTime();
|
|
|
}else{
|
|
|
aid=admin.getId();
|
|
|
- clueTime=u.getClueTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDateTime();
|
|
|
}
|
|
|
LocalDateTime endTime = clueTime.plusDays(15);
|
|
|
long between= ChronoUnit.DAYS.between(now, endTime);
|
|
|
if (between<1){
|
|
|
releaseUserList.add(u);
|
|
|
-
|
|
|
logList.add(new UserTransferLog(u.getId(), "1",null, 27, "",date));
|
|
|
ln.add(new Notice(UUID.randomUUID().toString(),date, 0, aid,
|
|
|
NoticeStatus.CLUE_USER_RELEASE.getCode(),
|