From f09ac4d897dad882f65ab11426eaf1d29906578b Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Thu, 29 Aug 2019 19:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../bean/AndonManageQueue.java                     | 14 +++++
 .../sqlpack/AndonHqlPack.java                      | 62 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)

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 8f43576..2e9a6f6 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
@@ -103,6 +103,12 @@ public class AndonManageQueue extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     public String callTime;
 
+    @Column(name="CLOSE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="撤销时间",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String closeTime;
+
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
@@ -129,6 +135,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "呼叫人")
     private String callUser;
 
+    @Column(name = "CLOSE_USER")
+    @ApiParam(value = "撤销人")
+    private String closeUser;
+
     @Transient
     @ApiParam(value = "呼叫人名字")
     private String callUserName;
@@ -203,6 +213,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "事件方法描述")
     private String emNameRdd;
 
+    @Column(name = "CLOSE_CAUSE")
+    @ApiParam(value = "撤销原因")
+    private String closeCause;
+
     @Column(name = "EM_DESC")
     @ApiParam(value = "事件具体方法")
     private String emDesc;
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 d1a06e2..ef4198c 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
@@ -3,10 +3,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
 import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -17,6 +20,65 @@ import org.apache.commons.lang3.StringUtils;
  * @Modify:
  **/
 public class AndonHqlPack {
+    /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 Start ***********/
+    /**
+     * 工作单元呼叫原因配置查询条件封装
+     * @param andonCellAlarmCause
+     * @return
+     */
+    public static DdlPackBean getAndonCellAlarmCause(AndonCellAlarmCause andonCellAlarmCause) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAlarmCode(), "alarmCode", packBean);
+        return packBean;
+    }
+
+    /**
+     * 工作单元事件方法配置查询条件封装
+     * @param andonEventMethod
+     * @return
+     */
+    public static DdlPackBean getAndonCellEventMethod(AndonCellEventMethod andonEventMethod) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonEventMethod.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventMethod.getEmCode(), "emCode", packBean);
+        return packBean;
+    }
+
+    /**
+     * 工作单元事件原因查询封装
+     * @param andonEventCause
+     * @return
+     */
+    public static DdlPackBean getAndonCellEventCause(AndonCellEventCause andonEventCause) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getEcCode(), "ecCode", packBean);
+        return packBean;
+    }
+
+    /**
+     * 工作单元事件现象查询条件封装
+     * @param andonEventPhenoMenon
+     * @return
+     */
+    public static DdlPackBean getAndonCellEventPhenomenon(AndonCellEventPhenomenon andonEventPhenoMenon) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
+        return packBean;
+    }
+    /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
+
+
     /**
      * genju 安灯队列参数查询安灯队列
      * @param andonManageQueue