From f604df04d1f9fe90ee543a1772a3a8cdb50d3d66 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 08 八月 2025 15:19:07 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong --- DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java index 9cede93..20dcaa2 100644 --- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java +++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java @@ -14,7 +14,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import java.util.*; @@ -66,7 +65,7 @@ // driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1)); for (Map<String, Object> stringObjectMap : list) { // 1使用中 2空闲中 - if(stringObjectMap.get("id").toString().equals(carId.toString())){ + if(stringObjectMap.get("useDriverId")!=null && stringObjectMap.get("useDriverId").toString().equals(uid.toString())){ map.put("useState", 1); }else { map.put("useState", 0); @@ -159,4 +158,27 @@ this.insert(car); return ResultUtil.success(); } + + @Override + public boolean useState(Integer carId, Integer uid) { + Car car = carMapper.selectById(carId); + if(car.getUseDriverId()!=null && !car.getUseDriverId().equals(uid)){ + return false; + } + return true; + + + } + + @Override + public void updateUseState(Integer carId, Integer uid) { + carMapper.updateUseState(uid); + Car car = carMapper.selectById(carId); + car.setUseDriverId(uid); + this.baseMapper.updateById(car); + } + @Override + public void updateUseState(Integer uid) { + carMapper.updateUseState(uid); + } } -- Gitblit v1.7.1