bonus
/
gz_car_manage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 修改

This commit is contained in:
jiang 2025-07-15 17:53:51 +08:00
parent 6fb5a836c1
commit a1daa00237
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/gzcar/business/backstage/service/CarPlanAuditServiceImpl.java
View File

@ -176,7 +176,7 @@ public class CarPlanAuditServiceImpl implements CarPlanAuditService{
if (statusType == AuditNode.PLAN_DEPT || statusType == AuditNode.MGMT_CENTER) { if (statusType == AuditNode.PLAN_DEPT || statusType == AuditNode.MGMT_CENTER) {
return sysAuditService.getUserPermission("car_plan", statusType); return sysAuditService.getUserPermission("car_plan", statusType);
} else if (statusType == AuditNode.EQUIP_DEPT) { } else if (statusType == AuditNode.EQUIP_DEPT) {
List<String> liftTeamUsers = Arrays.asList("项管专责2", "项管专责1"); List<String> liftTeamUsers = Arrays.asList("项管中心1", "项管中心2");
return liftTeamUsers.contains(userName); return liftTeamUsers.contains(userName);
} else if (statusType == AuditNode.LIFT_TEAM) { } else if (statusType == AuditNode.LIFT_TEAM) {
return "王炜".contains(userName); return "王炜".contains(userName);

7
src/main/java/com/bonus/gzcar/business/backstage/service/DispatchCarServiceImpl.java
View File

@ -293,7 +293,6 @@ public class DispatchCarServiceImpl implements DispatchCarService {
int dispatchNum = carNeedPlanVo.getDispatchNum(); int dispatchNum = carNeedPlanVo.getDispatchNum();
carNeedPlanVo.setDispatchDay(DateTimeHelper.getNowDay()); carNeedPlanVo.setDispatchDay(DateTimeHelper.getNowDay());
carNeedPlanVo.setDispatchNum(dispatchNum + vo.getDispatchNum()); carNeedPlanVo.setDispatchNum(dispatchNum + vo.getDispatchNum());
// 如果没有其他待审核记录，状态置为1（完成调度），否则2（继续审核） // 如果没有其他待审核记录，状态置为1（完成调度），否则2（继续审核）
carNeedPlanVo.setStatus(ListHelpUtil.isEmpty(auditList) ? 1 : 2); carNeedPlanVo.setStatus(ListHelpUtil.isEmpty(auditList) ? 1 : 2);
} else if (isSecondLevelApprover(roleName)) { } else if (isSecondLevelApprover(roleName)) {
@ -307,7 +306,7 @@ public class DispatchCarServiceImpl implements DispatchCarService {
// 写操作记录 // 写操作记录
String uptime = recordService.getUpTimes("out-" + data.getId(), Integer.parseInt(targetStatus)); 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("审核成功"); return ServerResponse.createBySuccessMsg("审核成功");
} catch (Exception e) { } catch (Exception e) {
@ -318,8 +317,8 @@ public class DispatchCarServiceImpl implements DispatchCarService {
private String determineNextStatus(String roleName, String currentStatus, String actionStatus) { private String determineNextStatus(String roleName, String currentStatus, String actionStatus) {
if ("2".equals(actionStatus)) { if ("2".equals(actionStatus)) {
if (isSecondLevelApprover(roleName) && "1".equals(currentStatus)) return "9"; if (isSecondLevelApprover(roleName) && "0".equals(currentStatus)) return "9";
if (isThirdLevelApprover(roleName) && "2".equals(currentStatus)) return "9"; if (isThirdLevelApprover(roleName) && "1".equals(currentStatus)) return "9";
} else { } else {
if (isSecondLevelApprover(roleName) && "0".equals(currentStatus)) return "1"; if (isSecondLevelApprover(roleName) && "0".equals(currentStatus)) return "1";
if (isThirdLevelApprover(roleName) && "1".equals(currentStatus)) return "2"; if (isThirdLevelApprover(roleName) && "1".equals(currentStatus)) return "2";