From 87dfdc64711edc0ffd362418e52dc173e04255ee Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Thu, 26 Sep 2019 10:49:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95notInPa?=
 =?UTF-8?q?ckArray=EF=BC=88=EF=BC=89=EF=BC=8C=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=20notInPack()=20notInPackString()?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
index edb8348..3d97300 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
@@ -504,6 +504,19 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装not in String查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
+        if (data != null && data.length > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
+        }
+    }
+
+    /**
      * 封装in String查询语句
      *
      * @param data
@@ -559,9 +572,9 @@ public class DdlPreparedPack {
             data = "";
             for (int i = 0; i < dataArray.length; i++) {
                 if (i == dataArray.length - 1) {
-                    data += "'" + dataArray[i] + "'";
+                    data += "" + dataArray[i] + "";
                 } else {
-                    data += "'" + dataArray[i] + "',";
+                    data += "" + dataArray[i] + ",";
                 }
             }
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);

From 49bdbacc2f70cd180552d73ce0fe45a8ad8b9b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Thu, 26 Sep 2019 10:51:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=A0=B7=E5=BC=8F=E9=9C=80=E6=B1=82=EF=BC=88?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=EF=BC=9A=E7=BA=A2=E8=89=B2=EF=BC=9B?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=95=B0=E9=87=8F=EF=BC=9A=E9=BB=84?=
 =?UTF-8?q?=E8=89=B2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
index 1911b04..ee8cdc6 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java
@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.wms;
 
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,15 +38,12 @@ public class WmsMessageStyleModel implements Serializable {
 
     public WmsMessageStyleModel() {
     }
+
     public WmsMessageStyleModel(String message, Integer selectQty) {
         this.message = message;
-        if(selectQty==1){
-        this.wsStatus=10;
-     }
-     if(selectQty==2){
-         this.wsStatus=20;
-     }
+        this.wsStatus = selectQty;
     }
+
     public WmsMessageStyleModel(String message) {
         this.message = message;
     }