From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:18 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 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 b2cec14..6b1d951 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
@@ -50,17 +50,14 @@
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
- List<Coach> list1=coachClient.getProvince();
CoachQuery coachQuery = new CoachQuery();
+ coachQuery.setStoreIds(new ArrayList<>());
List<CoachSerchVO> data = coachClient.listAll(coachQuery);
-
List<String> province = new ArrayList<>();
-
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);
@@ -106,7 +103,6 @@
CoachQuery coachQuery = new CoachQuery();
List<CoachSerchVO> data = coachClient.listAll(coachQuery);
List<CoachType> list = coachTypeClient.list();
-
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("data",data);
@@ -116,6 +112,7 @@
model.addAttribute("coachType",list);
return PREFIX + "TCoach_add.html";
}
+
/**
* 添加教练
*/
@@ -124,11 +121,6 @@
public ResultUtil addCoach(@RequestBody Coach coach) {
Integer objectId = UserExt.getUser().getObjectId();
if (UserExt.getUser().getObjectType() == 2){
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- coach.setProvince(cityManager.getProvince());
- coach.setProvinceCode(cityManager.getProvinceCode());
- coach.setCity(cityManager.getCity());
- coach.setCityCode(cityManager.getCityCode());
coach.setCityManagerId(objectId);
}
if (coach.getDiploma().equals("")) {
@@ -157,6 +149,7 @@
coachClient.changeState(vo);
return ResultUtil.success();
}
+
/**
* 跳转修改教练页面
*/
@@ -195,10 +188,11 @@
model.addAttribute("type",0);
String[] split = data.get(0).getCertificateImg().split(",");
List<String> pictures = new ArrayList<>(Arrays.asList(split));
- model.addAttribute("pictures",pictures);
+ model.addAttribute("pictures",data.get(0).getCertificateImg());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String birthday = format.format(data.get(0).getBirthday());
model.addAttribute("birthday",birthday);
+ model.addAttribute("diploma",data.get(0).getDiploma());
return PREFIX + "TCoach_edit.html";
}
/**
@@ -259,18 +253,15 @@
coachQuery.setName(name);
coachQuery.setPhone(phone);
Integer objectType = UserExt.getUser().getObjectType();
+ if (objectType == 1){
+ Integer objectId = UserExt.getUser().getObjectId();
+ coachQuery.setOperatorId(objectId);
+ }
if (objectType == 2){
Integer objectId = UserExt.getUser().getObjectId();
- List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
- .stream().map(TStore::getId).collect(Collectors.toList());
- coachQuery.setStoreIds(operatorId);
+ coachQuery.setOperatorId(objectId);
}
- if (objectType == 3){
- Integer objectId = UserExt.getUser().getObjectId();
- List<Integer> list = new ArrayList<>();
- list.add(objectId);
- coachQuery.setStoreIds(list);
- }
+
return coachClient.listAll(coachQuery);
}
}
--
Gitblit v1.7.1