助学金项目查询,增加项目中文

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

@@ -1,34 +1,35 @@
 package com.xjrsoft.module.student.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-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.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.student.dto.AddBaseStudentBursariesProjectDto;
-import com.xjrsoft.module.student.dto.UpdateBaseStudentBursariesProjectDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.student.dto.BaseStudentBursariesProjectPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentBursariesProjectDto;
 import com.xjrsoft.module.student.entity.BaseStudentBursariesProject;
 import com.xjrsoft.module.student.service.IBaseStudentBursariesProjectService;
 import com.xjrsoft.module.student.vo.BaseStudentBursariesProjectPageVo;
-
 import com.xjrsoft.module.student.vo.BaseStudentBursariesProjectVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -50,12 +51,14 @@ public class BaseStudentBursariesProjectController {
     @ApiOperation(value="助学金项目列表(分页)")
     @SaCheckPermission("basestudentbursariesproject:detail")
     public RT<PageOutput<BaseStudentBursariesProjectPageVo>> page(@Valid BaseStudentBursariesProjectPageDto dto){
+        IPage<BaseStudentBursariesProjectPageVo> page = baseStudentBursariesProjectService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentBursariesProjectPageVo.class,
+                MPJWrappers.<BaseStudentBursariesProject>lambdaJoin()
+                .selectAs(DictionaryDetail::getName, BaseStudentBursariesProjectPageVo::getBursariesTypeCn)
+                .select(BaseStudentBursariesProject.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesProjectPageVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentBursariesProject::getBursariesType)
+                .orderByAsc(BaseStudentBursariesProject::getSortCode)
+        );
 
-        LambdaQueryWrapper<BaseStudentBursariesProject> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(BaseStudentBursariesProject::getId)
-                .select(BaseStudentBursariesProject.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesProjectPageVo.class).contains(x.getProperty()));
-        IPage<BaseStudentBursariesProject> page = baseStudentBursariesProjectService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseStudentBursariesProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBursariesProjectPageVo.class);
         return RT.ok(pageOutput);
     }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentBursariesProjectPageVo.java

@@ -70,6 +70,13 @@ public class BaseStudentBursariesProjectPageVo {
     */
     @ApiModelProperty("助学金类型(xjr_dictionary_item[bursaries_type])")
     private String bursariesType;
+
+    /**
+     * 助学金类型-中文
+     */
+    @ApiModelProperty("助学金类型-中文")
+    private String bursariesTypeCn;
+
     /**
     * 学期ID(base_semester)
     */