From 4fd3c74d812fcf7a34a2d1a696006164f7f902e1 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 4 Jul 2024 09:28:46 +0800 Subject: [PATCH] bugfix --- .../com/ruoyi/jjh/declaration/regular/TimeChange.java | 9 +++------ ruoyi-admin/src/main/resources/application-druid.yml | 4 ++-- .../resources/mapper/jjh/ent/JSmartDeclarationMapper.xml | 2 ++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java index a65b884..de18aee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java @@ -285,9 +285,7 @@ public class TimeChange { List 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 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(); diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index f8dcc7f..a48158d 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -86,6 +86,6 @@ server: min-spare: 100 #企业端单点登陆url -url: http://114.216.202.175:8008/api/usercenter/User/ssoLogin +url: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogin #企业端用户信息url -infoUrl: http://114.216.202.175:8008/api/usercenter/User/getInfo \ No newline at end of file +infoUrl: https://qytt.sipac.gov.cn/api/usercenter/User/getInfo \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml index 5a2ab69..a13b65e 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml @@ -6,6 +6,7 @@ SELECT a.id as id, + a.smart_reminders_id as smartRemindersId, b.project_name as declarationName, a.is_read as isRead, a.tyshxydm as tyshxydm,