From b342dee27e2b0384616539118346fc2a2af1de7e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 24 七月 2024 14:12:52 +0800
Subject: [PATCH] 三一车辆查询bug修改提交
---
ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml | 10 ++++++++--
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java | 2 ++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 8 ++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
index 390ef5f..a99f360 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
@@ -90,4 +90,6 @@
public ArdSyCar getArdSyTankCarByCarId(String carId);
public long getCountByCarIdList(@Param("carIdList") List<String> carIdList);
+
+ public List<ArdSyCar> getCarListByDeptIdList(@Param("deptIdList") List<Long> deptIdList);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index f3d9d50..626f642 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -547,9 +547,13 @@
map.put("list", new ArrayList());
return map;
}
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.in("dept_id", deptList);
- List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);*/
+ List<ArdSyCar> carListTable = new ArrayList();
+ if(!deptList.isEmpty()){
+ carListTable = ardSyCarMapper.getCarListByDeptIdList(deptList);
+ }
int online = 0;
for (Map<String, Object> map : (List<Map<String, Object>>) result0.get("list")) {
Map<String, Object> resultMap = sYClient.getTeamCarList(syURL, (String) map.get("teamId"), result.get("sessionId"));
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
index 315401f..277904e 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
@@ -17,7 +17,7 @@
<result property="reserved3" column="reserved_3" />
</resultMap>
- <!--<resultMap type="ArdSyCar" id="ArdSyCarLockResult">
+ <resultMap type="ArdSyCar" id="ArdSyCarLockResult">
<result property="id" column="id" />
<result property="carId" column="car_id" />
<result property="carModel" column="car_model" />
@@ -39,7 +39,7 @@
<result property="restartState" column="restart_state" />
<result property="onlineTime" column="online_time" />
</collection>
- </resultMap>-->
+ </resultMap>
<sql id="selectArdSyCarVo">
select id, car_id, car_model, car_type, car_brand, dept_id, car_picture, reserved_1, reserved_2, reserved_3 from ard_sy_car
@@ -157,4 +157,10 @@
#{carId}
</foreach>
</select>
+ <select id="getCarListByDeptIdList" resultMap="ArdSyCarResult">
+ select * from ard_sy_car where dept_id in
+ <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3