From c770cacd0acc28e83bda90fc31d1c10b0c50d692 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 21:42:38 +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 --- .../controller/ApprovalProcessController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 a01c1c8..f691640 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,16 +62,16 @@ public class ApprovalProcessController extends BaseController { for (ApprovalProcess process : list) { - if (process.getMatterType() == 2){ + if (process.getMatterType() == 2) { gwglLog one = gwglLogService.lambdaQuery() .eq(gwglLog::getUuid, process.getUuid()) .orderByDesc(gwglLog::getCreateTime) .last("LIMIT 1") .one(); - if (one != null){ + if (one != null) { if (one.getCheckState() == 0) { process.setApprovalStatus(0); - }else { + } else { process.setApprovalStatus(1); } } @@ -125,9 +125,9 @@ public class ApprovalProcessController extends BaseController { } public static void main(String[] args) { - Long createTime = 1749279303395L; + Long createTime = System.currentTimeMillis(); Instant instant = Instant.ofEpochMilli(createTime); - + Long time = createTime - 24 * 60 * 60 * 1000 * 3; // 2. 转换为本地时区（如北京时间 UTC+8） LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, ZoneId.of("Asia/Shanghai")); @@ -136,7 +136,7 @@ public class ApprovalProcessController extends BaseController { // 4. 格式化为字符串 String formattedTime = localDateTime.format(formatter); - System.out.println(formattedTime); + System.out.println(time); } @ApiOperation("根据编号查") @@ -231,7 +231,7 @@ public class ApprovalProcessController extends BaseController { String[] split = togUserIds.split(","); for (String s : split) { s = s.trim(); - System.out.println("拆分的字："+s);// 移除首尾空格 + System.out.println("拆分的字：" + s);// 移除首尾空格 if (!s.isEmpty()) { SysUser user = sysUserService.selectUserById(Long.parseLong(s)); userList.add(user); From 41cb9852ca7f6225d2ecc283e90532aa4584c4ce 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 21:51:54 +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 --- .../PoliceLeaveApprovalController.java | 95 +++++++++++++------ 1 file changed, 66 insertions(+), 29 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 b9990eb..44bc08b 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 @@ -146,6 +146,7 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog gwglLog = new gwglLog(); gwglLog.setApplyNo(s); gwglLog.setResult(1); + gwglLog.setCheckState(0); gwglLog.setDeptId(user.getDeptId()); gwglLog.setDeptName(user.getDept().getDeptName()); gwglLog.setUserId(user.getUserId()); @@ -219,21 +220,53 @@ public class PoliceLeaveApprovalController extends BaseController { if (state == 2) { policeLeaveApproval.setState(2); } +// gwglLog gwglLog = new gwglLog(); +// gwglLog.setApplyNo(policeLeaveApproval.getApplyNo()); +// gwglLog.setDeptId(policeLeaveApproval.getDeptId()); +// gwglLog.setDeptName(policeLeaveApproval.getDeptName()); +// gwglLog.setUserId(policeLeaveApproval.getUserId()); +// gwglLog.setUserName(policeLeaveApproval.getName()); +// gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); +// gwglLog.setReason(policeLeaveApproval.getReason()); +// gwglLog.setResult(state); +// gwglLog.setType(1); +// gwglLog.setReason(policeLeaveApproval.getReason()); +// gwglLog.setChecker(user.getNickName()); +// gwglLog.setCheckTime(System.currentTimeMillis()); +// gwglLog.setCheckState(state); +// boolean result1 = gwglLogService.save(gwglLog); + gwglLog one = gwglLogService.lambdaQuery() + .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo()) + .orderByDesc(gwglLog::getCreateTime) + .last("LIMIT 1") + .one(); + one.setApplyNo(policeLeaveApproval.getApplyNo()); + one.setDeptId(policeLeaveApproval.getDeptId()); + one.setDeptName(policeLeaveApproval.getDeptName()); + one.setUserId(policeLeaveApproval.getUserId()); + one.setUserName(policeLeaveApproval.getName()); + one.setCreateTime(policeLeaveApproval.getCreateTime()); + one.setReason(policeLeaveApproval.getReason()); + one.setResult(state); + one.setType(1); + one.setReason(policeLeaveApproval.getReason()); + one.setChecker(user.getNickName()); + one.setCheckTime(System.currentTimeMillis()); + one.setCheckState(state); + boolean result = gwglLogService.updateById(one); + + gwglLog gwglLog = new gwglLog(); gwglLog.setApplyNo(policeLeaveApproval.getApplyNo()); - gwglLog.setDeptId(policeLeaveApproval.getDeptId()); - gwglLog.setDeptName(policeLeaveApproval.getDeptName()); - gwglLog.setUserId(policeLeaveApproval.getUserId()); - gwglLog.setUserName(policeLeaveApproval.getName()); - gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); - gwglLog.setReason(policeLeaveApproval.getReason()); - gwglLog.setResult(state); - gwglLog.setType(1); - gwglLog.setReason(policeLeaveApproval.getReason()); - gwglLog.setChecker(user.getNickName()); - gwglLog.setCheckTime(System.currentTimeMillis()); - gwglLog.setCheckState(state); - boolean result1 = gwglLogService.save(gwglLog); + gwglLog.setResult(1); + gwglLog.setDeptId(user.getDeptId()); + gwglLog.setDeptName(user.getDept().getDeptName()); + gwglLog.setUserId(user.getUserId()); + gwglLog.setChecker(user.getDept().getLeader()); + gwglLog.setUserName(user.getNickName()); + gwglLog.setCheckState(0); + gwglLog.setCreateTime(new Date().getTime()); + gwglLogService.save(gwglLog); } else if ("096484".equals(user.getUserName())) { //政治处侍昌鑫 policeLeaveApproval.setZzcState(state); @@ -251,7 +284,7 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setResult(state); gwglLog.setType(policeLeaveApproval.getLeaveType()); gwglLog.setReason(policeLeaveApproval.getReason()); - gwglLog.setChecker(user.getNickName()); + gwglLog.setChecker("刘成志和陈列"); gwglLog.setCheckTime(System.currentTimeMillis()); gwglLog.setCheckState(state); boolean result1 = gwglLogService.save(gwglLog); @@ -283,21 +316,25 @@ public class PoliceLeaveApprovalController extends BaseController { policeLeaveApproval.setState(2); } policeLeaveApproval.setLeaderState(state); - gwglLog gwglLog = new gwglLog(); - gwglLog.setApplyNo(policeLeaveApproval.getApplyNo()); - gwglLog.setDeptId(policeLeaveApproval.getDeptId()); - gwglLog.setDeptName(policeLeaveApproval.getDeptName()); - gwglLog.setUserId(policeLeaveApproval.getUserId()); - gwglLog.setUserName(policeLeaveApproval.getName()); - gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); - gwglLog.setReason(policeLeaveApproval.getReason()); - gwglLog.setResult(state); - gwglLog.setType(policeLeaveApproval.getLeaveType()); - gwglLog.setReason(policeLeaveApproval.getReason()); - gwglLog.setChecker(user.getNickName()); - gwglLog.setCheckTime(System.currentTimeMillis()); - gwglLog.setCheckState(state); - boolean result1 = gwglLogService.save(gwglLog); + gwglLog one = gwglLogService.lambdaQuery() + .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo()) + .orderByDesc(gwglLog::getCreateTime) + .last("LIMIT 1") + .one(); + one.setApplyNo(policeLeaveApproval.getApplyNo()); + one.setDeptId(policeLeaveApproval.getDeptId()); + one.setDeptName(policeLeaveApproval.getDeptName()); + one.setUserId(policeLeaveApproval.getUserId()); + one.setUserName(policeLeaveApproval.getName()); + one.setCreateTime(policeLeaveApproval.getCreateTime()); + one.setReason(policeLeaveApproval.getReason()); + one.setResult(state); + one.setType(1); + one.setReason(policeLeaveApproval.getReason()); + one.setChecker(user.getNickName()); + one.setCheckTime(System.currentTimeMillis()); + one.setCheckState(state); + boolean result1 = gwglLogService.updateById(one); boolean result = approvalsProcessService.lambdaUpdate() .eq(ApprovalProcess::getUuid, policeLeaveApproval.getUuid()) .set(ApprovalProcess::getApprovalStatus, state)