From 7ab1fcfdd4facfdafac50dc06804408e4559dba7 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 24 二月 2025 08:20:49 +0800
Subject: [PATCH] fix ： 查询出场接口修改

---
 src/main/resources/mapper/OutParkMapper.xml                   |    6 ++++++
 src/main/java/com/boying/service/OutParkService.java          |    2 +-
 src/main/java/com/boying/service/impl/OutParkServiceImpl.java |    4 ++--
 src/main/java/com/boying/controller/OutParkController.java    |    2 +-
 src/main/java/com/boying/mapper/OutParkMapper.java            |    2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index a8f91a6..77c5df6 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -59,7 +59,7 @@
     public Object findPage(Page page, String  carNo,Long parkId,String  payCode,Integer status,String date) throws ParseException {
         List<OutPark> list = outParkService.getList(page.getCurrent(), page.getSize(), carNo,parkId,payCode,status, date);
         System.out.println(list);
-        long count = outParkService.getCount(carNo,parkId,payCode, date);
+        long count = outParkService.getCount(carNo,parkId,payCode,status, date);
         for (OutPark record : list) {
             record.setParkName(parkService.getById(record.getParkId()).getName());
             if(record.getEnterTime() != null){
diff --git a/src/main/java/com/boying/mapper/OutParkMapper.java b/src/main/java/com/boying/mapper/OutParkMapper.java
index 204a1b4..23e314d 100644
--- a/src/main/java/com/boying/mapper/OutParkMapper.java
+++ b/src/main/java/com/boying/mapper/OutParkMapper.java
@@ -20,7 +20,7 @@
 
     List<OutPark> getList(@Param("current")long current, @Param("size")long size, @Param("carNo")String carNo, @Param("parkId")Long parkId, @Param("payCode")String payCode,@Param("status")Integer status, @Param("date")String date);
 
-    long getCount(@Param("carNo")String carNo, @Param("parkId")Long parkId, @Param("payCode")String payCode, @Param("date")String date);
+    long getCount(@Param("carNo")String carNo, @Param("parkId")Long parkId, @Param("payCode")String payCode,@Param("status")Integer status, @Param("date")String date);
 
     List<OutParkVo> getVoList(@Param("parkId")Integer parkId,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
diff --git a/src/main/java/com/boying/service/OutParkService.java b/src/main/java/com/boying/service/OutParkService.java
index 80ecd43..c9c0559 100644
--- a/src/main/java/com/boying/service/OutParkService.java
+++ b/src/main/java/com/boying/service/OutParkService.java
@@ -20,7 +20,7 @@
 public interface OutParkService extends IService<OutPark> {
     List<OutPark> getList(long current, long size, String carNo, Long parkId, String payCode,Integer status, String date);
 
-    long getCount(String carNo, Long parkId, String payCode, String date);
+    long getCount(String carNo, Long parkId, String payCode,Integer status, String date);
 
 
     int count1();
diff --git a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
index 8fda42e..58f67ff 100644
--- a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
@@ -278,7 +278,7 @@
     }
 
     @Override
-    public long getCount(String carNo, Long parkId, String payCode, String date) {
-        return outParkMapper.getCount(carNo,parkId,payCode,date);
+    public long getCount(String carNo, Long parkId, String payCode,Integer status, String date) {
+        return outParkMapper.getCount(carNo,parkId,payCode,status,date);
     }
 }
diff --git a/src/main/resources/mapper/OutParkMapper.xml b/src/main/resources/mapper/OutParkMapper.xml
index 11e82cd..f4292b9 100644
--- a/src/main/resources/mapper/OutParkMapper.xml
+++ b/src/main/resources/mapper/OutParkMapper.xml
@@ -39,6 +39,9 @@
                 <if test="parkId != null and parkId != ''">
                       and park_id = #{parkId}
                 </if>
+                <if test="status != null and status != ''">
+                      and status = #{status}
+                </if>
                 <if test="date != null and date != ''">
                       and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{date},'%Y-%m-%d')
                       and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{date},'%Y-%m-%d')
@@ -60,6 +63,9 @@
                   <if test="parkId != null and parkId != ''">
                         and park_id = #{parkId}
                   </if>
+                  <if test="status != null and status != ''">
+                        and status = #{status}
+                  </if>
                   <if test="date != null and date != ''">
                         and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{date},'%Y-%m-%d')
                         and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{date},'%Y-%m-%d')

--
Gitblit v1.9.1