From 00086912bc9621fdf62f391be18e06385ff8d65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= <hansen.ke@estsh.com>
Date: Wed, 22 May 2019 17:22:59 +0800
Subject: [PATCH] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/AndonManageQueue.java                     | 87 +++++++++++++++++++++-
 1 file changed, 84 insertions(+), 3 deletions(-)

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 26f776b..933464b 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
@@ -226,15 +226,15 @@ public class AndonManageQueue extends BaseBean {
 
     @Transient
     @ApiParam(value = "ANDON次数（用于报表统计）", example = "0")
-    private Integer andonCount;
+    private Long andonCount;
 
     @Transient
     @ApiParam(value = "平均响应时长", example = "0")
-    private Long avgSignTime;
+    private Double avgSignTime;
 
     @Transient
     @ApiParam(value = "平均解决时长", example = "0")
-    private Long avgResolveTime;
+    private Double avgResolveTime;
 
     @Transient
     @ApiParam(value = "查询条件：ANDON状态")
@@ -257,4 +257,85 @@ public class AndonManageQueue extends BaseBean {
     public Integer getPriorityLevel() {
         return this.priorityLevel == null ? 0 : this.priorityLevel;
     }
+
+    /**
+     * 工位统计 构造函数
+     * @param workCenterCode
+     * @param workCellCode
+     * @param equipmentCode
+     * @param shiftCode
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonManageQueue(String workCenterCode, String workCellCode, String equipmentCode, String shiftCode, String alarmCode, Long andonCount) {
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.shiftCode = shiftCode;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+    }
+
+    /**
+     * 原因统计 构造函数
+     * @param workCenterCode
+     * @param workCellCode
+     * @param alarmCode
+     * @param ecCode
+     * @param ecNameRdd
+     * @param emCode
+     * @param emNameRdd
+     * @param avgSignTime
+     * @param avgResolveTime
+     * @param andonCount
+     */
+    public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Double avgSignTime, Double avgResolveTime, Long andonCount) {
+        this.alarmCode = alarmCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.ecCode = ecCode;
+        this.ecNameRdd = ecNameRdd;
+        this.emCode = emCode;
+        this.emNameRdd = emNameRdd;
+        this.andonCount = andonCount;
+        this.avgSignTime = avgSignTime;
+        this.avgResolveTime = avgResolveTime;
+    }
+
+    /**
+     * 人员统计 构造函数
+     * @param resetUser
+     * @param alarmCode
+     * @param andonCount
+     * @param proportion
+     * @param avgSignTime
+     * @param avgResolveTime
+     */
+    public AndonManageQueue(String resetUser, String alarmCode, Long andonCount, Double proportion, Double avgSignTime, Double avgResolveTime) {
+        this.alarmCode = alarmCode;
+        this.resetUser = resetUser;
+        this.andonCount = andonCount;
+        this.avgSignTime = avgSignTime;
+        this.avgResolveTime = avgResolveTime;
+        this.proportion = proportion;
+    }
+
+    /**
+     * 柏拉图统计 构造函数
+     * @param alarmCode
+     * @param ecCode
+     * @param ecNameRdd
+     * @param proportion
+     * @param andonCount
+     */
+    public AndonManageQueue(String alarmCode, String ecCode, String ecNameRdd, Double proportion, Long andonCount) {
+        this.alarmCode = alarmCode;
+        this.ecCode = ecCode;
+        this.ecNameRdd = ecNameRdd;
+        this.andonCount = andonCount;
+        this.proportion = proportion;
+    }
+
+    public AndonManageQueue() {
+    }
 }