From bea6bf15d4dc1b73a16905307102d906cb8b1e63 Mon Sep 17 00:00:00 2001 From: Herry <1033857564@qq.com> Date: Mon, 1 Sep 2025 17:44:37 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.0][fix]=E8=A7=A3=E5=86=B3=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E8=AF=BB=E5=8F=96=E7=AB=99=E7=82=B9=E5=92=8C=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E7=82=B9=E6=9C=AA=E6=8E=92=E5=BA=8F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/weaknet/bean/response/BusRoutesResponse.kt | 9 ++++++--- .../mogo/och/weaknet/repository/db/dao/SiteDataDao.kt | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt index 99f2c1eb8e..a4caacd8fb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt @@ -56,10 +56,13 @@ class BusRoutesResponse : BaseData() { temp?.isPlayTts = Boolean.TRUE == taskAndsite.isPlayTts temp?.seq = (taskAndsite.seq ?: 0) temp?.siteId = if (taskAndsite.siteId == null) 0 else taskAndsite.siteId!!.toInt() - points?.let { - val sitePoint = it.filter { + points?.let { pointList-> + val sitePoint = pointList.filter { it.siteId?.toInt() == temp?.siteId - } + }.sortedWith( + compareBy { it.subSeq } +// .thenBy {it.subSeq } + ) val tempPassPoints = mutableListOf() val tempblackPoints = mutableListOf() sitePoint.forEach { point-> diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt index da9842d37e..fb98991475 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt @@ -41,7 +41,7 @@ interface SiteDataDao { @Query("SELECT * FROM ${SiteDataBean.tableName} WHERE line_id = :lineId and site_id = :siteId") fun querySitesByLineIdAndSiteId(lineId: Long,siteId:Long):List? - @Query("SELECT * FROM ${SiteDataBean.tableName} WHERE line_id = :lineId") + @Query("SELECT * FROM ${SiteDataBean.tableName} WHERE line_id = :lineId order by seq") fun querySitesByLineId(lineId: Long):List? @Query("SELECT * FROM ${SiteDataBean.tableName} GROUP by md5 HAVING count(1) > 1")