解决冲突

Signed-off-by: crish <570360737@qq.com>

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -172,15 +172,19 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
             DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean);
         }
+
+        // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
+
         // 时间段查询
         DdlPreparedPack.timeBuilder(
                 mesQueueOrder.getCreateDateTimeStart(),
                 mesQueueOrder.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
 
-        DdlPreparedPack.getOrderDefault(mesQueueOrder);
+        // DdlPreparedPack.getOrderDefault(mesQueueOrder);
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean);
+        // 按照队列序列号倒序
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean);
         return packBean;
     }
 }