Merge remote-tracking branch 'origin/dev_5big_coverage'

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java

@@ -77,6 +77,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 地址
+     */
+    private String address;
+
     /**
      * 社区自组织人员
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java

@@ -72,6 +72,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 地址
+     */
+    private String address;
+
     /**
      * 备注
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -87,6 +87,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 地址
+     */
+    private String address;
+
     /**
      * 社区自组织ID
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java

@@ -107,6 +107,11 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+    /**
+     * 地址
+     */
+    private String address;
+
     /**
      * 备注
      */

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

@@ -605,7 +605,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                             }
                         });*/
                         persons = ConvertUtils.sourceToTarget(l.getPersons(), IcCommunitySelfOrganizationPersonnelEntity.class);
-                        Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupByPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone));
+                        Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupByPhone = CollectionUtils.isNotEmpty(persons) ? persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)) : new HashMap<>();
                         List<String> phones = new ArrayList<>();
                         groupByPhone.forEach((k,v) -> {
                             if (v.size() > NumConstant.ONE){

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.21__selforg_address.sql

@@ -0,0 +1 @@
+alter TABLE ic_community_self_organization add COLUMN ADDRESS VARCHAR(256) COMMENT '地址' AFTER LATITUDE;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -17,7 +17,8 @@
             REMARK = #{remark},
             UPDATED_TIME = NOW(),
             UPDATED_BY = #{updatedBy},
-            CATEGORY_CODE =#{categoryCode}
+            CATEGORY_CODE =#{categoryCode},
+            ADDRESS = #{address}
         WHERE DEL_FLAG = 0
           AND ID = #{orgId}
     </update>
@@ -60,6 +61,7 @@
             so.SERVICE_ITEM AS serviceItem,
             so.LONGITUDE AS longitude,
             so.LATITUDE AS latitude,
+            so.ADDRESS as address,
             so.ID as orgId,
             so.remark
         FROM ic_community_self_organization so