From fdbc2bf232cdb44a1ae8d11e4030a180ccee6dff Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 26 Apr 2024 11:27:12 +0800
Subject: [PATCH] =?UTF-8?q?APP=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../securitycontrol/entity/background/vo/VehicleVo.java   | 3 ++-
 .../background/service/impl/AppServiceImpl.java           | 8 ++++----
 .../src/main/resources/mapper/AppMapper.xml               | 2 +-
 .../src/main/resources/mapper/VehicleMapper.xml           | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java
index 387c99b..c281c51 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java
@@ -48,6 +48,8 @@ public class VehicleVo {
 
     private String bidCode;
 
+    private String proName;
+
     private String date;
 
     private String startDate;
@@ -59,5 +61,4 @@ public class VehicleVo {
 
     private String value;
 
-
 }
diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
index df5ea42..8c14493 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
@@ -104,9 +104,9 @@ public class AppServiceImpl implements IAppService {
                 String data = mapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1);
                 if (StringUtils.isNotEmpty(data)) {
                     String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
-                    vo.setStatus(StringUtils.isEmpty(value) ? "离场" : value);
+                    vo.setStatus(StringUtils.isEmpty(value) ? "出" : value);
                 }else{
-                    vo.setStatus("离场");
+                    vo.setStatus("出");
                 }
             }
         } catch (Exception e) {
@@ -135,9 +135,9 @@ public class AppServiceImpl implements IAppService {
                 String data = mapper.getUserAccessStatus(vo.getCarNum(), Constant.ACCESS_TYPE, 1);
                 if (StringUtils.isNotEmpty(data)) {
                     String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
-                    vo.setAccessType(StringUtils.isEmpty(value) ? "离场" : value);
+                    vo.setAccessType(StringUtils.isEmpty(value) ? "出" : value);
                 }else{
-                    vo.setAccessType("离场");
+                    vo.setAccessType("出");
                 }
             }
         } catch (Exception e) {
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
index 646c91f..45c8f33 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
@@ -81,7 +81,7 @@
                tw.warn_content AS warnContent,
                IF(status = '1','已处理','未处理') AS status
         FROM tb_warn tw
-        WHERE tw.bid_code = #{bidCode} AND tw.warn_time BETWEEN CONCAT(CURRENT_DATE,' 00:00:00') AND CONCAT(CURRENT_DATE,' 23:59:59')
+        WHERE tw.bid_code = #{bidCode}
         ORDER BY warn_time DESC,status ASC
     </select>
     <!--工程工序计划-->
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml
index 6749bd5..02c870e 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml
@@ -4,7 +4,7 @@
 
     <!--获取列表-->
     <select id="getVehicleLists" resultType="com.securitycontrol.entity.background.vo.VehicleVo">
-        SELECT  tc.id,tc.car_num as carNum,tc.user_name as userName,tc.phone ,tp.bid_code as bidCode
+        SELECT  tc.id,tc.car_num as carNum,tc.user_name as userName,tc.phone ,tp.bid_code as bidCode,tp.pro_name AS proName
         FROM tb_car tc
         LEFT JOIN tb_project tp ON tp.bid_code = tc.bid_code
         where tc.del_flag = '0'