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 534fcbf..1a86d78 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 @@ -252,7 +252,7 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setCreateTime(System.currentTimeMillis() / 1000L); gwglLog.setResult(0); gwglLog.setType(policeLeaveApproval.getLeaveType()); - gwglLog.setChecker("政治处"); + gwglLog.setChecker("侍昌鑫"); gwglLog.setCheckState(0); boolean result1 = gwglLogService.save(gwglLog); @@ -282,6 +282,7 @@ public class PoliceLeaveApprovalController extends BaseController { one.setCheckTime(System.currentTimeMillis() / 1000L); one.setCheckState(state); boolean result1 = gwglLogService.updateById(one); + policeLeaveApproval.setState(state); } else { gwglLog gwglLog = new gwglLog(); @@ -293,15 +294,29 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setCreateTime(System.currentTimeMillis() / 1000L); gwglLog.setResult(state); gwglLog.setType(policeLeaveApproval.getLeaveType()); - gwglLog.setChecker("刘成志和陈列"); + gwglLog.setChecker("刘成志"); gwglLog.setCheckTime(System.currentTimeMillis() / 1000L); gwglLog.setCheckState(0); boolean result1 = gwglLogService.save(gwglLog); + + gwglLog gwglLog1 = new gwglLog(); + gwglLog1.setApplyNo(policeLeaveApproval.getApplyNo()); + gwglLog1.setDeptId(policeLeaveApproval.getDeptId()); + gwglLog1.setDeptName(policeLeaveApproval.getDeptName()); + gwglLog1.setUserId(policeLeaveApproval.getUserId()); + gwglLog1.setUserName(policeLeaveApproval.getName()); + gwglLog1.setCreateTime(System.currentTimeMillis() / 1000L); + gwglLog1.setResult(state); + gwglLog1.setType(policeLeaveApproval.getLeaveType()); + gwglLog1.setChecker("陈列"); + gwglLog1.setCheckTime(System.currentTimeMillis() / 1000L); + gwglLog1.setCheckState(0); + boolean result2 = gwglLogService.save(gwglLog); boolean result = approvalsProcessService.lambdaUpdate() .eq(ApprovalProcess::getUuid, policeLeaveApproval.getUuid()) .set(ApprovalProcess::getApprovalStatus, state) - .set(ApprovalProcess::getCcName,leaderLeader1) - .set(ApprovalProcess::getReadStatus,0) + .set(ApprovalProcess::getCcName, leaderLeader1) + .set(ApprovalProcess::getReadStatus, 0) .update(); } } else if ("admin".equals(user.getUserName())) { @@ -332,7 +347,7 @@ public class PoliceLeaveApprovalController extends BaseController { policeLeaveApproval.setState(2); } policeLeaveApproval.setLeaderState(state); - gwglLog one = gwglLogService.lambdaQuery() + /*gwglLog one = gwglLogService.lambdaQuery() .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo()) .orderByDesc(gwglLog::getCreateTime) .last("LIMIT 1") @@ -349,13 +364,21 @@ public class PoliceLeaveApprovalController extends BaseController { one.setChecker(user.getNickName()); one.setCheckTime(System.currentTimeMillis() / 1000L); one.setCheckState(state); - boolean result1 = gwglLogService.updateById(one); + boolean result1 = gwglLogService.updateById(one);*/ + boolean result1 = gwglLogService.lambdaUpdate() + .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo()) + .eq(gwglLog::getChecker, user.getNickName()) + .set(gwglLog::getCheckState, state) + .set(gwglLog::getCheckTime, System.currentTimeMillis() / 1000L) + .set(gwglLog::getType, 1) + .update(); boolean result = approvalsProcessService.lambdaUpdate() .eq(ApprovalProcess::getUuid, policeLeaveApproval.getUuid()) .set(ApprovalProcess::getApprovalStatus, state) - .set(ApprovalProcess::getCcName,leaderLeader1) - .set(ApprovalProcess::getReadStatus,0) + .set(ApprovalProcess::getCcName, leaderLeader1) + .set(ApprovalProcess::getReadStatus, 0) .update(); + policeLeaveApproval.setState(state); if (!result && !result1) { return AjaxResult.success("审批请(休)假失败"); } @@ -363,7 +386,7 @@ public class PoliceLeaveApprovalController extends BaseController { boolean result = policeLeaveApprovalService.updateById(policeLeaveApproval); if (!result) { - return AjaxResult.error("审批非工作日饮酒报备单失败"); + return AjaxResult.error("审批请(休)假失败"); } return AjaxResult.success("审批请(休)假成功");