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

2、助学金名单查询,增加银行类别中文

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

@@ -59,13 +59,13 @@ public class BaseStudentBursariesApplicantController {
         IPage<BaseStudentBursariesApplicantPageVo> page = baseStudentBursariesApplicantService.selectJoinListPage(
                 ConventPage.getPage(dto), BaseStudentBursariesApplicantPageVo.class,
                 MPJWrappers.<BaseStudentBursariesApplicant>lambdaJoin()
-                        .eq(BaseStudentBursariesApplicant::getBaseStudentBursariesProjectId, dto.getProjectId())
-                        .select(BaseStudentBursariesStudent::getId)
-                        .selectAs(DictionaryDetail::getName, BaseStudentBursariesApplicantPageVo::getBankTypeCn)
-                        .select(BaseStudentBursariesApplicant.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesApplicantPageVo.class).contains(x.getProperty()))
-                        .leftJoin(BaseStudentBursariesStudent.class,BaseStudentBursariesStudent::getBaseStudentBursariesApplicantId,BaseStudentBursariesApplicant::getId)
-                        .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentBursariesStudent::getBankType)
-                        .select(BaseStudentBursariesStudent.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesApplicantPageVo.class).contains(x.getProperty()))
+                .eq(BaseStudentBursariesApplicant::getBaseStudentBursariesProjectId, dto.getProjectId())
+                .select(BaseStudentBursariesStudent::getId)
+                .selectAs(DictionaryDetail::getName, BaseStudentBursariesApplicantPageVo::getBankTypeCn)
+                .select(BaseStudentBursariesApplicant.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesApplicantPageVo.class).contains(x.getProperty()))
+                .leftJoin(BaseStudentBursariesStudent.class,BaseStudentBursariesStudent::getBaseStudentBursariesApplicantId,BaseStudentBursariesApplicant::getId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentBursariesStudent::getBankType)
+                .select(BaseStudentBursariesStudent.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBursariesApplicantPageVo.class).contains(x.getProperty()))
 //                        .selectAs(BaseStudentBursariesStudent::getGradeName, BaseStudentBursariesApplicantPageVo::getGradeName)
         );
         PageOutput<BaseStudentBursariesApplicantPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBursariesApplicantPageVo.class);

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

@@ -52,11 +52,11 @@ public class BaseStudentBursariesProjectController {
     @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)
+            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)
         );
 
         PageOutput<BaseStudentBursariesProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBursariesProjectPageVo.class);

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

@@ -112,7 +112,7 @@ public class BaseStudentBursariesApplicantPageVo {
     /**
      * 银行类别
      */
-    @ApiModelProperty("银行类别-中文")
+    @ApiModelProperty("银行卡类别-中文")
     private String bankTypeCn;
 
 }

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

@@ -74,7 +74,7 @@ public class BaseStudentBursariesProjectPageVo {
     /**
      * 助学金类型-中文
      */
-    @ApiModelProperty("助学金类型-中文")
+    @ApiModelProperty("助学金类型 - 中文")
     private String bursariesTypeCn;
 
     /**