From 9bef7ca1460578d22cbab50d1235bdb6f7233017 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 3 Nov 2022 12:30:54 +0800
Subject: [PATCH] ZUZHIid

---
 .../src/main/java/com/epmet/dto/IcPartyActivityDTO.java     | 6 +++++-
 .../src/main/java/com/epmet/dto/IcPartyUnitDTO.java         | 1 +
 .../com/epmet/service/impl/IcPartyActivityServiceImpl.java  | 3 ++-
 .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java | 2 ++
 .../src/main/resources/mapper/IcPartyActivityDao.xml        | 3 ++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
index b0367639ed..0115706902 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
@@ -55,8 +55,12 @@ public class IcPartyActivityDTO implements Serializable {
     /**
      * 组织ID
      */
-    @JsonIgnore
+    // @JsonIgnore
 	private String agencyId;
+    /**
+     * 组织名称
+     */
+    private String agencyName;
     private String gridId;
     private String gridName;
     /**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java
index 5935d564de..1aed3be19f 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java
@@ -51,6 +51,7 @@ public class IcPartyUnitDTO implements Serializable {
      * 组织ID
      */
 	private String agencyId;
+    private String agencyName;
 
     /**
      * 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
index c645ffbc55..e7b3fbc4e5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
@@ -128,7 +128,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                 if (StringUtils.isNotEmpty(dto.getGridId())) {
                     GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
                     if (null != gridInfo) {
-                        dto.setGridName(gridInfo.getGridName());
+                        dto.setGridName(gridInfo.getGridNamePath());
+                        dto.setAgencyName(gridInfo.getAgencyName());
                     }
                 }
             });
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index 71711ea98e..7a07763ea1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -155,6 +155,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
                 item.setSatisfaction(new BigDecimal(item.getSatisfaction()).setScale(2, BigDecimal.ROUND_HALF_UP).toString());
             }
             item.setScore(null == pointMap.get(item.getId()) ? NumConstant.ZERO : pointMap.get(item.getId()));
+            AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(item.getAgencyId());
+            item.setAgencyName(null != agencyInfoCache ? agencyInfoCache.getOrganizationName() : StrConstant.EPMETY_STR);
         });
         return new PageData<>(dtoList, pageInfo.getTotal());
     }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
index bf3af69b84..b02c91bfd5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@@ -61,7 +61,8 @@
             ADDRESS,
             LONGITUDE,
             LATITUDE,
-            RESULT
+            RESULT,
+            a.AGENCY_ID
         FROM
             ic_party_activity a
         INNER JOIN  (