From f587f946577322ab4ec50628563a3d5d371211bf 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:40:56 +0800 Subject: [PATCH] =?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/PoliceLeaveApprovalController.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) 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 e24c518..0013d07 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 @@ -261,14 +261,11 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setDeptName(policeLeaveApproval.getDeptName()); gwglLog.setUserId(policeLeaveApproval.getUserId()); gwglLog.setUserName(policeLeaveApproval.getName()); - gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); - gwglLog.setReason(policeLeaveApproval.getReason()); - gwglLog.setResult(state); + gwglLog.setCreateTime(System.currentTimeMillis()/1000L); + gwglLog.setResult(0); gwglLog.setType(policeLeaveApproval.getLeaveType()); - gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setChecker("刘成志和陈列"); - gwglLog.setCheckTime(System.currentTimeMillis()/1000L); - gwglLog.setCheckState(state); + gwglLog.setCheckState(0); boolean result1 = gwglLogService.save(gwglLog); } else if ("096484".equals(user.getUserName())) { //政治处侍昌鑫 @@ -282,14 +279,12 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setDeptName(policeLeaveApproval.getDeptName()); gwglLog.setUserId(policeLeaveApproval.getUserId()); gwglLog.setUserName(policeLeaveApproval.getName()); - gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); - gwglLog.setReason(policeLeaveApproval.getReason()); + gwglLog.setCreateTime(System.currentTimeMillis()/1000L); gwglLog.setResult(state); gwglLog.setType(policeLeaveApproval.getLeaveType()); - gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setChecker("刘成志和陈列"); gwglLog.setCheckTime(System.currentTimeMillis()/1000L); - gwglLog.setCheckState(state); + gwglLog.setCheckState(0); boolean result1 = gwglLogService.save(gwglLog); } else if ("admin".equals(user.getUserName())) { // 管理员看所有