From 08cb7e0bdd27178c9c73159a0d000d78b3045aed Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 08 六月 2023 19:10:35 +0800
Subject: [PATCH] 司机选择区域不限制，车辆地图定时刷新
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 6 +++++-
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 4 ++++
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java | 5 +++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
index 8421a62..6c2735a 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
@@ -228,10 +228,11 @@
}
tBranchOffice.setDistrictName(area.getName());
tBranchOffice.setDistrictCode(area.getCode());
- }else {
+ }
+ /*else {
tBranchOffice.setDistrictName(city.getName());
tBranchOffice.setDistrictCode(city.getCode());
- }
+ }*/
// 通过省市查询代理商
List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index 7a37e2a..8ed368c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -388,8 +388,12 @@
tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
.eq("cityCode", city.getCode())
.eq("status", StatusEnum.NORMAL.getCode())
- .eq("districtCode", city.getCode())
.last("LIMIT 1"));
+// tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
+// .eq("cityCode", city.getCode())
+// .eq("status", StatusEnum.NORMAL.getCode())
+// .eq("districtCode", city.getCode())
+// .last("LIMIT 1"));
}
if(!CollectionUtils.isEmpty(tBranchOffice)){
tDriver.setBranchOfficeId(tBranchOffice.get(0).getId());
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
index 2b98994..ae15266 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -381,6 +381,10 @@
// orderByMonth(new Date().getMonth() + 1)
// orderByYear(new Date().getFullYear())
// queryOrderCount()
+ setInterval(function () {
+ console.log(1111111111)
+ getData()
+ }, 30000);
})
function selectYear(e){
--
Gitblit v1.7.1