行情报价牌排序问题

RMA/app/src/main/java/cn/muchinfo/rma/view/base/tjmd/TjmdMarketViewModel.kt

@@ -1047,11 +1047,24 @@ class TjmdMarketViewModel : BaseViewModel(){
         val allList = DataBase.getInstance().goodsInfoDao().all
         val deliveryRelationList = GlobalDataCollection.instance?.quoteGoodsListDataArrayList
         //需要知道掉期trademodel
-        allList.forEach {data ->
-            if (data.trademode == 46 && data.goodsstatus == 3){
-                list.add(data)
+        // 先通过deliveryRelationList排序
+        if(deliveryRelationList != null){
+            deliveryRelationList?.forEach{ relationData ->
+                var goodsInfo = allList.find {
+                    relationData.goodsid == it.goodsid.toString()
+                }
+                if(goodsInfo != null && goodsInfo.goodsstatus == 3 && goodsInfo.trademode == 46){
+                    list.add(goodsInfo)
+                }
+            }
+        }else{
+            allList.forEach {data ->
+                if (data.trademode == 46 && data.goodsstatus == 3){
+                    list.add(data)
+                }
             }
         }
+
         swapsDataList.postValue(list)
         if (list.size > 10){
             queryQuoteDay(tag,0,10,list){isCompleted, err ->