ANDON统计报表更新

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

@@ -230,11 +230,11 @@ public class AndonManageQueue extends BaseBean {
 
     @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状态")
@@ -244,6 +244,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "比例", example = "0")
     private Double proportion;
 
+    @Transient
+    @ApiParam(value = "总次数（用于报表统计）", example = "0")
+    private Integer sumCount;
+
     @Column(name = "SEND_FLAG")
     @ApiParam(value = "发送标志")
     private String sendFlag;
@@ -277,45 +281,63 @@ public class AndonManageQueue extends BaseBean {
     }
 
     /**
-     * 原因统计 构造函数
-     * @param alarmCode
+     * 原因统计 使用Java内存计算（获取原始数据）
      * @param workCenterCode
      * @param workCellCode
+     * @param alarmCode
      * @param ecCode
      * @param ecNameRdd
      * @param emCode
      * @param emNameRdd
-     * @param andonCount
-     * @param avgSignTime
-     * @param avgResolveTime
+     * @param callTime
+     * @param confirmTime
+     * @param resetTime
      */
-    public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Long avgSignTime, Long avgResolveTime, Long andonCount) {
-        this.alarmCode = alarmCode;
+    public AndonManageQueue(String workCenterCode,String workCellCode,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;
+        this.alarmCode = alarmCode;
         this.ecCode = ecCode;
         this.ecNameRdd = ecNameRdd;
         this.emCode = emCode;
         this.emNameRdd = emNameRdd;
-        this.andonCount = andonCount;
-        this.avgSignTime = avgSignTime;
-        this.avgResolveTime = avgResolveTime;
+        this.callTime = callTime;
+        this.confirmTime = confirmTime;
+        this.resetTime = resetTime;
+    }
+
+    /**
+     * 人员统计 使用Java内存计算（获取原始数据）
+     * @param resetUser
+     * @param alarmCode
+     * @param callTime
+     * @param confirmTime
+     * @param resetTime
+     */
+    public AndonManageQueue(String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
+        this.resetUser = resetUser;
+        this.alarmCode = alarmCode;
+        this.callTime = callTime;
+        this.confirmTime = confirmTime;
+        this.resetTime = resetTime;
     }
 
     /**
-     * 柏拉图统计 构造函数
+     * 统计分析柏拉图 使用JAVA内存计算（获取原始数据）
      * @param alarmCode
      * @param ecCode
      * @param ecNameRdd
-     * @param proportion
-     * @param andonCount
+     * @param callTime
+     * @param confirmTime
+     * @param resetTime
      */
-    public AndonManageQueue(String alarmCode, String ecCode, String ecNameRdd, Double proportion, Long andonCount) {
-        this.alarmCode = alarmCode;
-        this.ecCode = ecCode;
+    public AndonManageQueue(String alarmCode,String ecCode, String ecNameRdd, String callTime, String confirmTime,String resetTime){
         this.ecNameRdd = ecNameRdd;
-        this.andonCount = andonCount;
-        this.proportion = proportion;
+        this.ecCode = ecCode;
+        this.alarmCode = alarmCode;
+        this.callTime = callTime;
+        this.confirmTime = confirmTime;
+        this.resetTime = resetTime;
     }
 
     public AndonManageQueue() {