老师表和区域表加字段，更新SQL

mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberList.java

@@ -107,6 +107,32 @@ public class MmxtMeiyuMemberList extends BaseEntity
      */
     private String memberIds;
 
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 地区ID
+     */
+    private Long regionId;
+
+    public Long getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Long regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     public String getMemberIds() {
         return memberIds;
     }

mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberTeacher.java

@@ -29,6 +29,10 @@ public class MmxtMeiyuMemberTeacher extends BaseEntity
     @Excel(name = "省市县")
     private String area;
 
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String address;
+
     /** 学校名称 */
     @Excel(name = "学校名称")
     private String schoolname;
@@ -53,6 +57,25 @@ public class MmxtMeiyuMemberTeacher extends BaseEntity
     @Excel(name = "审核意见")
     private String auditSuggest;
 
+    /** 地区ID */
+    private Long regionId;
+
+    public Long getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Long regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
     public String getAuditSuggest() {
         return auditSuggest;
     }

mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuRegion.java

@@ -22,10 +22,18 @@ public class MmxtMeiyuRegion extends BaseEntity
     @Excel(name = "区域名称")
     private String regionName;
 
+    /** 区域编码 */
+    @Excel(name = "区域编码")
+    private String regionCode;
+
     /** 父级ID */
     @Excel(name = "父级ID")
     private Long parentId;
 
+    /** 区域层级 */
+    @Excel(name = "区域层级")
+    private String level;
+
     /** 排序 */
     @Excel(name = "排序")
     private Long sort;
@@ -37,6 +45,22 @@ public class MmxtMeiyuRegion extends BaseEntity
     /** 删除标识 */
     private String delFlag;
 
