From 71c827f13e36f8e7359c0a8d3c49c2a91252f974 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 一月 2026 14:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 9c5fdae..d38b0a1 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -220,12 +220,25 @@
public String tDriver_immediately(@PathVariable Integer tDriverId, Model model) {
Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId);
model.addAttribute("item",tDriver);
- if(tDriver.get("placeOfPractice")!=null){
- String placeOfPractice = tDriver.get("placeOfPractice").toString().replaceAll(",", "-");
- model.addAttribute("placeOfPractice", placeOfPractice);
- }else {
- model.addAttribute("placeOfPractice", "");
+
+ //处理从业地字段
+ String placeOfPracticeStr = "";
+ if(tDriver.get("placeOfEmployment") != null){
+ String placeOfEmployment = tDriver.get("placeOfEmployment").toString();
+ //根据地区代码查询省市区名称
+ TRegion area = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", placeOfEmployment));
+ if(area != null) {
+ TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", area.getParentId()));
+ if(city != null) {
+ TRegion province = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", city.getParentId()));
+ if(province != null) {
+ placeOfPracticeStr = province.getName() + "-" + city.getName() + "-" + area.getName();
+ }
+ }
+ }
}
+ model.addAttribute("placeOfPractice", placeOfPracticeStr);
+
LogObjectHolder.me().set(tDriver);
return PREFIX + "tDriver_immediately.html";
}
@@ -256,12 +269,25 @@
public String tDriver_look(@PathVariable Integer tDriverId, Model model) {
Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId);
model.addAttribute("item",tDriver);
- Object placeOfPractice1 = tDriver.get("placeOfPractice");
- if(placeOfPractice1==null){
- model.addAttribute("placeOfPractice", "");
- }else {
- model.addAttribute("placeOfPractice", placeOfPractice1.toString().replaceAll(",", "-"));
+
+ //处理从业地字段
+ String placeOfPracticeStr = "";
+ if(tDriver.get("placeOfEmployment") != null){
+ String placeOfEmployment = tDriver.get("placeOfEmployment").toString();
+ //根据地区代码查询省市区名称
+ TRegion area = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", placeOfEmployment));
+ if(area != null) {
+ TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", area.getParentId()));
+ if(city != null) {
+ TRegion province = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("id", city.getParentId()));
+ if(province != null) {
+ placeOfPracticeStr = province.getName() + "-" + city.getName() + "-" + area.getName();
+ }
+ }
+ }
}
+ model.addAttribute("placeOfPractice", placeOfPracticeStr);
+
LogObjectHolder.me().set(tDriver);
return PREFIX + "tDriver_look.html";
}
--
Gitblit v1.7.1