From a3e794bb31687df834d944e16838423f62d9197c Mon Sep 17 00:00:00 2001
From: liulixin <zycloud@zycloud.com>
Date: Thu, 25 Jan 2024 11:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=A6=81=E9=97=B8=E6=9C=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GateCarIOServiceImpl.java            |  2 +-
 .../gatemachine/CzksGateCarIOMapper.xml       | 38 ++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java
index fcce0e4e..f1a1f335 100644
--- a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java
+++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java
@@ -35,7 +35,7 @@ public class GateCarIOServiceImpl implements GateCarIOService {
     public List<PageData> getDatalistpage(Page page) {
         if (page.getPd().get("GATE_AREA_TYPE") != null && "1".equals(page.getPd().get("GATE_AREA_TYPE"))) {
             return czksGateCarIOMapper.getGroceryDatalistPage(page);
-        } else if (page.getPd().get("GATE_AREA_TYPE") != null) {
+        } else if (page.getPd().get("GATE_AREA_TYPE") != null && "2".equals(page.getPd().get("GATE_AREA_TYPE"))) {
             return czksGateCarIOMapper.getMineralDatalistPage(page);
         }
         return new ArrayList<>();
diff --git a/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml
index dc489bd0..1936e24b 100644
--- a/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml
+++ b/src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml
@@ -174,10 +174,23 @@
         <if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' ">
             and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR}
         </if>
-        <if test="pd.JGSJ!=null and pd.JGSJ!='' and pd.CGSJ!=null and pd.CGSJ!=''">
-            and f.JGSJ <![CDATA[ >= ]]> #{pd.JGSJ ,jdbcType=VARCHAR} and f.CGSJ <![CDATA[ <= ]]>
-            #{pd.CGSJ ,jdbcType=VARCHAR}
+
+        <if test="pd.startTime!=null and pd.startTime!='' and pd.endTime!=null and pd.endTime!=''">
+            <if test="pd.IO!=null and pd.IO!=''">
+                <if test="pd.IO==0">
+                    and f.PASS_TYPE=0 and f.JGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
+                    #{pd.endTime ,jdbcType=VARCHAR}
+                </if>
+                <if test="pd.IO==1">
+                    and f.PASS_TYPE=1 and f.CGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
+                    #{pd.endTime ,jdbcType=VARCHAR}
+                </if>
+            </if>
+            <if test="pd.IO==null or pd.IO=='' ">
+                and f.CREATTIME between #{pd.startTime ,jdbcType=VARCHAR} and #{pd.endTime ,jdbcType=VARCHAR}
+            </if>
         </if>
+
         <if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' ">
             and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%')
         </if>
@@ -193,10 +206,23 @@
         <if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' ">
             and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR}
         </if>
-        <if test="pd.JGSJ!=null and pd.JGSJ!='' and pd.CGSJ!=null and pd.CGSJ!=''">
-            and f.JGSJ <![CDATA[ >= ]]> #{pd.JGSJ ,jdbcType=VARCHAR} and f.CGSJ <![CDATA[ <= ]]>
-            #{pd.CGSJ ,jdbcType=VARCHAR}
+
+        <if test="pd.startTime!=null and pd.startTime!='' and pd.endTime!=null and pd.endTime!=''">
+            <if test="pd.IO!=null and pd.IO!=''">
+                <if test="pd.IO==0">
+                    and f.PASS_TYPE=0 and f.JGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
+                    #{pd.endTime ,jdbcType=VARCHAR}
+                </if>
+                <if test="pd.IO==1">
+                    and f.PASS_TYPE=1 and f.CGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
+                    #{pd.endTime ,jdbcType=VARCHAR}
+                </if>
+            </if>
+            <if test="pd.IO==null or pd.IO=='' ">
+                and f.CREATTIME between #{pd.startTime ,jdbcType=VARCHAR} and #{pd.endTime ,jdbcType=VARCHAR}
+            </if>
         </if>
+
         <if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' ">
             and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%')
         </if>