From 7e6df9e96e7840712ea91cb3c12ff1d73e78e1d0 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Mon, 5 Aug 2024 15:02:53 +0800
Subject: [PATCH] =?UTF-8?q?1;=20sql=E4=BC=98=E5=8C=96=EF=BC=88=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=8A=A0=E7=B4=A2=E5=BC=95=EF=BC=89=202?=
 =?UTF-8?q?=EF=BC=9Bmq=E9=97=AE=E9=A2=98=E6=8E=92=E6=9F=A5=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=88=E9=87=8D=E6=96=B0=E9=83=A8=E7=BD=B2mq?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=88=87=E6=8D=A2=EF=BC=89=203?=
 =?UTF-8?q?=EF=BC=9B=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=20=E9=BB=98=E8=AE=A4admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/business/BusReturnVisitInfoMapper.xml | 7 +++----
 .../main/resources/mapper/business/BusStoreInfoMapper.xml  | 6 +++---
 ruoyi-ui/src/views/login.vue                               | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
index a7f6407..a1ea8ea 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
@@ -42,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="returnVisitTime != null "> and return_visit_time = #{returnVisitTime}</if>
             <if test="finishTime != null "> and finish_time = #{finishTime}</if>
             <if test="beginTime != null and endTime != null"> and return_visit_time between #{beginTime} and #{endTime}</if>
-            <if test="beginTime == null and endTime == null"> and date_format(return_visit_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')</if>
             <if test="storeList != null">
                 and store_code in
                 <foreach collection="storeList" open="(" close=")" item="item" separator="," index="i">
@@ -63,13 +62,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBusReturnVisitInfoVo"/>
         <where>
             <if test="storeCode != null  and storeCode != ''"> and store_code = #{storeCode}</if>
-            <if test="date != null "> and DATE_FORMAT(return_visit_time,'%Y-%m-%d') = #{date}</if>
+            <if test="date != null "> and return_visit_time between CONCAT(#{date}, ' 00:00:00') AND CONCAT(#{date}, ' 23:59:59')</if>
         </where>
     </select>
     <select id="countByToday" resultType="java.lang.Integer">
         select count(id) from bus_return_visit_info
-        where date_format(return_visit_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
-            <if test="storeCode != null  and storeCode != ''"> and store_code = #{storeCode}</if>
+        where return_visit_time between CONCAT(CURDATE(), ' 00:00:00') AND CONCAT(CURDATE(), ' 23:59:59')
+        and store_code = #{storeCode}
     </select>
 
     <insert id="batchInsertVisit">
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
index ee646a5..a44ae95 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
@@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN (
             select rv.store_code,count(rv.id) ct
             from bus_return_visit_info rv
-            where DATE_FORMAT(rv.return_visit_time,'%Y-%m-%d') = CURDATE()
+            where rv.return_visit_time between CONCAT(CURDATE(), ' 00:00:00') AND CONCAT(CURDATE(), ' 23:59:59')
             group by rv.store_code
         ) sdd ON sdd.store_code = s.store_code
         where  s.self_delivery_status != '3'
@@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ifnull(sd.score,'-') score,
         #{storeBelong} bindTime
         FROM bus_store_info s
-         LEFT JOIN bus_store_day_history_info sd ON s.id = sd.store_id and DATE_FORMAT(sd.create_time,'%Y-%m-%d') = #{storeBelong}
+         LEFT JOIN bus_store_day_history_info sd ON s.id = sd.store_id and sd.create_time between CONCAT(#{storeBelong}, ' 00:00:00') AND CONCAT(#{storeBelong}, ' 23:59:59')
          LEFT JOIN bus_store_config_info sc ON s.store_code = sc.store_code
         where s.self_delivery_status != '3'
         <if test="selfDeliveryStatus != null  and selfDeliveryStatus != ''"> and s.self_delivery_status = #{selfDeliveryStatus}</if>
@@ -258,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ifnull(sd.score,'-')score,
         #{storeBelong} bindTime
         FROM bus_store_info s
-        LEFT JOIN bus_store_day_history_info sd ON s.id = sd.store_id and DATE_FORMAT(sd.create_time,'%Y-%m-%d') = #{storeBelong}
+        LEFT JOIN bus_store_day_history_info sd ON s.id = sd.store_id and sd.create_time between CONCAT(#{storeBelong}, ' 00:00:00') AND CONCAT(#{storeBelong}, ' 23:59:59')
         LEFT JOIN bus_store_config_info sc ON s.store_code = sc.store_code
         where  s.self_delivery_status != '3'
         <if test="saleBindId != null "> and s.sale_bind_id = #{saleBindId}</if>
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 84772e2..46dc95c 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -115,7 +115,7 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
+        username: "",
         password: "",
         rememberMe: false,
         code: "",