Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 安灯队列
@@ -236,6 +237,10 @@ public class AndonManageQueue extends BaseBean {
     private Long avgResolveTime;
 
     @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> statusList;
+
+    @Transient
     @ApiParam(value = "比例", example = "0")
     private Double proportion;
 

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -172,6 +172,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
 
         getStringBuilderPack(andonManageQueue, result);