From fa42a25b96ec11be5b9341735198e55a18f2a664 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 8 Apr 2020 16:37:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java  | 2 +-
 .../java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 5dbc9ec..7973e88 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -38,7 +38,7 @@ public class CommonEnumUtil {
         HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
         LAC(26, 8600, 13, "lac", "连接适配器"),
         ANDON(27, 8500, 14, "andon", "安灯"),
-        APS(28, 8400, 15, "i3aps", "高级计划与排程"),
+        APS(28, 8400, 15, "i3aps", "高级计划与排产"),
         CENTER(99, 8000, 1, "icloud-server", "注册中心"),
         SURFACE(98, 0, 0, "i3surface", "对外服务"),
         CLOUD(97, 0, 0, "i3cloud", "微服务"),
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
index e485855..2beeaa9 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
@@ -235,6 +235,15 @@ public class ReportHqlPack {
         return result;
     }
 
+    public static DdlPackBean packHqlBrPojoView(BrPojoView bean){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result);
+        DdlPreparedPack.getNumEqualPack(bean.getViewType(),"viewType",result);
+
+        return result;
+    }
+
     public static DdlPackBean packHqlBrPojoViewAttr(BrPojoViewAttr bean){
         DdlPackBean result = DdlPackBean.getDdlPackBean(bean);