From 8d0f3d3eeb27e045d179c26aa1bad1d48c6e9936 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 2 Jul 2020 16:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E5=AF=BC=E8=A7=88?=
 =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=BD=91=E6=A0=BC=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0=E4=B8=BA=EF=BC=9A=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=A4=E7=BA=A7=E6=9C=BA=E5=85=B3=E5=90=8D=E7=A7=B0-?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0=EF=BC=88=E8=8B=A5=E6=97=A0?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=A4=E7=BA=A7=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=89=EF=BC=8C=E6=90=9C=E7=B4=A2=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=9F=8E=E5=B8=82=E6=8C=87=E5=AE=9A=E5=8C=BA=E7=9A=84=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E5=9F=8E=E5=B8=82=E4=B8=8B=E6=89=80=E6=9C=89=E7=9A=84=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E4=BB=A5=E5=8F=8A=E8=BF=99=E4=B8=AA=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=9C=81=E4=BB=BD=E7=9A=84=E7=9B=B4=E5=B1=9E?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=8C=E6=8E=92=E5=BA=8F=E4=B8=BA=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E5=9C=A8=E4=B8=8A=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=9F=8E=E5=B8=82=E5=85=B6=E4=BB=96=E5=8C=BA=E5=9F=9F=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=9C=A8=E4=B8=8B=EF=BC=8C=E7=9C=81=E7=9B=B4=E5=B1=9E?=
 =?UTF-8?q?=E5=9C=A8=E6=9C=80=E4=B8=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/ListCustomerGridFormDTO.java     |   2 +-
 .../service/impl/CustomerGridServiceImpl.java |   8 +-
 .../main/resources/mapper/CustomerGridDao.xml | 151 ++++++++++++------
 3 files changed, 108 insertions(+), 53 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java
index 78aa62fd80..21a790fe39 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListCustomerGridFormDTO.java
@@ -29,7 +29,7 @@ public class ListCustomerGridFormDTO implements Serializable{
      * 当前页
      * */
     @Min(value = 1)
-    private Integer pageNo;
+    private Integer pageNo = 1;
 
     /**
      * 每页显示数量
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 00436e9b59..e88c1ebaa5 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
@@ -149,9 +149,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
            //行政区 - 指定行政区在前，所属城市下其余行政区在后
 
             Map<String,Object> map = new HashMap<>();
-
+            //地区码格式 六位 [abcxyz]
+            //ab代表省
+            //cx代表市
+            //yz代表区
             map.put("areaCode",areaCode);
-            map.put("cityCode",areaCode.substring(0,areaCode.length()-NumConstant.FOUR));
+            map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
+            map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
             map.put("pageSize",listCustomerGridFormDTO.getPageSize());
             map.put("pageNo",listCustomerGridFormDTO.getPageNo());
 
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 11744f7f5a..5944b91291 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
@@ -30,69 +30,120 @@
     <!-- 根据城市地区码前四位匹配到城市下所有网格 -->
     <select id="selectGridByCityLike" parameterType="com.epmet.dto.form.ListCustomerGridFormDTO" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
         SELECT
-            id AS grid_id,
-            customer_id,
-            grid_name
+            grid.id AS grid_id,
+            grid.customer_id,
+            concat( agency.fullname, '-', grid.grid_name ) AS gridName
+       FROM
+         CUSTOMER_GRID grid
+        LEFT JOIN (
+               SELECT
+                   a1.id,
+               CASE
+                   WHEN a2.ORGANIZATION_NAME IS NULL THEN
+                   a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
+                   END AS fullname
+               FROM
+                   customer_agency a1
+                   LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
+                   AND a1.del_flag = '0'
+               WHERE
+                   a1.del_flag = '0'
+        ) agency ON grid.PID = agency.ID
+       WHERE
+           grid.del_flag = 0
+       AND
+           grid.area_code LIKE CONCAT(#{areaCode},'%')
+       ORDER BY
+           grid.customer_id,
+           CONVERT ( gridName USING gbk ) ASC
+
+       LIMIT #{pageNo}, #{pageSize}
+    </select>
+
+    <!-- 根据区县地区码匹配到该地区置顶其余区域在后这种特定排序的数据集 -->
+    <select id="selectRestGridWithoutGivenAreaCode" parameterType="map" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
+
+        SELECT c.*
         FROM
-            CUSTOMER_GRID
+        (
+
+        (
+        SELECT
+        a.id AS grid_id,
+        a.customer_id,
+        concat( agency.fullname, '-', a.grid_name ) AS gridName
+        FROM
+        CUSTOMER_GRID a
+
+        LEFT JOIN (
+        SELECT
+        a1.id,
+        CASE
+
+        WHEN a2.ORGANIZATION_NAME IS NULL THEN
+        a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
+        END AS fullname
+        FROM
+        customer_agency a1
+        LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
+        AND a1.del_flag = '0'
+        WHERE
+        a1.del_flag = '0'
+        ) agency ON a.PID = agency.ID
+
+
         WHERE
-            del_flag = 0
+        a.del_flag = 0
         AND
-            area_code LIKE CONCAT(#{areaCode},'%')
+        a.area_code = #{areaCode}
         ORDER BY
-            customer_id,
-            CONVERT ( grid_name USING gbk ) ASC
+          CONVERT ( gridName USING gbk ) ASC
+        LIMIT 0,999999999999
 
-        LIMIT #{pageNo}, #{pageSize}
-    </select>
+        )
 
-    <!-- 根据区县地区码匹配到该地区置顶其余区域在后这种特定排序的数据集 -->
-    <select id="selectRestGridWithoutGivenAreaCode" parameterType="map" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
+        UNION
 
+        (
+        SELECT
+        b.id AS grid_id,
+        b.customer_id,
+        concat(agency.fullname , '-' ,b.grid_name) as gridName
+        FROM
+        CUSTOMER_GRID b
 
-        SELECT c.*
 
+        LEFT JOIN (
+        SELECT
+        a1.id,
+        CASE
 
+        WHEN a2.ORGANIZATION_NAME IS NULL THEN
+        a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
+        END AS fullname
         FROM
-          (
-
-            (
-            SELECT
-                a.id AS grid_id,
-                a.customer_id,
-                a.grid_name
-            FROM
-                CUSTOMER_GRID a
-            WHERE
-                a.del_flag = 0
-            AND
-                a.area_code = #{areaCode}
-            ORDER BY
-                CONVERT ( a.grid_name USING gbk ) ASC
-
-            )
-
-            UNION
-
-            (
-            SELECT
-                b.id AS grid_id,
-                b.customer_id,
-                b.grid_name
-            FROM
-                CUSTOMER_GRID b
-            WHERE
-                b.del_flag = 0
-            AND
-                b.area_code LIKE CONCAT(#{cityCode},'%')
-
-            AND <![CDATA[ b.area_code <> #{areaCode}
+        customer_agency a1
+        LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
+        AND a1.del_flag = '0'
+        WHERE
+        a1.del_flag = '0'
+        ) agency ON b.PID = agency.ID
+
+
+
+        WHERE
+        b.del_flag = 0
+        AND
+        (b.area_code LIKE CONCAT(#{cityCode},'%') OR b.area_code = #{provinceCode})
+
+        AND  <![CDATA[ b.area_code <> #{areaCode}
                 ]]>
-            ORDER BY
-                CONVERT ( b.grid_name USING gbk ) ASC
+        ORDER BY
+        	b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
+        LIMIT 0,999999999999
 
-            )
-          ) AS c
+        )
+        ) AS c
         LIMIT #{pageNo}, #{pageSize}
 
     </select>