diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java b/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java index 4d709ff..e9c5fba 100644 --- a/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java +++ b/cloud/user_search/src/main/java/com/sincere/userSearch/mapper/UserMapper.java @@ -1,6 +1,7 @@ package com.sincere.userSearch.mapper; import com.sincere.userSearch.model.StudentInfo; +import com.sincere.userSearch.model.TeacherGroup; import com.sincere.userSearch.model.TeacherInfo; import java.util.List; @@ -14,4 +15,6 @@ public interface UserMapper { StudentInfo selectParentInfo(int studentId) ; List selectChildrenId(String userId) ; + + List selectTeacherGroup(int teacherId); } diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java new file mode 100644 index 0000000..00bbb75 --- /dev/null +++ b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherGroup.java @@ -0,0 +1,23 @@ +package com.sincere.userSearch.model; + +public class TeacherGroup { + + private int num ; + private String groupName ; + + public int getNum() { + return num; + } + + public void setNum(int num) { + this.num = num; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } +} diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java index eb21a8b..88d160c 100644 --- a/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java +++ b/cloud/user_search/src/main/java/com/sincere/userSearch/model/TeacherInfo.java @@ -5,14 +5,26 @@ import java.util.List; public class TeacherInfo { private String userId ; + private int sex ; private String userName ; private String mobile ; private int schoolId ; private String schoolName ; private String face ; private String pass ; + private List userTypes ; + private String teacherNum ; + private List groups ; private List classInfos ; + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + public String getUserId() { return userId; } @@ -76,4 +88,28 @@ public class TeacherInfo { public void setPass(String pass) { this.pass = pass; } + + public List getUserTypes() { + return userTypes; + } + + public void setUserTypes(List userTypes) { + this.userTypes = userTypes; + } + + public String getTeacherNum() { + return teacherNum; + } + + public void setTeacherNum(String teacherNum) { + this.teacherNum = teacherNum; + } + + public List getGroups() { + return groups; + } + + public void setGroups(List groups) { + this.groups = groups; + } } diff --git a/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java b/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java index 00cb709..230f3d6 100644 --- a/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java +++ b/cloud/user_search/src/main/java/com/sincere/userSearch/service/impl/UserServiceImpl.java @@ -4,10 +4,12 @@ import com.sincere.userSearch.mapper.QyhApplyMapper; import com.sincere.userSearch.mapper.UserMapper; import com.sincere.userSearch.model.StudentInfo; import com.sincere.userSearch.model.TeacherClassInfo; +import com.sincere.userSearch.model.TeacherGroup; import com.sincere.userSearch.model.TeacherInfo; import com.sincere.userSearch.service.UserService; import com.sincere.userSearch.vo.rep.ZnxwRepVo; import com.sincere.userSearch.vo.req.ZnxwReqVo; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,6 +40,26 @@ public class UserServiceImpl implements UserService { teacherClassInfos.add(classInfo); } } + List userTypes = new ArrayList<>(); + for(TeacherClassInfo info : teacherClassInfos){ + if(!userTypes.contains(info.getUserType())){ + userTypes.add(info.getUserType()); + } + } + teacherInfo.setUserTypes(userTypes); + try { + List list = userMapper.selectTeacherGroup(teacherInfo.getClassInfos().get(0).getTeacherId()); + if(list != null && list.size() > 0){ + teacherInfo.setTeacherNum(list.get(0).getNum()+""); + List groups = new ArrayList<>(); + for(TeacherGroup group : list){ + groups.add(group.getGroupName()); + } + teacherInfo.setGroups(groups); + } + }catch (Exception e){ + + } teacherInfo.setClassInfos(teacherClassInfos); } return teacherInfos ; diff --git a/cloud/user_search/src/main/resources/mapper/UserMapper.xml b/cloud/user_search/src/main/resources/mapper/UserMapper.xml index 2b7b1f2..abedf16 100644 --- a/cloud/user_search/src/main/resources/mapper/UserMapper.xml +++ b/cloud/user_search/src/main/resources/mapper/UserMapper.xml @@ -4,6 +4,7 @@ + @@ -22,7 +23,7 @@ + + + + + -- libgit2 0.21.0