提交 0905

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -54,6 +54,29 @@ public class DdlPreparedPack {
     /**
      * 封装日期
      *
+     * @param startDate      开始日期
+     * @param endDate        结束日期
+     * @param columnName     列名
+     * @param isLeftContain  左闭？
+     * @param isRightContain 右闭？
+     * @param packBean       HQL对象
+     */
+    public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackBean packBean) {
+        if (isLeftContain) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate.trim());
+        } else {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, startDate.trim());
+        }
+        if (isRightContain) {
+            packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate.trim());
+        } else {
+            packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, endDate.trim());
+        }
+    }
+
+    /**
+     * 封装日期
+     *
      * @param date       开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
      * @param columnName HQL里对应的时间字段
      * @param packBean   封装的HQL
@@ -348,6 +371,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成大于不等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装String对象成小于语句
      *
      * @param columnName 列名

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java

@@ -83,4 +83,8 @@ public class MesESOP extends BaseBean {
     @ApiParam("FILE_TYPE_NAME")
     private String fileTypeName;
 
+    @Column(name="SYNC_TAG")
+    @ApiParam("SYNC_TAG")
+    private Integer syncTag=0;
+
 }