/student/schoolRollCategory/list 学籍异动类别列表(不分页) 返回getScholarshipSourceCN字段

src/main/java/com/xjrsoft/module/student/controller/SchoolRollCategoryController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
@@ -19,6 +20,7 @@ import com.xjrsoft.module.student.dto.UpdateSchoolRollCategoryDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
 import com.xjrsoft.module.student.dto.SchoolRollCategoryPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
 import com.xjrsoft.module.student.entity.BaseStudentPost;
 import com.xjrsoft.module.student.entity.BaseStudentScholarshipCategory;
 import com.xjrsoft.module.student.entity.SchoolRollCategory;
@@ -57,19 +59,14 @@ public class SchoolRollCategoryController {
     @ApiOperation(value="学籍异动类别列表(不分页)")
     @SaCheckPermission("schoolrollcategory:detail")
     public RT<List<SchoolRollCategoryVo>> list(@Valid SchoolRollCategoryPageDto dto){
-        MPJLambdaWrapper<SchoolRollCategory> queryWrapper= new MPJLambdaWrapper<>();
-        List<SchoolRollCategoryVo> list = schoolRollCategoryService.selectJoinList(SchoolRollCategoryVo.class,
-                queryWrapper.select(SchoolRollCategory::getId)
-                        .select(BaseStudentScholarshipCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentScholarshipCategoryPageVo.class).contains(x.getProperty()))
-//                        .leftJoin(DictionaryItem.class,DictionaryItem::getCode,"")
-//                        .leftJoin(DictionaryDetail.class, DictionaryDetail::getItemId, DictionaryItem::getId)
-        );
-//        MPJWrappers<SchoolRollCategory> queryWrapper = MPJWrappers.<SchoolRollCategory>lambdaJoin();
-//        queryWrapper
-//                .orderByDesc(SchoolRollCategory::getId)
-//                .select(SchoolRollCategory.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollCategoryPageVo.class).contains(x.getProperty()));
-//        IPage<SchoolRollCategory> page = schoolRollCategoryService.page(ConventPage.getPage(dto), queryWrapper);
-//        PageOutput<SchoolRollCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollCategoryPageVo.class);
+        MPJBaseJoin<SchoolRollCategory> queryWrapper =  MPJWrappers.<SchoolRollCategory>lambdaJoin()
+                .select(SchoolRollCategory::getId)
+                .selectAs(DictionaryDetail::getName,SchoolRollCategoryVo::getScholarshipSourceCN)
+                .select(SchoolRollCategory.class, x -> VoToColumnUtil.fieldsToColumns(SchoolRollCategoryVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, SchoolRollCategory::getScholarshipSource)
+                .orderByDesc(SchoolRollCategory::getId);
+        List<SchoolRollCategoryVo> list = schoolRollCategoryService.selectJoinList(SchoolRollCategoryVo.class, queryWrapper);
+
         return RT.ok(list);
     }