From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
index e5a6959..aecb6e1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
@@ -43,6 +43,7 @@
*/
@RequestMapping("")
public String index(Model model) {
+
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
List<Coach> list1=coachClient.getProvince();
@@ -50,13 +51,16 @@
List<CoachSerchVO> data = coachClient.listAll(coachQuery);
List<String> province = new ArrayList<>();
- for (Coach coach : list1) {
+
+ for (CoachSerchVO coach : data) {
province.add(coach.getProvince());
}
+ HashSet<String> set = new HashSet<String>(province);
+
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("data",data);
- model.addAttribute("list",province);
+ model.addAttribute("list",set);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
return PREFIX + "TCoach.html";
@@ -67,7 +71,16 @@
@RequestMapping(value = "/getCity")
@ResponseBody
public List<Coach> getCity(String province) {
- return coachClient.getCity(province);
+ List<Coach> city = coachClient.getCity(province);
+ List<Coach> res = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ for (Coach coach : city) {
+ if (!list.contains(coach.getCity())){
+ res.add(coach);
+ list.add(coach.getCity());
+ }
+ }
+ return res;
}
/**
@@ -115,7 +128,9 @@
coach.setCityManagerId(objectId);
}
- if (coach.getDiploma().equals("")) coach.setDiploma(null);
+ if (coach.getDiploma().equals("")) {
+ coach.setDiploma(null);
+ }
if (coach.getCertificateImg().equals("") ){
coach.setCertificateImg(null);
}
@@ -225,7 +240,7 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String birthday = format.format(data.get(0).getBirthday());
model.addAttribute("birthday",birthday);
- return PREFIX + "TCoach_edit.html";
+ return PREFIX + "Operator_edit.html";
}
/**
* 获取教练列表
--
Gitblit v1.7.1