From fde0d8d0de95b322b9be6f01e419287ddb400868 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 19:42:04 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java | 46 ++++++++++++++--------------------------------
1 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
index 51a7edb..0ca9cfb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
@@ -1,6 +1,8 @@
package com.dsh.guns.modular.system.controller.code;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.StoreStaffClient;
import com.dsh.course.feignClient.account.model.CityManager;
@@ -14,7 +16,9 @@
import com.dsh.guns.config.UserExt;
import com.dsh.guns.modular.system.model.CoachQuery;
import com.dsh.guns.modular.system.model.Store;
+import com.dsh.guns.modular.system.model.TCity;
import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +46,8 @@
private CityManagerClient cityManagerClient;
@Autowired
private StoreStaffClient storeStaffClient;
+ @Autowired
+ private ICityService cityService;
/**
* 跳转体测预约管理首页
*/
@@ -55,22 +61,15 @@
@RequestMapping("/add")
public String add(Model model) {
Integer roleType = UserExt.getUser().getObjectType();
- List<CityManager> province = cityManagerClient.listAll();
- Set<String> seenNames = new HashSet<>();
- List<CityManager> result = new ArrayList<>();
- for (CityManager cityManager : province) {
- if(!seenNames.contains(cityManager.getProvince())){
- result.add(cityManager);
- seenNames.add(cityManager.getProvince());
- }
- }
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
if (roleType == 2){
Integer cityManagerId = UserExt.getUser().getObjectId();
CityManager cityManager = cityManagerClient.queryCityManagerById(cityManagerId);
List<Store> stores = storeClient.getStoreByCityManagerId(cityManagerId);
model.addAttribute("stores",stores);
}
- model.addAttribute("list",result);
+ model.addAttribute("list",list);
model.addAttribute("roleType",roleType);
return PREFIX + "TBodySideAppointment_add.html";
@@ -84,30 +83,13 @@
Integer objectId = UserExt.getUser().getObjectId();
BodySideAppointment data = bodySideAppointmentClient.getInfoById(id);
if (roleType == 1){
- List<CityManager> cityManagers = cityManagerClient.listAll();
- List<CityManager> province = new ArrayList<>();
- List<CityManager> city = new ArrayList<>();
- Set<String> seenNames = new HashSet<>();
- Set<String> c = new HashSet<>();
- // 省列表
- List<CityManager> result = new ArrayList<>();
- // 市列表
- List<CityManager> cities = new ArrayList<>();
- // 对省/市去重
- for (CityManager cityManager : cityManagers) {
- if(!seenNames.contains(cityManager.getProvince())){
- result.add(cityManager);
- seenNames.add(cityManager.getProvince());
- }
- if(!c.contains(cityManager.getProvince())){
- cities.add(cityManager);
- c.add(cityManager.getProvince());
- }
- }
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ TCity province1 = cityService.getOne(new QueryWrapper<TCity>().eq("name", data.getProvince()));
+ List<TCity> city = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, province1.getId()));
+ model.addAttribute("list",list);
List<Store> stores = storeClient.getStore(data.getCity());
model.addAttribute("stores",stores);
- model.addAttribute("list",result);
- model.addAttribute("cities",cities);
+ model.addAttribute("cities",city);
}else if (roleType == 2){
List<Store> stores = storeClient.getStoreByCityManagerId(objectId);
model.addAttribute("stores",stores);
--
Gitblit v1.7.1