From 826544af13bb69ade491eef738a423f22a52e735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Mon, 9 Jun 2025 19:22:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=AF=B7=E5=81=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/ApprovalProcessController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java index 016626a..7f65c21 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java @@ -52,11 +52,11 @@ public class ApprovalProcessController extends BaseController { queryWrapper.orderByDesc("create_time"); if (approvalProcess.getTimeType() != null) { if (approvalProcess.getTimeType() == 1) { - queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000); + queryWrapper.le("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000); } else if (approvalProcess.getTimeType() == 2) { - queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000); + queryWrapper.le("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000); } else if (approvalProcess.getTimeType() == 3) { - queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000); + queryWrapper.le("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000); } } From 34b457f2e72fc45cebb11b436ed2a74dbdb7a456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Mon, 9 Jun 2025 19:30:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=AF=B7=E5=81=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/ApprovalProcessController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java index 7f65c21..49d87a2 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java @@ -60,7 +60,7 @@ public class ApprovalProcessController extends BaseController { } } - if (approvalProcess.getSubmitterId() != null){ + if (approvalProcess.getSubmitterId() != null) { queryWrapper.eq("submitter_id", getLoginUser().getUserId()); } List list = approvalsProcessService.list(queryWrapper); @@ -216,9 +216,9 @@ public class ApprovalProcessController extends BaseController { .one(); one.setDestinationIdCn(byId.getBusinessTripDestination()); String togUserIds = one.getTogUserIds(); - if (togUserIds != null && !"".equals(togUserIds)){ + if (togUserIds != null && !"".equals(togUserIds)) { List userList = new ArrayList<>(); - if (togUserIds.contains(",")){ + if (togUserIds.contains(",")) { String[] split = togUserIds.split(","); for (String s : split) { s = s.trim(); // 移除首尾空格 @@ -228,7 +228,7 @@ public class ApprovalProcessController extends BaseController { } } one.setTogUserList(userList); - }else { + } else { SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds)); userList.add(user); one.setTogUserList(userList);