From 59e8a2fdb7b1fdcacbad04f6e4d5a6189aca77ec Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 20 Jun 2022 13:53:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommunitySelfOrganizationListFormDTO.java |  2 ++
 ...IcCommunitySelfOrganizationController.java | 11 ++++++++
 .../IcCommunitySelfOrganizationService.java   |  7 +++++
 ...cCommunitySelfOrganizationServiceImpl.java | 26 +++++++++++++++++++
 .../mapper/IcCommunitySelfOrganizationDao.xml |  7 ++++-
 5 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java
index 7a8fba0899..30c0584e95 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java
@@ -50,4 +50,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable {
     private String remark;
 
     private String categoryCode;
+    //查详情时候用
+    private String orgId;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
index 399e9c7e81..ccdc9c79d7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
@@ -255,6 +255,17 @@ public class IcCommunitySelfOrganizationController {
         return new Result<CommunitySelfOrganizationListResultDTO>().ok(icCommunitySelfOrganizationService.communitySelfOrganizationList(tokenDto, formDTO));
     }
 
+    /**
+     * 社区自组织详情
+     * @param orgId 社区自组织id
+     * @return
+     */
+    @PostMapping("community-self-org-detail/{orgId}")
+    public Result<CommunitySelfOrganizationListDTO> communitySelfOrganizationDetail(@LoginUser TokenDto tokenDto,@PathVariable("orgId") String orgId){
+        return new Result<CommunitySelfOrganizationListDTO>().ok(icCommunitySelfOrganizationService.communitySelfOrganizationDetail(orgId,tokenDto.getCustomerId()));
+    }
+
+
     /**
      * @Description  社区自组织删除
      * @param formDTO
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
index 14008a7ce2..1da3a3137e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java
@@ -181,4 +181,11 @@ public interface IcCommunitySelfOrganizationService extends BaseService<IcCommun
      * @return
      */
     PageData<CommunitySelfOrganizationListDTO> queryCoordinateList(CategorySelfOrgFormDTO formDTO);
+
+    /**
+     * 社区自组织详情
+     * @param orgId
+     * @return
+     */
+    CommunitySelfOrganizationListDTO communitySelfOrganizationDetail(String orgId,String customerId);
 }
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 52b11d72a1..7f6eee3a8f 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
@@ -800,4 +800,30 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         return new PageData<>(list, NumConstant.ONE_NEG);
     }
 
+    /**
+     * 社区自组织详情
+     *
+     * @param orgId
+     * @return
+     */
+    @Override
+    public CommunitySelfOrganizationListDTO communitySelfOrganizationDetail(String orgId,String customerId) {
+        //获取分类名称字典
+        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<>();
+        CommunitySelfOrganizationListFormDTO formDTO=new CommunitySelfOrganizationListFormDTO();
+        formDTO.setCustomerId(customerId);
+        formDTO.setOrgId(orgId);
+        List<CommunitySelfOrganizationListDTO> list=baseDao.selectCommunitySelfOrganizationList(formDTO);
+        if(CollectionUtils.isEmpty(list)){
+            return null;
+        }
+        for (CommunitySelfOrganizationListDTO l : list) {
+            //赋值分类名称
+            l.setCategoryName(dictMap.get(l.getCategoryCode()));
+        }
+        return list.get(NumConstant.ZERO);
+    }
+
+
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
index d7b90133a4..bb705fc32a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
@@ -62,7 +62,9 @@
             so.remark
         FROM ic_community_self_organization so
         WHERE so.DEL_FLAG = 0
-            AND so.ORG_ID = #{agencyId}
+            <if test="null != agencyId and agencyId != '' ">
+                AND so.ORG_ID = #{agencyId}
+            </if>
             AND so.CUSTOMER_ID = #{customerId}
             <if test="null != organizationName and organizationName != '' ">
                 AND so.ORGANIZATION_NAME LIKE CONCAT('%',#{organizationName},'%')
@@ -76,6 +78,9 @@
             <if test="null != endTime and endTime != '' ">
                 AND so.ORGANIZATION_CREATED_TIME <![CDATA[ <= ]]> #{endTime}
             </if>
+            <if test="null != orgId and orgId != '' ">
+                AND so.ID = #{orgId}
+            </if>
             ORDER BY so.ORGANIZATION_CREATED_TIME DESC
     </select>