From 492bae41a21616852b8007660c679fcd37e7ea2a Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 06 十一月 2023 10:16:34 +0800
Subject: [PATCH] app人员查询
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index 7c1c0b2..f16e24a 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -36,8 +36,7 @@
private ArdSyCarRtuMapper rtuMapper;
@Autowired
private ArdSyCarLockMapper lockMapper;
- @Autowired
- private ArdAccessFenceMapper ardAccessFenceMapper;
+
@Override
public List<CarVo> car() {
@@ -165,18 +164,25 @@
}
@Override
- public int access(ArdAccessFence ardAccessFence) {
- int num = 0;
- String carId = ardAccessFence.getCarId();
- QueryWrapper<ArdAccessFence> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("car_id",carId);
- ArdAccessFence ardAccessFence1 = ardAccessFenceMapper.selectOne(queryWrapper);
- if(ardAccessFence1==null){
- num = ardAccessFenceMapper.insert(ardAccessFence);
- }
- return num;
+ public List<CarVo> queryCar(List<String> list) {
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
+ return carAnalysis(ardSyCars);
}
+ @Override
+ public List<CarVo> addCarBefore(String id) {
+ QueryWrapper<ArdSyCar> ardSyCarQueryWrapper = new QueryWrapper<>();
+ ardSyCarQueryWrapper.eq("car_id",id);
+ List<ArdSyCar> carList = ardSyCarMapper.selectList(ardSyCarQueryWrapper);
+ return carAnalysis(carList);
+ }
+
+
+
+
+ //杞﹁締鍒楄〃灏佽
public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){
List<CarVo> list = new ArrayList<>();
for (int i = 0; i < ardSyCars.size(); i++) {
@@ -189,6 +195,7 @@
SysDept sysDept = sysDeptMapper.selectById(ardSyCar.getDeptId());
carVo.setDeptName(sysDept.getDeptName());
carVo.setRtu(ardSyCar.getReserved1());
+ carVo.setCarModel(ardSyCar.getCarModel());
list.add(carVo);
}
return list;
--
Gitblit v1.9.3