居民端-获取用户访问网格列表-需求调整

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -265,16 +265,27 @@
 
     <select id="selectGridByIds" resultType="com.epmet.dto.result.AllGridsByUserIdResultDTO">
         SELECT
-            id AS 'gridId',
-            grid_name AS 'gridName',
-            customer_id AS 'customerId'
-        FROM customer_grid
-        WHERE del_flag = '0'
-        AND id IN
+            cg.id AS 'gridId',
+            IF(
+                ca.ORGANIZATION_NAME = '',
+                cg.grid_name,
+                CONCAT(ca.organization_name,'-',cg.grid_name)
+            ) AS 'gridName',
+            cg.customer_id AS 'customerId'
+        FROM customer_grid cg
+        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        WHERE cg.del_flag = '0'
+        AND ca.del_flag = '0'
+        AND cg.id IN
         <foreach item="id" collection="gridIdList" open="(" separator="," close=")">
             #{id}
         </foreach>
-        ORDER BY CONVERT (grid_name USING gbk) ASC<!-- 网格名称对应拼音升序排序 -->
+        ORDER BY field(
+            cg.id,
+            <foreach item="id" collection="gridIdList" separator=",">
+                #{id}
+            </foreach>
+        )<!-- 按照foreach中遍历的Id顺序排序(按网格访问时间倒序) -->
     </select>
 
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml

@@ -80,5 +80,6 @@
         WHERE
             del_flag = '0'
         AND customer_user_id = #{userId}
+        ORDER BY latest_time DESC
     </select>
 </mapper>