diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 46ad0c9..0ef45a6 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -11,6 +11,392 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 public class MesEnumUtil {
 
+    /**
+     * mes设备作业任务明细-执行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
+
+        PENDING(10, "待处理"),
+        COMPLETE(20, "已完成"),
+        CANCEL(30, "取消");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备作业任务明细-整体结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_DETAIL_FINAL_RESULT {
+
+        YES(10, "合格"),
+        NO(20, "不合格");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备作业任务明细-维修标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG {
+
+        FALSE(10, "否"),
+        TRUE(20, "是");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备作业状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_STATUS {
+
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        OPEN(30, "开启"),
+        CLOSE(40, "关闭"),
+        CANCEL(50, "取消");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备作业任务来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_SOURCE {
+
+        PLAN(10, "周期计划"),
+        CREATE(20, "手工创建"),
+        ANDON(30, "ANDON");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备作业通知标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_NOTIFY_FLAG {
+
+        FALSE(10, "未通知"),
+        TRUE(20, "已通知");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_NOTIFY_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes导入模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_INSERT_EXCEL {
+
+        MES_PLAN_ORDER(10, "生产计划"),
+        MES_EQUIPMENT(20, "设备台账"),
+        MES_EQU_TASK_STANDARD(30, "设备作业要求");
+
+        private int value;
+        private String description;
+
+        MES_INSERT_EXCEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_INSERT_EXCEL getByValue(int value) {
+            for (MES_INSERT_EXCEL mesInsertExcel : values()) {
+                if (mesInsertExcel.getValue() == value) {
+                    return mesInsertExcel;
+                }
+            }
+            return null;
+        }
+
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备作业通知配置-通知类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_NOTIFY_CFG_TYPE {
+
+        TASK_NOTIFY(10, "任务型通知");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_NOTIFY_CFG_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备作业通知配置-通知方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN {
+
+        EMAIL(10, "邮件"),
+        USERPHONE(10, "手机号");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * mes设备通知对象配置-对象类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_NOTIFY_OBJECT_CFG_TYPE {
+
+        CHECK_NOTIFY_OBJECT(10, "点检通知对象"),
+        MAINTAIN_NOTIFY_OBJECT(20, "保养通知对象"),
+        REPAIR_NOTIFY_OBJECT(30, "维修通知对象");
+
+        private int value;
+        private String description;
+
+        MES_EQU_NOTIFY_OBJECT_CFG_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
 
     /**
      * mes 工位类型
@@ -307,56 +693,7 @@ public class MesEnumUtil {
      * mes设备作业要求-作业类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_INSERT_EXCEL {
-
-        MES_PLAN_ORDER(10, "生产计划"),
-        MES_EQUIPMENT(20, "设备台账"),
-        MES_EQU_TASK_STANDARD(30, "设备作业要求");
-
-        private int value;
-        private String description;
-
-        MES_INSERT_EXCEL(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        // 根据value返回枚举类型,主要在switch中使用
-        public static MES_INSERT_EXCEL getByValue(int value) {
-            for (MES_INSERT_EXCEL mesInsertExcel : values()) {
-                if (mesInsertExcel.getValue() == value) {
-                    return mesInsertExcel;
-                }
-            }
-            return null;
-        }
-
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-    }
-
-    /**
-     * mes设备作业要求-作业类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_STANDARD_TASK_TYPE {
+    public enum MES_EQU_TASK_TYPE {
 
         CHECK(10, "点检"),
         MAINTAIN(20, "保养"),
@@ -365,7 +702,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) {
+        MES_EQU_TASK_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
new file mode 100644
index 0000000..0882b81
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.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 javax.persistence.Transient;
+
+/**
+ * @Description :设备通知对象配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQU_NOTIFY_OBJECT_CFG")
+@Api("设备通知对象配置")
+public class MesEquNotifyObjectCfg extends BaseBean {
+    @Column(name="NOTIFY_OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String notifyObjectCode;
+
+    @Column(name="NOTIFY_OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String notifyObjectName;
+
+    @Column(name="NOTIFY_OBJECT_VALUE")
+    @ApiParam("对象值")
+    private String notifyObjectValue;
+
+    @Column(name="NOTIFY_OBJECT_TYPE")
+    @ApiParam("对象类型")
+    private Integer notifyObjectType;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
new file mode 100644
index 0000000..b47ef5d
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
@@ -0,0 +1,51 @@
+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;
+
+/**
+ * @Description :设备作业通知配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQU_TASK_NOTIFY_CFG")
+@Api("设备作业通知配置")
+public class MesEquTaskNotifyCfg extends BaseBean {
+    @Column(name="TASK_TYPE")
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @Column(name="NOTIFY_TYPE")
+    @ApiParam("通知类型")
+    private Integer notifyType;
+
+    @Column(name="NOTIFY_CONDITION")
+    @ApiParam("通知条件（小时）")
+    private Integer notifyCondition;
+
+    @Column(name="NOTIFY_OBJECT_CODE")
+    @ApiParam("通知对象")
+    private String notifyObjectCode;
+
+    @Column(name="NOTIFY_PATTERN")
+    @ApiParam("通知方式")
+    private Integer notifyPattern;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java
new file mode 100644
index 0000000..f963452
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java
@@ -0,0 +1,92 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesEquTaskNotifyModel implements Serializable {
+
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @ApiParam("作业状态")
+    private Integer taskStatus;
+
+    @ApiParam(value="生产线")
+    private String workCenterCode;
+
+    @ApiParam("计划日期")
+    private String planTime;
+
+    @ApiParam("任务来源")
+    private Integer taskSource;
+
+    @ApiParam("通知标识")
+    private Integer notifyFlag;
+
+    @ApiParam("关联任务")
+    private String relateTask;
+
+    @ApiParam("通知类型")
+    private Integer notifyType;
+
+    @ApiParam("通知条件（小时）")
+    private Integer notifyCondition;
+
+    @ApiParam("通知对象")
+    private String notifyObjectCode;
+
+    @ApiParam("通知方式")
+    private Integer notifyPattern;
+
+    @ApiParam("对象值")
+    private String notifyObjectValue;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+    @ApiParam("作业状态")
+    private String taskStatusName;
+
+    @ApiParam("任务来源")
+    private String taskSourceName;
+
+    @ApiParam("通知标识")
+    private String notifyFlagName;
+
+    @ApiParam("通知类型")
+    private Integer notifyTypeName;
+
+    @ApiParam("通知方式")
+    private Integer notifyPatternName;
+
+
+    public MesEquTaskNotifyModel() {
+
+    }
+
+    public MesEquTaskNotifyModel(String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, Integer notifyFlag, String relateTask, Integer notifyType, Integer notifyCondition, String notifyObjectCode, Integer notifyPattern, String notifyObjectValue, String organizeCode) {
+        this.taskNo = taskNo;
+        this.taskType = taskType;
+        this.taskStatus = taskStatus;
+        this.workCenterCode = workCenterCode;
+        this.planTime = planTime;
+        this.taskSource = taskSource;
+        this.notifyFlag = notifyFlag;
+        this.relateTask = relateTask;
+        this.notifyType = notifyType;
+        this.notifyCondition = notifyCondition;
+        this.notifyObjectCode = notifyObjectCode;
+        this.notifyPattern = notifyPattern;
+        this.notifyObjectValue = notifyObjectValue;
+        this.organizeCode = organizeCode;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.java
new file mode 100644
index 0000000..3b33ddd
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquNotifyObjectCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesEquNotifyObjectCfgRepository extends BaseRepository<MesEquNotifyObjectCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.java
new file mode 100644
index 0000000..f97ef1b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskNotifyCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskNotifyCfgRepository extends BaseRepository<MesEquTaskNotifyCfg, 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 194d8cf..e641869 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
@@ -1400,6 +1400,7 @@ public class MesHqlPack {
     }
 
     /**
+<<<<<<< Updated upstream
      * MES 缺陷查询条件封装
      * @param mesDefect
      * @param organizeCode
@@ -1439,6 +1440,54 @@ public class MesHqlPack {
         return packBean;
     }
 
+
+    /** 设备通知对象配置 查询条件封装
+     * @param mesEquNotifyObjectCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquNotifyObjectCfg(MesEquNotifyObjectCfg mesEquNotifyObjectCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquNotifyObjectCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectCode(), "notifyObjectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) {
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean);
+        }
+        return packBean;
+    }
+
+    /** 设备作业通知配置  查询条件封装
+     * @param mesEquTaskNotifyCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskNotifyCfg(MesEquTaskNotifyCfg mesEquTaskNotifyCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskNotifyCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquTaskNotifyCfg.getNotifyObjectCode(), "notifyObjectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getTaskType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getTaskType(), "taskType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyType(), "notifyType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyCondition())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyCondition(), "notifyCondition", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyPattern())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyPattern(), "notifyPattern", packBean);
+        }
+        return packBean;
+    }
+
     /**
      * MES 类型信息查询条件封装
      * @param mesTypeCfg
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
index 3a35968..d61b983 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
@@ -154,6 +154,12 @@ public class UserDetailModel extends BaseBean {
     @ApiParam(value ="用户所有组织信息")
     private List<String> infoOrganizeIdList;
 
+    @ApiParam(value ="账号ID集合信息")
+    private List<String> userIdList;
+
+    @ApiParam(value ="用户ID集合信息")
+    private List<String> userInfoIdList;
+
     public SysUser getSysUser(){
         SysUser user = new SysUser();
         user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null);
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 572f63f..4e34946 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -524,10 +524,13 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean(user);
 
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
+
         DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
         DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         DdlPreparedPack.getInPackList(idList,"id",result);
         result.setOrderByStr(user.orderBy());
@@ -651,6 +654,10 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
         DdlPreparedPack.getInPackList(idList,"id",result);
 
+        if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
+            DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result);
+        }
+
         // Like
         DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result);
         DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);