From 64350cce31dc153889781ddcf404080c997d818a Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Wed, 17 Apr 2019 17:19:44 +0800
Subject: [PATCH] =?UTF-8?q?DdlPack=EF=BC=8C=E6=97=A5=E6=9C=9F=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/base/tool/DdlPreparedPack.java   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 590ad9a..ef38a6b 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
@@ -47,8 +47,8 @@ public class DdlPreparedPack {
             endDate += " 23:59:59";
         }
 
-        packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, startDate);
-        packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, endDate);
+        packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate);
+        packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, endDate);
     }
 
     /**
@@ -71,7 +71,7 @@ public class DdlPreparedPack {
             String[] time = date.split(",");
             if (time.length == 1) {
                 //只有开始日期，没有结束日期
-                packBean.addColumnQuery(columnName,"and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
+                packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%");
             } else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0)
                                                         || (time[1] != null & time[1].trim().length() > 0))) {
                 if (time[0] == null || time[0].trim().length() == 0) {
@@ -90,16 +90,16 @@ public class DdlPreparedPack {
                 if (isShowTime && time[1].trim().length() <= 11) {
                     time[1] += " 23:59:59";
                 }
-                packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, time[0]);
-                packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, time[1]);
+                packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]);
+                packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, time[1]);
             } else {
                 if (showTaday) {
                     if (isShowTime) {
-                        packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
-                        packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, today + " 23:59:59");
+                        packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00");
+                        packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today + " 23:59:59");
                     } else {
-                        packBean.addColumnQuery(columnName,"and model." + columnName + " >= :m_" + columnName, today);
-                        packBean.addColumnQuery(columnName,"and model." + columnName + " <= :m_" + columnName, today);
+                        packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today);
+                        packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, today);
                     }
                 }
             }