Browse Source

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

dzx 1 year ago
parent
commit
d3370022f9

+ 3 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentBursariesApplicantController.java

@@ -20,6 +20,7 @@ import com.xjrsoft.module.student.service.IBaseStudentBursariesApplicantService;
 import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentBursariesApplicantVo;
 import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -60,8 +61,10 @@ public class BaseStudentBursariesApplicantController {
                 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()))
 //                        .selectAs(BaseStudentBursariesStudent::getGradeName, BaseStudentBursariesApplicantPageVo::getGradeName)
         );

+ 6 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentBursariesApplicantPageVo.java

@@ -109,4 +109,10 @@ public class BaseStudentBursariesApplicantPageVo {
     @ApiModelProperty("申请金额")
     private Double applicantAmount;
 
+    /**
+     * 银行类别
+     */
+    @ApiModelProperty("银行类别-中文")
+    private String bankTypeCn;
+
 }