full_name字段改为real_name by 张勇

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-男)

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-男)

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-男)

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-男)

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;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -6,7 +6,7 @@
     <resultMap type="com.elink.esua.epdc.entity.VolunteerInfoEntity" id="volunteerInfoMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
-        <result property="fullName" column="FULL_NAME"/>
+        <result property="realName" column="REAL_NAME"/>
         <result property="sex" column="SEX"/>
         <result property="birthday" column="BIRTHDAY"/>
         <result property="mobile" column="MOBILE"/>
@@ -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
-        <if test="fullName !='' and fullName != null">
+        <if test="realName !='' and realName != null">
-            and v.FULL_NAME = #{fullName}
+            and v.REAL_NAME = #{realName}
         </if>
         <if test="mobile !='' and mobile != null">
             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
-        <if test="fullName !='' and fullName != null">
+        <if test="realName !='' and realName != null">
-            and v.FULL_NAME = #{fullName}
+            and v.REAL_NAME = #{realName}
         </if>
         <if test="mobile !='' and mobile != null">
             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 @@
     <select id="getVolunteerUserDefaultValue" resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
         SELECT
             eu.ID userId,
-            eu.REAL_NAME fullName,
+            eu.REAL_NAME realName,
             eu.MOBILE mobile,
             eu.IDENTITY_NO identityNo,
 			eugr.GRID_ID gridId,
@@ -155,7 +155,7 @@
         SELECT
             m.id,
             m.USER_ID as userId,
-            m.FULL_NAME as fullName,
+            m.REAL_NAME as realName,
             m.SEX,
             DATE_FORMAT(m.BIRTHDAY,'%Y-%m-%d') as birthday,
             m.MOBILE,