|
|
@@ -7,12 +7,14 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import com.github.yulichang.toolkit.MPJWrappers;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
import com.xjrsoft.common.enums.GenderDictionaryEnum;
|
|
|
import com.xjrsoft.common.model.result.R;
|
|
|
import com.xjrsoft.common.page.ConventPage;
|
|
|
import com.xjrsoft.common.page.PageOutput;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
+import com.xjrsoft.module.attendance.entity.StudentAttendanceRecord;
|
|
|
import com.xjrsoft.module.organization.entity.UserDeptRelation;
|
|
|
import com.xjrsoft.module.organization.service.IUserDeptRelationService;
|
|
|
import com.xjrsoft.module.system.entity.DictionaryDetail;
|
|
|
@@ -63,8 +65,7 @@ public class TeacherbaseManagerController {
|
|
|
@SaCheckPermission("teacherbasemanager:detail")
|
|
|
public R page(@Valid XjrUserPageDto dto){
|
|
|
|
|
|
- MPJLambdaWrapper<XjrUser> queryWrapper = new MPJLambdaWrapper<>();
|
|
|
- queryWrapper
|
|
|
+ MPJLambdaWrapper<XjrUser> queryWrapper = MPJWrappers.<XjrUser>lambdaJoin()
|
|
|
.disableSubLogicDel()
|
|
|
.like(StrUtil.isNotBlank(dto.getUserName()),XjrUser::getUserName,dto.getUserName())
|
|
|
.like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
|
|
|
@@ -81,7 +82,7 @@ public class TeacherbaseManagerController {
|
|
|
.leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
|
|
|
.selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
|
|
|
|
|
|
- IPage<XjrUser> page = teacherbaseManagerService.page(ConventPage.getPage(dto), queryWrapper);
|
|
|
+ IPage<XjrUserPageVo> page = teacherbaseManagerService.selectJoinListPage(ConventPage.getPage(dto),XjrUserPageVo.class, queryWrapper);
|
|
|
|
|
|
PageOutput<XjrUserPageVo> pageOutput = ConventPage.getPageOutput(page, XjrUserPageVo.class);
|
|
|
|