From 5ebaf01f27ea05c7f40def8b2e7ac65ce6c084de Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 17:10:59 +0800
Subject: [PATCH] 10.20
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 162bfbd..18cc014 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
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.code;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.CoachClient;
import com.dsh.course.feignClient.account.CoachTypeClient;
@@ -13,6 +14,8 @@
import com.dsh.guns.modular.system.model.CoachChangeStateVO;
import com.dsh.guns.modular.system.model.CoachQuery;
import com.dsh.guns.modular.system.model.Store;
+import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -21,6 +24,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -49,14 +53,11 @@
List<Coach> list1=coachClient.getProvince();
CoachQuery coachQuery = new CoachQuery();
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);
@@ -102,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);
@@ -112,6 +112,7 @@
model.addAttribute("coachType",list);
return PREFIX + "TCoach_add.html";
}
+
/**
* 添加教练
*/
@@ -120,15 +121,11 @@
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("")) coach.setDiploma(null);
+ if (coach.getDiploma().equals("")) {
+ coach.setDiploma(null);
+ }
if (coach.getCertificateImg().equals("") ){
coach.setCertificateImg(null);
}
@@ -152,6 +149,7 @@
coachClient.changeState(vo);
return ResultUtil.success();
}
+
/**
* 跳转修改教练页面
*/
@@ -243,6 +241,8 @@
/**
* 获取教练列表
*/
+ @Autowired
+ private IStoreService storeService;
@RequestMapping(value = "/list")
@ResponseBody
public List<CoachSerchVO> list(String province, String city, String name, String phone) {
@@ -251,6 +251,19 @@
coachQuery.setCity(city);
coachQuery.setName(name);
coachQuery.setPhone(phone);
+ Integer objectType = UserExt.getUser().getObjectType();
+ 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);
+ }
+ 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