luobang 2 years ago
parent
commit
46d541b88a

+ 2 - 0
src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -214,6 +214,8 @@ public class QmsQueueResultController extends BaseRESTfulController {
 
 
 
+
+
 //    @ApiOperation(value="查询执行中订单")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -904,7 +904,7 @@
             ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
         </if>
         <if test="locationId == null">
-            ORDER BY  QQL.ENTRY_SURE_TIME DESC,  QQL.IS_VIP, "materialName" DESC, "listNodeOrder"
+            ORDER BY QQL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME
         </if>
         ) P0