From e60d556bbf4ad1cd4a78cf61a15dda9fe9db9a83 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 23:52:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=BD=93=E5=89=8D=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=87=BA=E7=8E=B0=E5=9C=A8=E6=9C=80=E9=A1=B6=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/ApprovalProcessController.java | 8 +++++--- 1 file changed, 5 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 af14d09..9021088 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 @@ -62,6 +62,8 @@ public class ApprovalProcessController extends BaseController { if (approvalProcess.getSubmitterId() != null) { queryWrapper.eq("submitter_id", getLoginUser().getUserId()); + } else { + queryWrapper.ne("submitter_id", getLoginUser().getUserId()); } List list = approvalsProcessService.list(queryWrapper); List newList = new ArrayList<>(); @@ -81,7 +83,7 @@ public class ApprovalProcessController extends BaseController { process.setApprovalStatus(1); } } - }else { + } else { continue; } } @@ -100,7 +102,7 @@ public class ApprovalProcessController extends BaseController { process.setApprovalStatus(1); } } - }else { + } else { continue; } } @@ -119,7 +121,7 @@ public class ApprovalProcessController extends BaseController { process.setApprovalStatus(1); } } - }else { + } else { continue; } } From 4e4aa7f95ac41787f31485c8b20f70eb3828597c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Tue, 10 Jun 2025 00:09:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=97=B6=E9=97=B4=E3=80=81reason?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NonWorkingDayDrinkingReportController.java | 3 ++- .../controller/PoliceLeaveApprovalController.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java index aa0004b..33ada47 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java @@ -228,8 +228,9 @@ public class NonWorkingDayDrinkingReportController extends BaseController { boolean result1 = gwglLogService.lambdaUpdate() .eq(gwglLog::getApplyNo, nonWorkingDayDrinkingReport.getApplyNo()) .set(gwglLog::getResult, 1) + .set(gwglLog::getReason, dto.getReason()) .set(gwglLog::getChecker, user.getNickName()) - .set(gwglLog::getCheckTime, System.currentTimeMillis()) + .set(gwglLog::getCheckTime, System.currentTimeMillis()/1000L) .set(gwglLog::getCheckState, state) .update(); diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java index 44bc08b..89dbb91 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java @@ -251,7 +251,7 @@ public class PoliceLeaveApprovalController extends BaseController { one.setType(1); one.setReason(policeLeaveApproval.getReason()); one.setChecker(user.getNickName()); - one.setCheckTime(System.currentTimeMillis()); + one.setCheckTime(System.currentTimeMillis()/1000L); one.setCheckState(state); boolean result = gwglLogService.updateById(one); @@ -285,7 +285,7 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setType(policeLeaveApproval.getLeaveType()); gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setChecker("刘成志和陈列"); - gwglLog.setCheckTime(System.currentTimeMillis()); + gwglLog.setCheckTime(System.currentTimeMillis()/1000L); gwglLog.setCheckState(state); boolean result1 = gwglLogService.save(gwglLog); } else if ("admin".equals(user.getUserName())) { @@ -306,7 +306,7 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setType(policeLeaveApproval.getLeaveType()); gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setChecker(user.getNickName()); - gwglLog.setCheckTime(System.currentTimeMillis()); + gwglLog.setCheckTime(System.currentTimeMillis()/1000L); gwglLog.setCheckState(state); boolean result1 = gwglLogService.save(gwglLog); @@ -332,7 +332,7 @@ public class PoliceLeaveApprovalController extends BaseController { one.setType(1); one.setReason(policeLeaveApproval.getReason()); one.setChecker(user.getNickName()); - one.setCheckTime(System.currentTimeMillis()); + one.setCheckTime(System.currentTimeMillis()/1000L); one.setCheckState(state); boolean result1 = gwglLogService.updateById(one); boolean result = approvalsProcessService.lambdaUpdate()