From a44a04fca76a7998d66e2d6b662804e54cd3a940 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 11 Aug 2020 16:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=81=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=20=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BCid=E3=80=81=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/VolunteerInfoDTO.java    | 11 ++++++++++-
 .../form/resi/ResiVolunteerAuthenticateFormDTO.java  | 12 ++++++++++++
 .../dto/result/resi/ResiVolunteerInfoResultDTO.java  | 10 ++++++++++
 .../java/com/epmet/entity/VolunteerInfoEntity.java   |  9 +++++++++
 .../epmet/service/impl/VolunteerInfoServiceImpl.java |  2 ++
 .../src/main/resources/mapper/VolunteerInfoDao.xml   | 12 +++++++++++-
 6 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java
index e0f352bc70..b309d9a7d5 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java
@@ -88,4 +88,13 @@ public class VolunteerInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+    /**
+     * 志愿者注册，所在网格ID
+     */
+    private String gridId;
+
+    /**
+     * 志愿者注册，所在网格名称
+     */
+    private String gridName;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java
index be0ea43393..0a42ede194 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java
@@ -120,4 +120,16 @@ public class ResiVolunteerAuthenticateFormDTO implements Serializable {
      * 移动端决定是否上送验证码。
      */
     private String smsCode;
+
+    /**
+     * 志愿者注册，所在网格ID
+     */
+    @NotBlank(message = "志愿者注册，所在网格ID不能为空", groups = {AddUserShowGroup.class })
+    private String gridId;
+
+    /**
+     * 志愿者注册，所在网格名称
+     */
+    @NotBlank(message = "志愿者注册，所在网格名称不能为空", groups = {AddUserShowGroup.class })
+    private String gridName;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java
index 20995ac5a4..8cf97d826c 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java
@@ -83,4 +83,14 @@ public class ResiVolunteerInfoResultDTO implements Serializable {
      * 志愿者自我介绍
      */
     private String volunteerIntroduce;
+
+    /**
+     * 志愿者注册，所在网格ID
+     */
+    private String gridId;
+
+    /**
+     * 志愿者注册，所在网格名称
+     */
+    private String gridName;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
index 484e911fe1..fcce38bc75 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
@@ -58,4 +58,13 @@ public class VolunteerInfoEntity extends BaseEpmetEntity {
      */
 	private String volunteerSignature;
 
+	/**
+	 * 志愿者注册，所在网格ID
+	 */
+	private String gridId;
+
+	/**
+	 * 志愿者注册，所在网格名称
+	 */
+	private String gridName;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index e9c52e460f..05e31890dc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -151,6 +151,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
                 VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId());
                 resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce() == null ? "" : dto.getVolunteerIntroduce());
                 resultDTO.setVolunteerSignature(dto.getVolunteerSignature() == null ? "" : dto.getVolunteerSignature());
+                resultDTO.setGridId(dto.getGridId() == null ? "" : dto.getGridId());
+                resultDTO.setGridName(dto.getGridName() == null ? "" : dto.getGridName());
             }
         } else {
             logger.error("获取用户基本信息失败");
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
index d61441ce29..9f9f3ae44e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -5,6 +5,8 @@
 
     <resultMap type="com.epmet.entity.VolunteerInfoEntity" id="volunteerInfoMap">
         <result property="id" column="ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
         <result property="userId" column="USER_ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="volunteerIntroduce" column="VOLUNTEER_INTRODUCE"/>
@@ -40,6 +42,12 @@
         <if test="userId != null and userId != ''">
             UPDATED_BY = #{userId},
         </if>
+        <if test="gridId != null and gridId != ''">
+            GRID_ID = #{gridId},
+        </if>
+        <if test="gridName != null and gridName != ''">
+            GRID_NAME = #{gridName},
+        </if>
         UPDATED_TIME = now()
         WHERE DEL_FLAG = '0'
         AND USER_ID = #{userId}
@@ -49,7 +57,9 @@
         SELECT
           CUSTOMER_ID customerId,
           VOLUNTEER_INTRODUCE volunteerIntroduce,
-          VOLUNTEER_SIGNATURE volunteerSignature
+          VOLUNTEER_SIGNATURE volunteerSignature,
+          GRID_ID gridId,
+          GRID_NAME gridName
         FROM volunteer_info
         WHERE DEL_FLAG = '0'
         AND USER_ID = #{userId}