From 0b6189c1c208a4f1c4cd4b230dba10b3581d1ff9 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 16 五月 2024 16:01:16 +0800
Subject: [PATCH] fix: 获取司机配送员信息接口修改
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
index 7268357..ba33faf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -43,9 +44,62 @@
@RequestMapping(value = "/getAll", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
public Result<List<Area>> getAll() {
-
+ QueryWrapper<Area> wrapper = new QueryWrapper<>();
+ wrapper.orderByAsc("name");
List<Area> list = iAreaService.list();
return new ResultUtil<List<Area>>().setData(list);
+ }
+ @RequestMapping(value = "/getAllAreas", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鎵�鏈夊尯鍩熸暟鎹�")
+ public Result<List<String>> getAllAreas(){
+ QueryWrapper<Area> wrapper = new QueryWrapper<>();
+ wrapper.orderByAsc("name");
+ List<String> names = new ArrayList<>();
+ List<Area> list = iAreaService.list();
+ for (Area area:list ) {
+ String name = area.getName();
+ /* int wz = name.indexOf("0");
+ if(wz>0){
+ name = name.substring(0,wz);
+ }*/
+
+ name = name
+ .replace("01杞�","")
+ .replace("02杞�","")
+ .replace("03杞�","")
+ .replace("04杞�","")
+ .replace("05杞�","")
+ .replace("06杞�","")
+ .replace("07杞�","")
+ .replace("08杞�","")
+ .replace("09杞�","")
+ .replace("10杞�","")
+ .replace("11杞�","")
+ .replace("12杞�","")
+ .replace("13杞�","")
+ .replace("14杞�","")
+ .replace("15杞�","");
+ name = name
+ .replace("01","")
+ .replace("02","")
+ .replace("03","")
+ .replace("04","")
+ .replace("05","")
+ .replace("06","")
+ .replace("07","")
+ .replace("08","")
+ .replace("09","")
+ .replace("10","")
+ .replace("11","")
+ .replace("12","")
+ .replace("13","")
+ .replace("14","")
+ .replace("15","");
+ if(!names.contains(name)){
+ names.add(name);
+ }
+ }
+ return new ResultUtil<List<String>>().setData(names);
}
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@@ -62,11 +116,11 @@
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Area> saveOrUpdate(Area area) {
QueryWrapper<Area> wrapper = new QueryWrapper<>();
- if (!area.getUserId().equals("0")){
- wrapper.eq("user_id",area.getUserId());
+ if (StrUtil.isNotEmpty(area.getCarId())){
+ wrapper.eq("car_id",area.getCarId());
Area area1 = iAreaService.getOne(wrapper);
if (area1 != null && !area.getId().equals(area1.getId())){
- return new ResultUtil<Area>().setErrorMsg("璇ラ厤閫佸憳宸茶鍏朵粬鐗囧尯缁戝畾,璇峰厛瑙ｇ粦");
+ return new ResultUtil<Area>().setErrorMsg("璇ヨ溅杈嗗凡琚叾瀹冪墖鍖虹粦瀹�,璇峰厛瑙ｇ粦");
}
}
--
Gitblit v1.9.1