修改

src/main/java/com/steerinfo/dil/service/impl/QueueDealWithAsync.java

@@ -48,11 +48,11 @@ public class QueueDealWithAsync {
                 queuingRulesMapper.updateListToLast(listId, maxListNodeOrder + 1);
                 //移除可进厂资格
                 queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-                if((nowTime - ((Date) map.get("insertTime")).getTime()) > 86400000){
-                    //如果大于一天则直接删除队列信息
-                    qmsQueueListMapper.deleteByPrimaryKey(listId);
-                    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
-                }
+                //if((nowTime - ((Date) map.get("insertTime")).getTime()) > 86400000){
+                //    //如果大于一天则直接删除队列信息
+                //    qmsQueueListMapper.deleteByPrimaryKey(listId);
+                //    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
+                //}
             }
         }
     }
@@ -73,11 +73,11 @@ public class QueueDealWithAsync {
                 queuingRulesMapper.updateSpellingListToLast(spellingResultId);
                 //移除可进厂资格
                 queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-                if((nowTime - ((Date) map.get("spellingSureTime")).getTime()) > 86400000){
-                    //如果大于一天则直接删除队列信息
-                    qmsQueueSpellingListMapper.deleteByPrimaryKey(spellingResultId);
-                    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
-                }
+                //if((nowTime - ((Date) map.get("spellingSureTime")).getTime()) > 86400000){
+                //    //如果大于一天则直接删除队列信息
+                //    qmsQueueSpellingListMapper.deleteByPrimaryKey(spellingResultId);
+                //    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
+                //}
             }
         }
     }

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -926,10 +926,10 @@
         </if>
         <if test="locationId != null">
             and QQL.GRID_ID = #{locationId}
-            ORDER BY QQL.ENTRY_SURE_TIME ASC NULLS FIRST,QQL.IS_VIP DESC NULLS LAST ,"listNodeOrder"
+            ORDER BY QQL.ENTRY_SURE_TIME ASC NULLS FIRST,QQL.IS_VIP DESC NULLS LAST ,QQR.RESULT_START_TIME
         </if>
         <if test="locationId == null">
-            ORDER BY QQL.ENTRY_SURE_TIME ASC NULLS FIRST,QQL.IS_VIP DESC NULLS LAST ,"listNodeOrder"
+            ORDER BY QQL.ENTRY_SURE_TIME ASC NULLS FIRST,QQL.IS_VIP DESC NULLS LAST ,QQR.RESULT_START_TIME
         </if>
         ) P0
 
@@ -1079,10 +1079,10 @@
             </if>
             <if test="locationId != null">
                 and QQSL.SPELILING_NUM  = #{locationId}
-                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
+                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,QQR.RESULT_START_TIME,OO.ORDER_ID
             </if>
             <if test="locationId == null">
-                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
+                ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,QQR.RESULT_START_TIME,OO.ORDER_ID
             </if>
     </select>
 
@@ -1179,10 +1179,10 @@
         </if>
         <if test="locationId != null">
             and QQSL.SPELILING_NUM  = #{locationId}
-            ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
+            ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,QQR.RESULT_START_TIME,OO.ORDER_ID
         </if>
         <if test="locationId == null">
-            ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,"listNodeOrder",OO.ORDER_ID
+            ORDER BY QQSL.ENTRY_SURE_TIME ASC NULLS FIRST ,QQSL.IS_VIP DESC NULLS LAST,QQR.RESULT_START_TIME,OO.ORDER_ID
         </if>
     </select>