From 1c289fd8aa6376ff13a582f07c2e38f2044341ff Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Sat, 15 May 2021 21:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=A2=9E=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8A=A5=E5=90=8D=E6=9C=BA=E6=9E=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/com/tenlion/pojo/dtos/apply/ApplyDTO.java  | 10 ++++++++++
 .../resources/mybatis/mapper/apply/apply-mapper.xml    |  7 +++++++
 2 files changed, 17 insertions(+)

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 @@
 
     <resultMap id="applyDTO" type="cn.com.tenlion.pojo.dtos.apply.ApplyDTO">
         <result column="apply_institution_id" property="applyInstitutionId"/>
+        <result column="apply_institution_name" property="applyInstitutionName"/>
         <result column="apply_id" property="applyId"/>
         <result column="apply_class_id" property="applyClassId"/>
         <result column="apply_class_name" property="applyClassName"/>
@@ -275,6 +276,7 @@
     <select id="get" parameterType="map" resultMap="applyDTO">
         SELECT
             t1.apply_institution_id,
+            m1.institution_name AS apply_institution_name,
             t1.apply_class_id,
             t1.apply_class_name,
             t1.apply_work_type_id,
@@ -316,6 +318,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
             <if test="applyId != null and applyId != ''">
@@ -410,6 +414,7 @@
     <select id="list" parameterType="map" resultMap="applyDTO">
         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
         <if test="keywords != null and keywords != ''">