From 810f797708e4f5d8505861db9cf1fb7de0de0760 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 14:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BD=91=E6=A0=BC=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=A0=BC=E5=BC=8F=EF=BC=9A=E4=B8=8A=E7=BA=A7=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=90=8D=E7=A7=B0-=E7=BD=91=E6=A0=BC=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/CustomerGridDao.java        | 6 ++++++
 .../com/epmet/service/impl/CustomerGridServiceImpl.java     | 5 +++++
 .../src/main/resources/mapper/CustomerGridDao.xml           | 6 +++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 70f4361032..3451859f5c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -60,6 +60,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      **/
     List<CustomerGridForStrangerResultDTO> selectRestGridWithoutGivenAreaCode(Map<String, Object> paramsMap);
 
+    /**
+     * @Description 通过gridId查询网格信息，网格名称格式： 上级组织名称-网格名称
+     * @param customerGridFormDTO
+     * @author wangc
+     * @date 2020.04.30 13:57
+    **/
     CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 7004e084cf..1cb5a09223 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -166,6 +166,11 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
     }
 
+    /** 根据网格Id查询用户数据
+     * @param customerGridFormDTO
+     * @return
+     * @date 2020-03-17
+     */
     @Override
     public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) {
         return new Result<CustomerGridDTO>().ok(baseDao.getCustomerGridByGridId(customerGridFormDTO));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 335ff75f55..00174dd487 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -7,15 +7,19 @@
         SELECT
             gr.id,
             gr.customer_id,
-            gr.grid_name,
+            CONCAT(ag.ORGANIZATION_NAME,'-',gr.grid_name) AS gridName,
             gr.pid,
             gr.pids,
             gr.longitude,
             gr.latitude,
             gr.area_code
         FROM customer_grid gr
+        LEFT JOIN customer_agency ag
+        ON gr.PID = ag.ID
         WHERE
             gr.del_flag = '0'
+        AND
+            ag.DEL_FLAG = '0'
         <if test='gridId != "" and gridId != null'>
             AND gr.id = #{gridId}
         </if>