diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
index cfd9634..de3e10a 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
@@ -7,10 +7,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.beanutils.BeanUtils;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -394,4 +397,21 @@ public class AndonManageQueue extends BaseBean {
 
     public AndonManageQueue() {
     }
+
+    public static void main(String[] args) {
+        try {
+            List ds = new ArrayList();
+            ds.add(new AndonManageQueue());
+
+
+
+            System.out.println(BeanUtils.describe(ds));
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
index 220d4a5..4d6bca8 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
@@ -75,4 +75,11 @@ public class AndonPLC extends BaseBean {
     @Column(name = "IS_ALARM_STATUS")
     @ApiParam(value = "是否按灯状态", example = "1")
     private Integer isAlarmStatus;
+
+    public int getIsAlarmStatusVal(){
+        if(isAlarmStatus == null){
+            return 0;
+        }
+        return isAlarmStatus.intValue();
+    }
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
index 902b0bc..d21e6d6 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
@@ -196,15 +196,15 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
 
-        getStringBuilderPack(andonManageQueue, result);
-
-        if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){
+        if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
         }
 
+        getStringBuilderPack(andonManageQueue, result);
         // 根据优先级倒序，序号升序排序
-        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
-                new String[]{"priorityLevel", "seq"}, result);
+//        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
+//                new String[]{"priorityLevel", "seq"}, result);
+        result.setOrderByStr(andonManageQueue.orderBy());
 
         return result;
     }
@@ -418,6 +418,23 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 模糊查询安灯子类型信息
+     * @param andonAlarmDetailType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmDetailTypeLike(AndonAlarmDetailType andonAlarmDetailType) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailName(), "alarmDetailName", result);
+
+        getStringBuilderPack(andonAlarmDetailType, result);
+
+        return result;
+    }
 //
 //    /**
 //     * 安灯类型查询条件封装