From 9c511461176d87759fb779f2b93faf96cb6b1752 Mon Sep 17 00:00:00 2001
From: "simon.song" <CSw12X45>
Date: Tue, 2 Feb 2021 14:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesDataMigrationCfg.java  | 14 +++++------
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 28 ++++++++++++++++++++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java
index a0a754a..14a5354 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java
@@ -35,13 +35,13 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam("描述")
     private String remark;
 
-    @Column(name = "MIGRATION_CYCLE")
-    @ApiParam("迁移周期")
-    private String migrationCycle;
-
-    @Column(name = "NEXT_EXECUTION_TIME")
-    @ApiParam("下次执行时间")
-    private String nextExecutionTime;
+//    @Column(name = "MIGRATION_CYCLE")
+//    @ApiParam("迁移周期")
+//    private String migrationCycle;
+//
+//    @Column(name = "NEXT_EXECUTION_TIME")
+//    @ApiParam("下次执行时间")
+//    private String nextExecutionTime;
 
     @Column(name = "SRC_TABLE_NAME")
     @ApiParam("来源表名")
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 0e9a4f0..10b5bf2 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
@@ -2780,12 +2780,11 @@ public class MesHqlPack {
      * MES 工位技能
      *
      * @param mesWorkCellSkill
-     * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());
-        ;
+
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3729,4 +3728,29 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 数据迁移表查询条件封装
+     */
+    public static DdlPackBean getDataMigrationCfg(MesDataMigrationCfg cfg) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(cfg.getOrganizeCode());
+        if (!StringUtils.isEmpty(cfg.getPcnCode())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getPcnCode(), "pcnCode", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getMigName())) {
+            DdlPreparedPack.getStringLikerPack(cfg.getMigName(), "migName", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getRemark())) {
+            DdlPreparedPack.getStringLikerPack(cfg.getRemark(), "remark", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getSrcTableName())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getSrcTableName(), "srcTableName", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getSrcQueryConditions())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getSrcQueryConditions(), "srcQueryConditions", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getDestTableName())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getDestTableName(), "destTableName", packBean);
+        }
+        return packBean;
+    }
 }