From 4922efba614ecd0adc1798eaa92c018f5a74318e Mon Sep 17 00:00:00 2001 From: tianziyan <2217423348@qq.com> Date: Thu, 22 Jan 2026 17:07:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=81=E5=B8=88=E8=A1=A8=E5=92=8C=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=A1=A8=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/MmxtMeiyuMemberList.java | 26 +++++++++++++++++++ .../domain/MmxtMeiyuMemberTeacher.java | 23 ++++++++++++++++ .../mmxt/business/domain/MmxtMeiyuRegion.java | 24 +++++++++++++++++ .../business/MmxtMeiyuMemberListMapper.xml | 14 ++++++++-- .../business/MmxtMeiyuMemberTeacherMapper.xml | 12 ++++++++- .../mapper/business/MmxtMeiyuRegionMapper.xml | 10 ++++++- 6 files changed, 105 insertions(+), 4 deletions(-) diff --git a/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberList.java b/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberList.java index 129d069f..d4a47594 100644 --- a/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberList.java +++ b/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; } diff --git a/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberTeacher.java b/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberTeacher.java index 414ed3c0..41b8f93c 100644 --- a/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuMemberTeacher.java +++ b/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; } diff --git a/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuRegion.java b/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuRegion.java index 1787e9c2..b58fc5c4 100644 --- a/mmxt-business/src/main/java/com/mmxt/business/domain/MmxtMeiyuRegion.java +++ b/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; diff --git a/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuMemberListMapper.xml b/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuMemberListMapper.xml index 53444af2..d6e542fe 100644 --- a/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuMemberListMapper.xml +++ b/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuMemberListMapper.xml @@ -30,6 +30,8 @@ + + @@ -40,7 +42,7 @@ - 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 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 @@ relation_time, audit_status, audit_suggest, + address, + region_id, #{memberId}, @@ -75,6 +81,8 @@ #{relationTime}, #{auditStatus}, #{auditSuggest}, + #{address}, + #{regionId}, @@ -88,6 +96,8 @@ relation_time = #{relationTime}, audit_status = #{auditStatus}, audit_suggest = #{auditSuggest}, + address = #{address}, + region_id = #{regionId}, where member_id = #{memberId} diff --git a/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuRegionMapper.xml b/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuRegionMapper.xml index e3bf331a..9da58fb4 100644 --- a/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuRegionMapper.xml +++ b/mmxt-business/src/main/resources/mapper/business/MmxtMeiyuRegionMapper.xml @@ -16,10 +16,12 @@ + + - 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