From 05fa7dba04c21ce3465b873e1ce17713ddbdeb63 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 1 Aug 2020 18:36:08 +0800
Subject: [PATCH] Fix Bug #10227

---
 .../i3plus/pojo/mes/bean/MesBoardDisplay.java      | 48 ++++++++++++++++++++++
 .../mes/repository/MesBoardDisplayRepository.java  | 13 ++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  4 +-
 3 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java
new file mode 100644
index 0000000..535d9c1
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/8/1 5:55 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_DISPLAY")
+@Api("MES_看板跑马灯")
+public class MesBoardDisplay extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1537754345697889680L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "DISPLAY_CONTENT")
+    @ApiParam("显示内容")
+    private String displayContent;
+
+    @Column(name = "IS_ROLL")
+    @ApiParam("是否滚动")
+    private String isRoll;
+
+    @Column(name = "ROLL_SPEED")
+    @ApiParam("滚动速度")
+    private String rollSpeed;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java
new file mode 100644
index 0000000..8f55d8c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardDisplay;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/8/1 6:03 下午
+ * @Modify:
+ */
+public interface MesBoardDisplayRepository extends BaseRepository<MesBoardDisplay, Long> {
+}
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 e2ccd0e..cd30d03 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
@@ -297,10 +297,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
         if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) {
-            DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);