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 f7fc675..32e0d77 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
@@ -399,4 +399,30 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 安灯类型查询条件封装
+     * @param andonAlarmType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonAlarmType, result);
+
+        return result;
+    }
+
+    /**
+     * 安灯状态查询条件封装
+     * @param andonStatus
+     * @return
+     */
+    public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonStatus, result);
+
+        return result;
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 1c0f803..ca940ea 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -56,7 +56,7 @@ public class AndonEnumUtil {
         SECOND_APPROVAL("20","二级审批"),
         THIRD_APPROVAL("30","三级审批"),
         FOUTH_APPROVAL("40","四级审批"),
-        FINISH("100","已审批");
+        FINISH("60","已审批");
 
         private String value;
         private String description;
@@ -200,18 +200,18 @@ public class AndonEnumUtil {
 
     /**
      * 按灯动作标志
-     * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批
+     * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_FLAG{
 
         CALL_ACTION("10","呼叫动作"),
         SIGN_ACTION("20","签到动作"),
-        CANCEL_ACTION("30", "撤销动作"),
-        RESOLVE_ACTION("40", "解决动作"),
-        SHIFG_CALL_ACTION("50", "转呼动作"),
-        COMMIT_ACTION("60","提交动作"),
-        PASS_ACTION("70","审批动作");
+        RESOLVE_ACTION("30", "解决动作"),
+        CANCEL_ACTION("40", "撤销动作"),
+        COMMIT_ACTION("50","提交动作"),
+        PASS_ACTION("60","审批动作"),
+        SHIFG_CALL_ACTION("70", "转呼动作");
 
         private String value;
         private String description;