From a1daa002370aad0f2f8d9042728a1bcfd4cba600 Mon Sep 17 00:00:00 2001 From: jiang Date: Tue, 15 Jul 2025 17:53:51 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/service/CarPlanAuditServiceImpl.java | 2 +- .../business/backstage/service/DispatchCarServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java index 21ae1c3..f44de05 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java @@ -176,7 +176,7 @@ public class CarPlanAuditServiceImpl implements CarPlanAuditService{ if (statusType == AuditNode.PLAN_DEPT || statusType == AuditNode.MGMT_CENTER) { return sysAuditService.getUserPermission("car_plan", statusType); } else if (statusType == AuditNode.EQUIP_DEPT) { - List liftTeamUsers = Arrays.asList("项管专责2", "项管专责1"); + List liftTeamUsers = Arrays.asList("项管中心1", "项管中心2"); return liftTeamUsers.contains(userName); } else if (statusType == AuditNode.LIFT_TEAM) { return "王炜".contains(userName); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java index bac22e1..1d6be1e 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java @@ -293,7 +293,6 @@ public class DispatchCarServiceImpl implements DispatchCarService { int dispatchNum = carNeedPlanVo.getDispatchNum(); carNeedPlanVo.setDispatchDay(DateTimeHelper.getNowDay()); carNeedPlanVo.setDispatchNum(dispatchNum + vo.getDispatchNum()); - // 如果没有其他待审核记录，状态置为1（完成调度），否则2（继续审核） carNeedPlanVo.setStatus(ListHelpUtil.isEmpty(auditList) ? 1 : 2); } else if (isSecondLevelApprover(roleName)) { @@ -307,7 +306,7 @@ public class DispatchCarServiceImpl implements DispatchCarService { // 写操作记录 String uptime = recordService.getUpTimes("out-" + data.getId(), Integer.parseInt(targetStatus)); - recordService.addRecord("out-" + data.getId(), targetStatus, "2", "3", remark, uptime); + recordService.addRecord("out-" + data.getId(), targetStatus, targetStatus, currentStatus, remark, uptime); return ServerResponse.createBySuccessMsg("审核成功"); } catch (Exception e) { @@ -318,8 +317,8 @@ public class DispatchCarServiceImpl implements DispatchCarService { private String determineNextStatus(String roleName, String currentStatus, String actionStatus) { if ("2".equals(actionStatus)) { - if (isSecondLevelApprover(roleName) && "1".equals(currentStatus)) return "9"; - if (isThirdLevelApprover(roleName) && "2".equals(currentStatus)) return "9"; + if (isSecondLevelApprover(roleName) && "0".equals(currentStatus)) return "9"; + if (isThirdLevelApprover(roleName) && "1".equals(currentStatus)) return "9"; } else { if (isSecondLevelApprover(roleName) && "0".equals(currentStatus)) return "1"; if (isThirdLevelApprover(roleName) && "1".equals(currentStatus)) return "2";