|
|
@@ -13,6 +13,7 @@ import com.xjrsoft.common.page.PageOutput;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.module.base.entity.BaseSemester;
|
|
|
import com.xjrsoft.module.internship.dto.AddInternshipTeacherCollectDto;
|
|
|
+import com.xjrsoft.module.internship.dto.InternshipTeacherCollectEnrollExamPageDto;
|
|
|
import com.xjrsoft.module.internship.dto.InternshipTeacherCollectEnrollPageDto;
|
|
|
import com.xjrsoft.module.internship.dto.InternshipTeacherCollectPageDto;
|
|
|
import com.xjrsoft.module.internship.dto.UpdateInternshipTeacherCollectDto;
|
|
|
@@ -122,7 +123,7 @@ public class InternshipTeacherCollectController {
|
|
|
@ApiOperation(value="实习带队教师报名表审核列表(分页)")
|
|
|
@SaCheckPermission("internshipteachercollectenroll:detail")
|
|
|
@XjrLog(value = "实习带队教师报名表审核列表(分页)")
|
|
|
- public RT<PageOutput<InternshipTeacherCollectEnrollExamPageVo>> page(@Valid InternshipTeacherCollectEnrollPageDto dto){
|
|
|
+ public RT<PageOutput<InternshipTeacherCollectEnrollExamPageVo>> page(@Valid InternshipTeacherCollectEnrollExamPageDto dto){
|
|
|
|
|
|
MPJLambdaWrapper<InternshipTeacherCollectEnroll> queryWrapper = new MPJLambdaWrapper<>();
|
|
|
queryWrapper
|
|
|
@@ -131,6 +132,7 @@ public class InternshipTeacherCollectController {
|
|
|
.select(User::getMobile)
|
|
|
.select(User::getUserName)
|
|
|
.innerJoin(User.class, User::getId, InternshipTeacherCollectEnroll::getUserId)
|
|
|
+ .eq(InternshipTeacherCollectEnroll::getInternshipTeacherCollectId, dto.getInternshipTeacherCollectId())
|
|
|
.orderByDesc(InternshipTeacherCollect::getId);
|
|
|
IPage<InternshipTeacherCollectEnrollExamPageVo> page = internshipTeacherCollectEnrollService.selectJoinListPage(ConventPage.getPage(dto), InternshipTeacherCollectEnrollExamPageVo.class, queryWrapper);
|
|
|
PageOutput<InternshipTeacherCollectEnrollExamPageVo> pageOutput = ConventPage.getPageOutput(page, InternshipTeacherCollectEnrollExamPageVo.class);
|