From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整
---
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index 852035d..5d807e2 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -1,6 +1,5 @@
package com.stylefeng.guns.modular.system.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.CarBrandMapper;
import com.stylefeng.guns.modular.system.dao.CarMapper;
@@ -15,7 +14,10 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service
@@ -70,8 +72,16 @@
*/
@Override
public boolean idle(Integer id) throws Exception {
- Driver driver = driverService.selectOne(new EntityWrapper<Driver>().eq("carId", id).in("authState", Arrays.asList(1, 2)).ne("flag", 3));
- return null == driver ? true : false;
+ Car car = this.selectById(id);
+ List<Map<String, Object>> list = carMapper.queryIdleData(car.getFranchiseeId() != null && car.getFranchiseeId() != 0 ? car.getFranchiseeId() : (
+ car.getCompanyId() != null && car.getCompanyId() != 0 ? car.getCompanyId() : 1));
+ for(Map<String, Object> map : list){
+ Integer carId = Integer.valueOf(String.valueOf(map.get("id")));
+ if(carId.compareTo(id) == 0){
+ return true;
+ }
+ }
+ return false;
}
--
Gitblit v1.7.1