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" and return_visit_time = #{returnVisitTime} and finish_time = #{finishTime} and return_visit_time between #{beginTime} and #{endTime} - and date_format(return_visit_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') and store_code in @@ -63,13 +62,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and store_code = #{storeCode} - and DATE_FORMAT(return_visit_time,'%Y-%m-%d') = #{date} + and return_visit_time between CONCAT(#{date}, ' 00:00:00') AND CONCAT(#{date}, ' 23:59:59') 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' and s.self_delivery_status = #{selfDeliveryStatus} @@ -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' and s.sale_bind_id = #{saleBindId} 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: "",