From 5c0294fa1efd7f3177245a2556e951a376640461 Mon Sep 17 00:00:00 2001
From: duhl <1558016038@qq.com>
Date: Fri, 27 Mar 2020 10:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/tyre/carbrand/carbrand.html      |  4 ++--
 .../mapper/tyre/BaseCarbrandMapper.xml         | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/tyre/carbrand/carbrand.html b/ruoyi-admin/src/main/resources/templates/tyre/carbrand/carbrand.html
index 44f73da..c737526 100644
--- a/ruoyi-admin/src/main/resources/templates/tyre/carbrand/carbrand.html
+++ b/ruoyi-admin/src/main/resources/templates/tyre/carbrand/carbrand.html
@@ -24,9 +24,9 @@
                             </li>
                             <li class="select-time">
                                 <label>记录时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
diff --git a/ruoyi-tyre/src/main/resources/mapper/tyre/BaseCarbrandMapper.xml b/ruoyi-tyre/src/main/resources/mapper/tyre/BaseCarbrandMapper.xml
index c1c0f56..329f8b0 100644
--- a/ruoyi-tyre/src/main/resources/mapper/tyre/BaseCarbrandMapper.xml
+++ b/ruoyi-tyre/src/main/resources/mapper/tyre/BaseCarbrandMapper.xml
@@ -21,11 +21,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBaseCarbrandList" parameterType="BaseCarbrand" resultMap="BaseCarbrandResult">
         <include refid="selectBaseCarbrandVo"/>
         <where>
-            <if test="branno != null  and branno != ''"> and BranNo = #{branno}</if>
-            <if test="cartype != null  and cartype != ''"> and CarType = #{cartype}</if>
-            <if test="recorderid != null and recorderid != ''"> and RecorderID = #{recorderid}</if>
+            <if test="branno != null  and branno != ''">
+                AND BranNo like '%'+#{branno}+ '%'
+            </if>
+            <if test="cartype != null  and cartype != ''">
+                AND CarType like '%'+#{cartype}+ '%'
+            </if>
+            <if test="recorderid != null and recorderid != ''">
+                AND RecorderID like '%'+#{recorderid}+ '%'
+            </if>
             <if test="deleteflag != null  and deleteflag != ''"> and DeleteFlag = #{deleteflag}</if>
             <if test="remark != null  and remark != ''"> and Remark = #{remark}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND datediff(dd,#{params.beginTime},recordtime)>=0
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND datediff(dd,recordtime,#{params.endTime})>=0
+            </if>
             <if test="recordtime != null "> and RecordTime = #{recordtime}</if>
         </where>
     </select>