奖学金，银行卡类别增加中文字段，并解决id null的问题

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

@@ -23,6 +23,7 @@ import com.xjrsoft.module.student.service.IBaseStudentScholarshipCategoryService
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantCategoryPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentScholarshipApplicantVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -67,10 +68,13 @@ public class BaseStudentScholarshipApplicantController {
                 .between(ObjectUtil.isNotNull(dto.getStartDate()) && ObjectUtil.isNotNull(dto.getEndDate()), BaseStudentScholarshipApplicant::getAwardDate,dto.getStartDate(),dto.getEndDate())
                 .eq(BaseStudentScholarshipApplicant::getBaseStudentScholarshipCategoryId,dto.getBaseStudentScholarshipCategoryId())
                 .orderByAsc(BaseStudentScholarshipApplicant::getSortCode)
+                .selectAs(BaseStudentScholarshipApplicant::getId, BaseStudentScholarshipApplicantPageVo::getId)
+                .selectAs(DictionaryDetail::getName, BaseStudentScholarshipApplicantPageVo::getBankTypeCn)
                 .selectAs(BaseSemester::getName, BaseStudentScholarshipApplicantPageVo::getSemesterName)
                 .select(BaseStudentScholarshipApplicant.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentScholarshipApplicantPageVo.class).contains(x.getProperty()))
                 .innerJoin(BaseStudentScholarshipCategory.class, BaseStudentScholarshipCategory::getId, BaseStudentScholarshipApplicant::getBaseStudentScholarshipCategoryId)
                 .leftJoin(BaseSemester.class, BaseSemester::getId, BaseStudentScholarshipApplicant::getBaseSemesterId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseStudentScholarshipApplicant::getBankType)
         );
         PageOutput<BaseStudentScholarshipApplicantPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentScholarshipApplicantPageVo.class);
         return RT.ok(pageOutput);

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

@@ -120,6 +120,10 @@ public class BaseStudentScholarshipApplicantPageVo {
     */
     @ApiModelProperty("收款银行(xjr_dictionary_item[bank_type])")
     private String bankType;
+
+    @ApiModelProperty("收款银行-中文")
+    private String bankTypeCn;
+
     /**
     * 银行卡号
     */