From 38f985fda787ba01df7f81328842313994894635 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 18 May 2022 10:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=B1=BB,=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B7=B2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AddCommunitySelfOrganizationFormDTO.java     | 16 ++++++++++------
 .../IcCommunitySelfOrganizationServiceImpl.java  | 10 +++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
index c88f3a6192..29a338232f 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java
@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -18,12 +20,13 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
 
     private static final long serialVersionUID = -4996925380900678065L;
 
-    public interface AddCommunitySelfOrganizationForm{}
+    public interface AddCommunitySelfOrganizationForm extends CustomerClientShowGroup {}
 
     /**
      * 组织名称
      */
-    @NotBlank(message = "organizationName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "组织名称不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @Length(max = 50,message = "组织名称最多输入50字",groups = AddCommunitySelfOrganizationForm.class)
     private String organizationName;
 
     @NotBlank(message = "分类不能为空", groups = AddCommunitySelfOrganizationForm.class)
@@ -32,25 +35,25 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
     /**
      * 组织人数
      */
-    @NotNull(message = "organizationPersonCount不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotNull(message = "组织人数不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private Integer organizationPersonCount;
 
     /**
      * 负责人姓名
      */
-    @NotBlank(message = "principalName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "负责人不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private String principalName;
 
     /**
      * 负责人电话
      */
-    @NotBlank(message = "principalPhone不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "联系电话",groups = AddCommunitySelfOrganizationForm.class)
     private String principalPhone;
 
     /**
      * 服务事项
      */
-    @NotBlank(message = "serviceItem不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "服务事项不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private String serviceItem;
 
     /**
@@ -66,6 +69,7 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
     /**
      * 经度
      */
+    @NotBlank(message = "位置坐标不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private String longitude;
 
     /**
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index d7e53e3483..6e51228e0f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -318,6 +318,11 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         formDTO.setCustomerId(tokenDto.getCustomerId());
         final int[] i = {(formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE};
         CommunitySelfOrganizationListResultDTO result = new CommunitySelfOrganizationListResultDTO();
+
+        //获取分类名称字典
+        Result<Map<String, String>> dictMapRes=adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
+        Map<String, String> dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>();
+
         if (formDTO.getIsPage()){
             PageInfo<CommunitySelfOrganizationListDTO> objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectCommunitySelfOrganizationList(formDTO));
             result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal())));
@@ -326,6 +331,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     l.setSort(i[NumConstant.ZERO]);
                     i[NumConstant.ZERO]++;
                     l.setScore(null == pointMap.get(l.getOrgId()) ? NumConstant.ZERO : pointMap.get(l.getOrgId()));
+                    //赋值分类名称
+                    l.setCategoryName(dictMap.get(l.getCategoryCode()));
                 }
                 result.setList(objectPageInfo.getList());
             }
@@ -333,9 +340,6 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         }
         List<CommunitySelfOrganizationListDTO> resultDTOs = baseDao.selectCommunitySelfOrganizationList(formDTO);
         if (CollectionUtils.isNotEmpty(resultDTOs)){
-            //获取分类名称字典
-            Result<Map<String, String>> dictMapRes=adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
-            Map<String, String> dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>();
             result.setTotal(resultDTOs.size());
             AtomicReference<Integer> sort = new AtomicReference<>(NumConstant.ONE);
             for (CommunitySelfOrganizationListDTO r : resultDTOs) {