修改进入网格接口，网格名称格式：上级组织名称-网格名称

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);
 
     /**

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));

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>