|
|
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
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;
|
|
|
@@ -76,8 +77,13 @@ public class TeacherbaseManagerController {
|
|
|
.selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
|
|
|
|
|
|
IPage<XjrUser> page = teacherbaseManagerService.page(ConventPage.getPage(dto), queryWrapper);
|
|
|
+
|
|
|
PageOutput<XjrUserPageVo> pageOutput = ConventPage.getPageOutput(page, XjrUserPageVo.class);
|
|
|
|
|
|
+ for (XjrUserPageVo record : pageOutput.getList()) {
|
|
|
+ record.setGenderCn(GenderDictionaryEnum.getValue(record.getGender()));
|
|
|
+ }
|
|
|
+
|
|
|
return R.ok(pageOutput);
|
|
|
}
|
|
|
|
|
|
@@ -89,7 +95,9 @@ public class TeacherbaseManagerController {
|
|
|
if (xjrUser == null) {
|
|
|
return R.error("找不到此数据!");
|
|
|
}
|
|
|
- return R.ok(BeanUtil.toBean(xjrUser, XjrUserVo.class));
|
|
|
+ XjrUserVo userVo = BeanUtil.toBean(xjrUser, XjrUserVo.class);
|
|
|
+ userVo.setGenderCn(GenderDictionaryEnum.getValue(userVo.getGender()));
|
|
|
+ return R.ok(userVo);
|
|
|
}
|
|
|
|
|
|
|