Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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 Double avgSignTime;
+    private Long avgSignTime;
 
     @Transient
     @ApiParam(value = "平均解决时长", example = "0")
-    private Double avgResolveTime;
+    private Long avgResolveTime;
 
     @Transient
     @ApiParam(value = "查询条件：ANDON状态")
@@ -278,18 +278,18 @@ public class AndonManageQueue extends BaseBean {
 
     /**
      * 原因统计 构造函数
+     * @param alarmCode
      * @param workCenterCode
      * @param workCellCode
-     * @param alarmCode
      * @param ecCode
      * @param ecNameRdd
      * @param emCode
      * @param emNameRdd
+     * @param andonCount
      * @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) {
+    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;
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;
@@ -303,24 +303,6 @@ public class AndonManageQueue extends BaseBean {
     }
 
     /**
-     * 人员统计 构造函数
-     * @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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java

@@ -54,9 +54,9 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
 
-        ALARM_FLAG("10","按灯状态"),
-        USER_CODE("20","工号"),
-        READ_FLAG("30", "读取状态");
+        ALARM_FLAG("10","安灯呼叫标识"),
+        USER_CODE("20","用户工号"),
+        READ_FLAG("30", "安灯读取状态");
 
         private String value;
         private String description;
@@ -192,11 +192,11 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_CODE{
 
-        PART("MM","物料"),
-        QUALITY("QM","质量"),
-        EQUIP("EQ","设备"),
-        PROCESS("GY","工艺"),
-        CHECK("JC","检测");
+        PART("PART_ALARM","物料"),
+        QUALITY("QUALITY_ALARM","质量"),
+        EQUIP("EQUMENT_ALARM","设备"),
+        PROCESS("ROUTING_ALARM","工艺"),
+        CHECK("OTHER_ALARM","其他");
 
         private String value;
         private String description;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -382,6 +382,7 @@ public class CoreHqlPack {
         HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
         HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+        HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         if(user.getRoleIdList() != null){
             HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result);
@@ -493,6 +494,7 @@ public class CoreHqlPack {
 //        HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
+        HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
 
         if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
             HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);