|
@@ -20,6 +20,7 @@ import com.xjrsoft.common.page.PageOutput;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
|
import com.xjrsoft.module.base.mapper.BaseClassMapper;
|
|
|
+import com.xjrsoft.module.organization.entity.Department;
|
|
|
import com.xjrsoft.module.student.dto.AddBaseStudentCadreDto;
|
|
|
import com.xjrsoft.module.student.dto.BaseStudentCadrePageDto;
|
|
|
import com.xjrsoft.module.student.dto.UpdateBaseStudentCadreDto;
|
|
@@ -140,6 +141,7 @@ public class BaseStudentCadreController {
|
|
|
.orderByDesc(BaseStudentCadre::getId)
|
|
|
.selectAs(BaseStudent::getStudentId, BaseStudentCadrePageVo::getStudentId)
|
|
|
.selectAs(XjrUser::getName, BaseStudentCadrePageVo::getUserName)
|
|
|
+ .selectAs(Department::getName, BaseStudentCadrePageVo::getOrgName)
|
|
|
.selectAs(BaseClass::getName, BaseStudentCadrePageVo::getClassName)
|
|
|
.selectAs(BaseStudentPost::getPost, BaseStudentCadrePageVo::getPost)
|
|
|
.selectAs(BaseStudentPost::getLevel, BaseStudentCadrePageVo::getLevel)
|
|
@@ -149,6 +151,7 @@ public class BaseStudentCadreController {
|
|
|
.innerJoin(BaseStudent.class, BaseStudent::getUserId, BaseStudentCadre::getUserId)
|
|
|
.innerJoin(BaseStudentPost.class, BaseStudentPost::getId, BaseStudentCadre::getPostId)
|
|
|
.leftJoin(BaseClass.class, BaseClass::getId, BaseStudentCadre::getClassId)
|
|
|
+ .leftJoin(Department.class, Department::getId, BaseStudentCadre::getOrgId)
|
|
|
.leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentCadre::getUserId)
|
|
|
);
|
|
|
|