|
|
|
|
@ -285,9 +285,7 @@ public class TimeChange {
|
|
|
|
|
List<JSmartDeclaration> bmsDeclarationRecords = bmsDeclarationRecordsService.allNoLimited();
|
|
|
|
|
//如果当前时间在该申报模板的结束时间前自定义的提前天数之前，就去掉
|
|
|
|
|
bmsDeclarationRecords.removeIf(x ->
|
|
|
|
|
!(LocalDateTime.now().isAfter(x.getEndTime().minusDays(qy.getDaysAdvance()))
|
|
|
|
|
&& LocalDateTime.now().isBefore(x.getEndTime())
|
|
|
|
|
) || !(LocalDate.now().equals(x.getEndTime().minusDays(qy.getDaysAdvance()).toLocalDate()))
|
|
|
|
|
!(LocalDate.now().equals(x.getEndTime().minusDays(qy.getDaysAdvance()).toLocalDate()))
|
|
|
|
|
);
|
|
|
|
|
bmsDeclarationRecords.forEach(y -> {
|
|
|
|
|
y.setSmartRemindersId(1L);
|
|
|
|
|
@ -295,11 +293,10 @@ public class TimeChange {
|
|
|
|
|
y.setAlertTime(y.getEndTime().minusDays(qy.getDaysAdvance()));
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
//可以优化
|
|
|
|
|
List<JProject> jp = jProjectService.lambdaQuery().isNotNull(JProject::getProjectEndTime).list();
|
|
|
|
|
jp.removeIf(x ->
|
|
|
|
|
!(LocalDateTime.now().isAfter(x.getProjectEndTime().minusDays(zw.getDaysAdvance()))
|
|
|
|
|
&& LocalDateTime.now().isBefore(x.getProjectEndTime())
|
|
|
|
|
) || !(LocalDate.now().equals(x.getProjectEndTime().minusDays(zw.getDaysAdvance()).toLocalDate()))
|
|
|
|
|
!(LocalDate.now().equals(x.getProjectEndTime().minusDays(zw.getDaysAdvance()).toLocalDate()))
|
|
|
|
|
);
|
|
|
|
|
jp.forEach(x -> {
|
|
|
|
|
SysUser user = new SysUser();
|
|
|
|
|
|
