p70165982
/
edu-java
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!12 1. bug fix 2.添加student查询接口的个人信息查询 

Merge pull request !12 from Sky_ID/feature_lwh
This commit is contained in:
Sky_ID 2020-12-15 11:07:52 +08:00 committed by Gitee
parent b085220b7e 201676dfe9
commit bf7122821c
5 changed files with 48 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/letoy/edu/entity/StudentInfo.java
View File

@ -12,7 +12,7 @@ public class StudentInfo {
private long studentId;
private long majorId;
private long userId;
private String userId;
private long number;
private String name;
private String group;

77
src/main/java/com/letoy/edu/entity/User.java
View File

@ -1,6 +1,12 @@
package com.letoy.edu.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class User {
private String email;
@ -12,72 +18,7 @@ public class User {
private String roles;
private Integer state;
public String getStudentId() {
return studentId;
}
public void setStudentId(String studentId) {
this.studentId = studentId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public Integer getState() {
return state;
}
public void setState(Integer state) {
this.state = state;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getRoles() {
return roles;
}
public void setRoles(String roles) {
this.roles = roles;
}
private Integer phone;
private String address;
private String introduce;
}

6
src/main/java/com/letoy/edu/vo/Student.java
View File

@ -13,13 +13,14 @@ public class Student {
private long studentId;
private long majorId;
private long userId;
private String userId;
private long number;
private String name;
private String group;
private MajorInfo majorInfo;
private UserClean userClean;
public Student(StudentInfo studentInfo,MajorInfo majorInfo) {
public Student(StudentInfo studentInfo,MajorInfo majorInfo, UserClean userClean) {
this.studentId = studentInfo.getStudentId();
this.majorId = studentInfo.getMajorId();
this.userId = studentInfo.getUserId();
@ -27,6 +28,7 @@ public class Student {
this.name = studentInfo.getName();
this.group = studentInfo.getGroup();
this.majorInfo = majorInfo;
this.userClean = userClean;
}

19
src/main/java/com/letoy/edu/vo/UserClean.java Normal file
View File

@ -0,0 +1,19 @@
package com.letoy.edu.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class UserClean {
private String email;
private String name;
private String roles;
private Integer state;
private Integer phone;
private String address;
private String introduce;
}

21
src/main/resources/mapper/StudentInfoMapper.xml
View File

@ -9,21 +9,30 @@
<select id="findStudentByNumber" resultMap="studentMap">
select student_id,s.major_id,user_id,number,name,`group`,m.major_id,major_name
from student_info s, major_info m
where number=#{number} and m.major_id = s.major_id
select s.student_id,s.major_id,s.user_id,number,s.name,s.group,m.major_id,major_name,u.user_id, u.name, roles, state, email,phone,address,introduce
from student_info s, major_info m, user_info u
where number=#{number} and m.major_id = s.major_id and u.user_id = s.user_id
</select>
<resultMap id="studentMap" type="com.letoy.edu.vo.Student">
<id property="studentId" column="student_id" javaType="java.lang.Integer"/>
<result property="majorId" column="major_id" javaType="java.lang.Integer"/>
<result property="userId" column="user_id" javaType="java.lang.Integer"/>
<result property="userId" column="user_id" javaType="java.lang.String"/>
<result property="number" column="number" javaType="java.lang.Integer"/>
<result property="name" column="group" javaType="java.lang.String"/>
<result property="group" column="name" javaType="java.lang.String"/>
<result property="name" column="name" javaType="java.lang.String"/>
<result property="group" column="group" javaType="java.lang.String"/>
<association property="majorInfo" javaType="com.letoy.edu.entity.MajorInfo">
<id property="majorId" column="major_id" javaType="java.lang.Integer"/><!-- id列 -->
<result property="majorName" column="major_name" javaType="java.lang.String"/>
</association>
<association property="userClean" javaType="com.letoy.edu.vo.UserClean">
<result property="email" column="email" javaType="java.lang.String"/>
<result property="name" column="name" javaType="java.lang.String"/>
<result property="roles" column="roles" javaType="java.lang.String"/>
<result property="address" column="address" javaType="java.lang.String"/>
<result property="introduce" column="introduce" javaType="java.lang.String"/>
<result property="state" column="state" javaType="java.lang.Integer"/>
<result property="phone" column="phone" javaType="java.lang.Integer"/>
</association>
</resultMap>
</mapper>