diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java index 9cb2409..31da470 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java @@ -16,6 +16,8 @@ public class ApplyDTO { @ApiModelProperty(name = "applyInstitutionId", value = "报名机构ID") private String applyInstitutionId; + @ApiModelProperty(name = "applyInstitutionName", value = "报名机构中文名称") + private String applyInstitutionName; @ApiModelProperty(name = "applyId", value = "报名信息ID") private String applyId; @ApiModelProperty(name = "applyClassId", value = "报名班级ID") @@ -96,6 +98,14 @@ public class ApplyDTO { this.applyInstitutionId = applyInstitutionId; } + public String getApplyInstitutionName() { + return applyInstitutionName; + } + + public void setApplyInstitutionName(String applyInstitutionName) { + this.applyInstitutionName = applyInstitutionName; + } + public String getApplyId() { return applyId == null ? "" : applyId.trim(); } diff --git a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml index 476a304..8a2c403 100644 --- a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml @@ -4,6 +4,7 @@ + @@ -275,6 +276,7 @@ SELECT t1.apply_institution_id, + m1.institution_name AS apply_institution_name, t1.apply_id, t1.apply_class_id, t1.apply_class_name, @@ -451,6 +456,8 @@ ON t1.apply_physical_state = t5.data_id LEFT JOIN e_work_type e1 ON t1.apply_work_type_id = e1.work_type_id + LEFT JOIN m_institution m1 + ON t1,apply_institution_id = m1.institution_id WHERE t1.is_delete = 0