+    public String getRegionCode() {
+        return regionCode;
+    }
+
+    public void setRegionCode(String regionCode) {
+        this.regionCode = regionCode;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
     public void setRegionId(Long regionId)
     {
         this.regionId = regionId;

mmxt-business/src/main/resources/mapper/business/MmxtMeiyuMemberListMapper.xml

@@ -30,6 +30,8 @@
         <result property="followedUserCount"    column="followed_user_count"    />
         <result property="friendCount"    column="friend_count"    />
         <result property="scores"    column="scores"    />
+        <result property="realName"    column="real_name"    />
+        <result property="regionId"    column="region_id"    />
     </resultMap>
 
     <resultMap type="com.mmxt.business.domain.vo.MmxtAdminMemberListVo" id="AdminMemberListVoResult">
@@ -40,7 +42,7 @@
     </resultMap>
 
     <sql id="selectAdminMemberListVo">
-        select member_id, member_name, nick_name, sex, avatar, password, weixin_openid, phonenumber, email, teacher_flag, group_id, area, address,signature, remark, status, create_siteid, create_time, last_logintime, del_flag,scores from mmxt_meiyu_member_list
+        select member_id, member_name,real_name, region_id,nick_name, sex, avatar, password, weixin_openid, phonenumber, email, teacher_flag, group_id, area, address,signature, remark, status, create_siteid, create_time, last_logintime, del_flag,scores from mmxt_meiyu_member_list
     </sql>
 
     <select id="selectAdminMemberListList" parameterType="com.mmxt.business.domain.MmxtMeiyuMemberList" resultMap="AdminMemberListResult">
@@ -64,7 +66,9 @@
         a.create_siteid,
         a.create_time,
         a.last_logintime,
-        a.scores
+        a.scores,
+        a.real_name,
+        a.region_id
         from mmxt_meiyu_member_list a
         <where>
             a.del_flag = 0
@@ -135,6 +139,8 @@
             <if test="createSiteid != null">create_siteid,</if>
             <if test="createTime != null">create_time,</if>
             <if test="lastLogintime != null">last_logintime,</if>
+            <if test="realName != null">real_name,</if>
+            <if test="regionId != null">region_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="memberName != null and memberName != ''">#{memberName},</if>
@@ -155,6 +161,8 @@
             <if test="createSiteid != null">#{createSiteid},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="lastLogintime != null">#{lastLogintime},</if>
+            <if test="realName != null">#{realName},</if>
+            <if test="regionId != null">#{regionId},</if>
         </trim>
     </insert>
 
@@ -177,6 +185,8 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="status != null">status = #{status},</if>
             <if test="lastLogintime != null">last_logintime = #{lastLogintime},</if>
+            <if test="realName != null">real_name = #{realName},</if>
+            <if test="regionId != null">region_id = #{regionId},</if>
         </trim>
         where member_id = #{memberId}
     </update>

mmxt-business/src/main/resources/mapper/business/MmxtMeiyuMemberTeacherMapper.xml

@@ -13,15 +13,18 @@
         <result property="relationTime"    column="relation_time"    />
         <result property="auditStatus"    column="audit_status"    />
         <result property="auditSuggest"    column="audit_suggest"    />
+        <result property="address"    column="address"    />
+        <result property="regionId"    column="region_id"    />
     </resultMap>
 
     <sql id="selectAdminMemberTeacherVo">
-        select member_id, area, schoolname, teacher_type, document_url, relation_time, audit_status,audit_suggest from mmxt_meiyu_member_teacher
+        select member_id,region_id, area, address,schoolname, teacher_type, document_url, relation_time, audit_status,audit_suggest from mmxt_meiyu_member_teacher
     </sql>
 
     <select id="selectAdminMemberTeacherList" parameterType="com.mmxt.business.domain.MmxtMeiyuMemberTeacher" resultMap="AdminMemberTeacherResult">
         SELECT
         a.member_id,
+        a.region_id,
         a.area,
         a.schoolname,
         a.teacher_type,
@@ -29,6 +32,7 @@
         a.relation_time,
         a.audit_status,
         a.audit_suggest,
+        a.address,
         b.nick_name as nickName
         FROM
         mmxt_meiyu_member_teacher a LEFT JOIN mmxt_meiyu_member_list b on a.member_id = b.member_id
@@ -65,6 +69,8 @@
             <if test="relationTime != null">relation_time,</if>
             <if test="auditStatus != null">audit_status,</if>
             <if test="auditSuggest != null">audit_suggest,</if>
+            <if test="address != null">address,</if>
+            <if test="regionId != null">region_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="memberId != null">#{memberId},</if>
@@ -75,6 +81,8 @@
             <if test="relationTime != null">#{relationTime},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
             <if test="auditSuggest != null">#{auditSuggest},</if>
+            <if test="address != null">#{address},</if>
+            <if test="regionId != null">#{regionId},</if>
         </trim>
     </insert>
 
@@ -88,6 +96,8 @@
             <if test="relationTime != null">relation_time = #{relationTime},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
             <if test="auditSuggest != null">audit_suggest = #{auditSuggest},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="regionId != null">region_id = #{regionId},</if>
         </trim>
         where member_id = #{memberId}
     </update>

mmxt-business/src/main/resources/mapper/business/MmxtMeiyuRegionMapper.xml

@@ -16,10 +16,12 @@
         <result property="updateTime"    column="update_time"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="remark"    column="remark"    />
+        <result property="regionCode"    column="region_code"    />
+        <result property="level"    column="level"    />
     </resultMap>
 
     <sql id="selectMmxtMeiyuRegionVo">
-        select region_id, region_name, parent_id, sort, status, create_by, create_time, update_by, update_time, del_flag, remark from mmxt_meiyu_region
+        select region_id, region_name,region_code,level, parent_id, sort, status, create_by, create_time, update_by, update_time, del_flag, remark from mmxt_meiyu_region
     </sql>
 
     <select id="selectMmxtMeiyuRegionList" parameterType="com.mmxt.business.domain.MmxtMeiyuRegion" resultMap="MmxtMeiyuRegionResult">
@@ -63,6 +65,8 @@
             <if test="updateTime != null">update_time,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="remark != null">remark,</if>
+            <if test="regionCode != null">region_code,</if>
+            <if test="level != null">level,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="regionName != null">#{regionName},</if>
@@ -75,6 +79,8 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="regionCode != null">#{regionCode},</if>
+            <if test="level != null">#{level},</if>
         </trim>
     </insert>
 
@@ -91,6 +97,8 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="regionCode != null">region_code = #{regionCode},</if>
+            <if test="level != null">level = #{level},</if>
         </trim>
         where region_id = #{regionId}
     </update>