|
|
@@ -21,6 +21,7 @@ import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
|
|
|
import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
|
|
|
import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudent;
|
|
|
+import com.xjrsoft.module.student.entity.BaseStudentFamilyMember;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentUser;
|
|
|
import com.xjrsoft.module.student.service.IStudentManagerService;
|
|
|
@@ -80,7 +81,10 @@ public class StudentManagerController {
|
|
|
.leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentUser::getId)
|
|
|
.leftJoin("base_grade a on a.id = t2.grade_id")
|
|
|
.leftJoin("base_major_set b on b.id = t2.major_set_id")
|
|
|
- .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId));
|
|
|
+ .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)
|
|
|
+ .select("c.`mobile` as guardianPhone")
|
|
|
+ .select("c.`name` as guardianName")
|
|
|
+ .leftJoin("base_student_family_member c on c.user_id = t2.user_id"));
|
|
|
for (BaseStudentUserPageVo record : page.getRecords()) {
|
|
|
record.setGenderCn(GenderDictionaryEnum.getValue(record.getGender()));
|
|
|
}
|