From 2069d6a3aef0f39cf5154c7dfee54aa36687625a Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Wed, 30 Oct 2019 17:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1125?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=A1=A8=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 39 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 31 +++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 439677b..2a5c20c 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -12,6 +12,45 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * 设备台账报表查询标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EQUIPMENT_REPORT_TYPE {
+
+        TASK(10, "作业任务"),
+        PLAN(20, "周期计划"),
+        REPAIR(30, "维修记录"),
+        CHECK(40, "点检记录"),
+        MAINTAIN(50, "保养记录");
+
+        private int value;
+        private String description;
+
+        EQUIPMENT_REPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * MesScrap 报废原因
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 38beffe..deb4a29 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -1573,4 +1573,35 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 维修记录
+     * @param mesEquTaskRepairRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskRepairRecord(MesEquTaskRepairRecord mesEquTaskRepairRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskRepairRecord, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskRepairRecord.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskRepairRecord.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 点检或保养记录
+     * @param mesEquTaskStandardRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskStandardRecord(MesEquTaskStandardRecord mesEquTaskStandardRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskStandardRecord, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskStandardRecord.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getTaskType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskStandardRecord.getTaskType(), "taskType", packBean);
+        }
+        return packBean;
+    }
 }