Merge remote-tracking branch 'origin/dev' into release

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;
 
-}
+    /**
+     * 志愿者注册，所在网格ID
+     */
+    private String gridId;
+
+    /**
+     * 志愿者注册，所在网格名称
+     */
+    private String gridName;
+}

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;
 }

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;
 }

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.46
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.47
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.46</version>
+    <version>0.0.47</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

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;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -151,6 +151,9 @@ 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());
+                // 遗留数据处理，如果表中数据为空，一律返回null，前端重新获取 网格信息
+                resultDTO.setGridId( "".equals(dto.getGridId()) ? null : dto.getGridId());
+                resultDTO.setGridName( "".equals(dto.getGridName()) ? null : dto.getGridName());
             }
         } else {
             logger.error("获取用户基本信息失败");

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.3__addgridIdAndgridName.sql

@@ -0,0 +1 @@
+ALTER TABLE volunteer_info ADD ( GRID_ID VARCHAR ( 64 ) NOT NULL COMMENT '网格id', GRID_NAME VARCHAR ( 256 ) NOT NULL COMMENT '网格名称' );

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}

epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.81
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.83
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.81</version>
+    <version>0.3.83</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -606,7 +606,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             processorList.setParentAgencyList(parentAgencyList);
         }
         //3:迭代查询当前组织的所有下级组织列表
-        List<AgencySubResultDTO> subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : ":") + entity.getId());
+        List<AgencySubResultDTO> subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : entity.getPids() + ":") + entity.getId());
         processorList.setSubAgencyList(subAgencyList);
 
         return processorList;