diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java index 359ff495a..26f803b4b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -46,7 +47,7 @@ public class VolunteerInfoDTO implements Serializable { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女,1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java index 1696f9f45..27933901e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java @@ -31,7 +31,7 @@ public class EpdcAdjustVolunteerPointsDTO implements Serializable { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女,1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java index c98ad069d..9b5bc2b5f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java @@ -22,7 +22,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女,1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java index cb4584672..cf4e9c810 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java @@ -46,7 +46,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女,1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java index b9822bcdd..403771953 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java @@ -38,7 +38,7 @@ public class VolunteerInfoExcel { private String userId; @Excel(name = "姓名") - private String fullName; + private String realName; @Excel(name = "性别(0-女,1-男)") private String sex; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index d04a99f38..725554e52 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -6,7 +6,7 @@ - + @@ -41,7 +41,7 @@ SELECT v.ID id, v.USER_ID userId, - v.FULL_NAME fullName, + v.REAL_NAME realName, v.SEX sex, v.BIRTHDAY birthday, date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString, @@ -55,8 +55,8 @@ FROM epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID where 1=1 - - and v.FULL_NAME = #{fullName} + + and v.REAL_NAME = #{realName} and v.MOBILE = #{mobile} @@ -74,8 +74,8 @@ FROM epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID where 1=1 - - and v.FULL_NAME = #{fullName} + + and v.REAL_NAME = #{realName} and v.MOBILE = #{mobile} @@ -90,7 +90,7 @@ SELECT v.ID id, v.USER_ID userId, - v.FULL_NAME fullName, + v.REAL_NAME realName, v.SEX sex, v.BIRTHDAY birthday, date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString, @@ -109,7 +109,7 @@