diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java
index 23b678c..39e3fd6 100644
--- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java
@@ -1,32 +1,23 @@
 package com.rzyc.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rzyc.model.OADistribution;
-import com.rzyc.model.OADistributionExample;
+import com.rzyc.model.oth.ManualLable;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface OADistributionMapper {
-    long countByExample(OADistributionExample example);
-
-    int deleteByExample(OADistributionExample example);
-
+public interface OADistributionMapper extends BaseMapper<OADistribution> {
     int deleteByPrimaryKey(String oadistributionid);
 
     int insert(OADistribution record);
 
     int insertSelective(OADistribution record);
 
-    List<OADistribution> selectByExample(OADistributionExample example);
-
     OADistribution selectByPrimaryKey(String oadistributionid);
 
-    int updateByExampleSelective(@Param("record") OADistribution record, @Param("example") OADistributionExample example);
-
-    int updateByExample(@Param("record") OADistribution record, @Param("example") OADistributionExample example);
-
     int updateByPrimaryKeySelective(OADistribution record);
 
     int updateByPrimaryKey(OADistribution record);
diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java
index 132eefc..131431d 100644
--- a/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/OATaskMapper.java
@@ -1,5 +1,7 @@
 package com.rzyc.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rzyc.model.OADistribution;
 import com.rzyc.model.OATask;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -7,24 +9,10 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface OATaskMapper {
-
-    int deleteByPrimaryKey(String oataskid);
+public interface OATaskMapper  extends BaseMapper<OATask> {
 
     int insert(OATask record);
 
-    int insertSelective(OATask record);
-
-
-    OATask selectByPrimaryKey(String oataskid);
-
-
-    int updateByPrimaryKeySelective(OATask record);
-
-    int updateByPrimaryKeyWithBLOBs(OATask record);
-
-    int updateByPrimaryKey(OATask record);
-
     /*发布任务列表*/
     List<OATask> sendTaskPage(@Param("sysUserId") String sysUserId,
                               @Param("condition") String condition,
diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java
new file mode 100644
index 0000000..c621f77
--- /dev/null
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java
@@ -0,0 +1,16 @@
+package com.rzyc.mapper.ent;
+
+import com.rzyc.model.ent.InEntList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业清单 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2022-09-20
+ */
+public interface InEntListMapper extends BaseMapper<InEntList> {
+
+}
diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java
new file mode 100644
index 0000000..d9c6cd9
--- /dev/null
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java
@@ -0,0 +1,16 @@
+package com.rzyc.mapper.ent;
+
+import com.rzyc.model.ent.InListItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 行业清单项 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2022-09-20
+ */
+public interface InListItemMapper extends BaseMapper<InListItem> {
+
+}
diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java
new file mode 100644
index 0000000..f2d5190
--- /dev/null
+++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java
@@ -0,0 +1,16 @@
+package com.rzyc.mapper.ent;
+
+import com.rzyc.model.ent.InList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 行业清单 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2022-09-20
+ */
+public interface InListMapper extends BaseMapper<InList> {
+
+}
diff --git a/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java b/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java
index 773f9a8..23af2fc 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/OADistribution.java
@@ -1,5 +1,8 @@
 package com.rzyc.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -7,12 +10,20 @@ import java.util.Date;
  * @author
  */
 public class OADistribution implements Serializable {
+
+    @TableId("OADistributionId")
     private String oadistributionid;
 
+    @TableField("OATaskId")
     private String oataskid;
 
+    @TableField("sned_id")
+    private String snedId;
+
+    @TableField("SysUserId")
     private String sysuserid;
 
+    @TableField("SysChinaName")
     private String syschinaname;
 
     /**
@@ -20,26 +31,85 @@ public class OADistribution implements Serializable {
      */
     private String receiveName;
 
-    /**
-     * 0刚发出来 100已完成
-     */
+    @TableField("SysTelephone")
     private String systelephone;
 
+    @TableField("title")
+    private String title;
+
+    @TableField("subject")
+    private String subject;
+
+    @TableField("start_time")
+    private Date startTime;
+
+    @TableField("end_time")
+    private Date endTime;
+
     /**
      * 未执行 执行中 执行完成
      */
-    private String appstatus = "未读";
+    @TableField("AppStatus")
+    private String appstatus;
 
-    private Date createdon = new Date();
+    @TableField("CreatedOn")
+    private Date createdon;
 
+    @TableField("CreatedBy")
     private String createdby;
 
-    private Date modifiedon = new Date();
+    @TableField("ModifiedOn")
+    private Date modifiedon;
 
+    @TableField("ModifiedBy")
     private String modifiedby;
 
     private static final long serialVersionUID = 1L;
 
+    public String getSnedId() {
+        return snedId;
+    }
+
+    public void setSnedId(String snedId) {
+        this.snedId = snedId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     public String getReceiveName() {
         return receiveName;
     }
diff --git a/inventory-dao/src/main/java/com/rzyc/model/OADistributionExample.java b/inventory-dao/src/main/java/com/rzyc/model/OADistributionExample.java
deleted file mode 100644
index 2c38aae..0000000
--- a/inventory-dao/src/main/java/com/rzyc/model/OADistributionExample.java
+++ /dev/null
@@ -1,903 +0,0 @@
-package com.rzyc.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class OADistributionExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    private Integer limit;
-
-    private Integer offset;
-
-    public OADistributionExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andOadistributionidIsNull() {
-            addCriterion("OADistributionId is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidIsNotNull() {
-            addCriterion("OADistributionId is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidEqualTo(String value) {
-            addCriterion("OADistributionId =", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidNotEqualTo(String value) {
-            addCriterion("OADistributionId <>", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidGreaterThan(String value) {
-            addCriterion("OADistributionId >", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidGreaterThanOrEqualTo(String value) {
-            addCriterion("OADistributionId >=", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidLessThan(String value) {
-            addCriterion("OADistributionId <", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidLessThanOrEqualTo(String value) {
-            addCriterion("OADistributionId <=", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidLike(String value) {
-            addCriterion("OADistributionId like", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidNotLike(String value) {
-            addCriterion("OADistributionId not like", value, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidIn(List<String> values) {
-            addCriterion("OADistributionId in", values, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidNotIn(List<String> values) {
-            addCriterion("OADistributionId not in", values, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidBetween(String value1, String value2) {
-            addCriterion("OADistributionId between", value1, value2, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOadistributionidNotBetween(String value1, String value2) {
-            addCriterion("OADistributionId not between", value1, value2, "oadistributionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidIsNull() {
-            addCriterion("OATaskId is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidIsNotNull() {
-            addCriterion("OATaskId is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidEqualTo(String value) {
-            addCriterion("OATaskId =", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidNotEqualTo(String value) {
-            addCriterion("OATaskId <>", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidGreaterThan(String value) {
-            addCriterion("OATaskId >", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidGreaterThanOrEqualTo(String value) {
-            addCriterion("OATaskId >=", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidLessThan(String value) {
-            addCriterion("OATaskId <", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidLessThanOrEqualTo(String value) {
-            addCriterion("OATaskId <=", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidLike(String value) {
-            addCriterion("OATaskId like", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidNotLike(String value) {
-            addCriterion("OATaskId not like", value, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidIn(List<String> values) {
-            addCriterion("OATaskId in", values, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidNotIn(List<String> values) {
-            addCriterion("OATaskId not in", values, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidBetween(String value1, String value2) {
-            addCriterion("OATaskId between", value1, value2, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andOataskidNotBetween(String value1, String value2) {
-            addCriterion("OATaskId not between", value1, value2, "oataskid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridIsNull() {
-            addCriterion("SysUserId is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridIsNotNull() {
-            addCriterion("SysUserId is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridEqualTo(String value) {
-            addCriterion("SysUserId =", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridNotEqualTo(String value) {
-            addCriterion("SysUserId <>", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridGreaterThan(String value) {
-            addCriterion("SysUserId >", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridGreaterThanOrEqualTo(String value) {
-            addCriterion("SysUserId >=", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridLessThan(String value) {
-            addCriterion("SysUserId <", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridLessThanOrEqualTo(String value) {
-            addCriterion("SysUserId <=", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridLike(String value) {
-            addCriterion("SysUserId like", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridNotLike(String value) {
-            addCriterion("SysUserId not like", value, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridIn(List<String> values) {
-            addCriterion("SysUserId in", values, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridNotIn(List<String> values) {
-            addCriterion("SysUserId not in", values, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridBetween(String value1, String value2) {
-            addCriterion("SysUserId between", value1, value2, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSysuseridNotBetween(String value1, String value2) {
-            addCriterion("SysUserId not between", value1, value2, "sysuserid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameIsNull() {
-            addCriterion("SysChinaName is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameIsNotNull() {
-            addCriterion("SysChinaName is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameEqualTo(String value) {
-            addCriterion("SysChinaName =", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameNotEqualTo(String value) {
-            addCriterion("SysChinaName <>", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameGreaterThan(String value) {
-            addCriterion("SysChinaName >", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameGreaterThanOrEqualTo(String value) {
-            addCriterion("SysChinaName >=", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameLessThan(String value) {
-            addCriterion("SysChinaName <", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameLessThanOrEqualTo(String value) {
-            addCriterion("SysChinaName <=", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameLike(String value) {
-            addCriterion("SysChinaName like", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameNotLike(String value) {
-            addCriterion("SysChinaName not like", value, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameIn(List<String> values) {
-            addCriterion("SysChinaName in", values, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameNotIn(List<String> values) {
-            addCriterion("SysChinaName not in", values, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameBetween(String value1, String value2) {
-            addCriterion("SysChinaName between", value1, value2, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSyschinanameNotBetween(String value1, String value2) {
-            addCriterion("SysChinaName not between", value1, value2, "syschinaname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneIsNull() {
-            addCriterion("SysTelephone is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneIsNotNull() {
-            addCriterion("SysTelephone is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneEqualTo(String value) {
-            addCriterion("SysTelephone =", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneNotEqualTo(String value) {
-            addCriterion("SysTelephone <>", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneGreaterThan(String value) {
-            addCriterion("SysTelephone >", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneGreaterThanOrEqualTo(String value) {
-            addCriterion("SysTelephone >=", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneLessThan(String value) {
-            addCriterion("SysTelephone <", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneLessThanOrEqualTo(String value) {
-            addCriterion("SysTelephone <=", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneLike(String value) {
-            addCriterion("SysTelephone like", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneNotLike(String value) {
-            addCriterion("SysTelephone not like", value, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneIn(List<String> values) {
-            addCriterion("SysTelephone in", values, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneNotIn(List<String> values) {
-            addCriterion("SysTelephone not in", values, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneBetween(String value1, String value2) {
-            addCriterion("SysTelephone between", value1, value2, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystelephoneNotBetween(String value1, String value2) {
-            addCriterion("SysTelephone not between", value1, value2, "systelephone");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusIsNull() {
-            addCriterion("AppStatus is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusIsNotNull() {
-            addCriterion("AppStatus is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusEqualTo(String value) {
-            addCriterion("AppStatus =", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusNotEqualTo(String value) {
-            addCriterion("AppStatus <>", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusGreaterThan(String value) {
-            addCriterion("AppStatus >", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusGreaterThanOrEqualTo(String value) {
-            addCriterion("AppStatus >=", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusLessThan(String value) {
-            addCriterion("AppStatus <", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusLessThanOrEqualTo(String value) {
-            addCriterion("AppStatus <=", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusLike(String value) {
-            addCriterion("AppStatus like", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusNotLike(String value) {
-            addCriterion("AppStatus not like", value, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusIn(List<String> values) {
-            addCriterion("AppStatus in", values, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusNotIn(List<String> values) {
-            addCriterion("AppStatus not in", values, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusBetween(String value1, String value2) {
-            addCriterion("AppStatus between", value1, value2, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andAppstatusNotBetween(String value1, String value2) {
-            addCriterion("AppStatus not between", value1, value2, "appstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonIsNull() {
-            addCriterion("CreatedOn is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonIsNotNull() {
-            addCriterion("CreatedOn is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonEqualTo(Date value) {
-            addCriterion("CreatedOn =", value, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonNotEqualTo(Date value) {
-            addCriterion("CreatedOn <>", value, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonGreaterThan(Date value) {
-            addCriterion("CreatedOn >", value, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonGreaterThanOrEqualTo(Date value) {
-            addCriterion("CreatedOn >=", value, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonLessThan(Date value) {
-            addCriterion("CreatedOn <", value, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonLessThanOrEqualTo(Date value) {
-            addCriterion("CreatedOn <=", value, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonIn(List<Date> values) {
-            addCriterion("CreatedOn in", values, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonNotIn(List<Date> values) {
-            addCriterion("CreatedOn not in", values, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonBetween(Date value1, Date value2) {
-            addCriterion("CreatedOn between", value1, value2, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedonNotBetween(Date value1, Date value2) {
-            addCriterion("CreatedOn not between", value1, value2, "createdon");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyIsNull() {
-            addCriterion("CreatedBy is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyIsNotNull() {
-            addCriterion("CreatedBy is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyEqualTo(String value) {
-            addCriterion("CreatedBy =", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyNotEqualTo(String value) {
-            addCriterion("CreatedBy <>", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyGreaterThan(String value) {
-            addCriterion("CreatedBy >", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyGreaterThanOrEqualTo(String value) {
-            addCriterion("CreatedBy >=", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyLessThan(String value) {
-            addCriterion("CreatedBy <", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyLessThanOrEqualTo(String value) {
-            addCriterion("CreatedBy <=", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyLike(String value) {
-            addCriterion("CreatedBy like", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyNotLike(String value) {
-            addCriterion("CreatedBy not like", value, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyIn(List<String> values) {
-            addCriterion("CreatedBy in", values, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyNotIn(List<String> values) {
-            addCriterion("CreatedBy not in", values, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyBetween(String value1, String value2) {
-            addCriterion("CreatedBy between", value1, value2, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatedbyNotBetween(String value1, String value2) {
-            addCriterion("CreatedBy not between", value1, value2, "createdby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonIsNull() {
-            addCriterion("ModifiedOn is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonIsNotNull() {
-            addCriterion("ModifiedOn is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonEqualTo(Date value) {
-            addCriterion("ModifiedOn =", value, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonNotEqualTo(Date value) {
-            addCriterion("ModifiedOn <>", value, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonGreaterThan(Date value) {
-            addCriterion("ModifiedOn >", value, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonGreaterThanOrEqualTo(Date value) {
-            addCriterion("ModifiedOn >=", value, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonLessThan(Date value) {
-            addCriterion("ModifiedOn <", value, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonLessThanOrEqualTo(Date value) {
-            addCriterion("ModifiedOn <=", value, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonIn(List<Date> values) {
-            addCriterion("ModifiedOn in", values, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonNotIn(List<Date> values) {
-            addCriterion("ModifiedOn not in", values, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonBetween(Date value1, Date value2) {
-            addCriterion("ModifiedOn between", value1, value2, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedonNotBetween(Date value1, Date value2) {
-            addCriterion("ModifiedOn not between", value1, value2, "modifiedon");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyIsNull() {
-            addCriterion("ModifiedBy is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyIsNotNull() {
-            addCriterion("ModifiedBy is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyEqualTo(String value) {
-            addCriterion("ModifiedBy =", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyNotEqualTo(String value) {
-            addCriterion("ModifiedBy <>", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyGreaterThan(String value) {
-            addCriterion("ModifiedBy >", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyGreaterThanOrEqualTo(String value) {
-            addCriterion("ModifiedBy >=", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyLessThan(String value) {
-            addCriterion("ModifiedBy <", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyLessThanOrEqualTo(String value) {
-            addCriterion("ModifiedBy <=", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyLike(String value) {
-            addCriterion("ModifiedBy like", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyNotLike(String value) {
-            addCriterion("ModifiedBy not like", value, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyIn(List<String> values) {
-            addCriterion("ModifiedBy in", values, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyNotIn(List<String> values) {
-            addCriterion("ModifiedBy not in", values, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyBetween(String value1, String value2) {
-            addCriterion("ModifiedBy between", value1, value2, "modifiedby");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifiedbyNotBetween(String value1, String value2) {
-            addCriterion("ModifiedBy not between", value1, value2, "modifiedby");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     */
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}
diff --git a/inventory-dao/src/main/java/com/rzyc/model/OATask.java b/inventory-dao/src/main/java/com/rzyc/model/OATask.java
index 4526722..37c6e6b 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/OATask.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/OATask.java
@@ -1,5 +1,7 @@
 package com.rzyc.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.rzyc.enums.DelState;
 import io.swagger.annotations.ApiModel;
@@ -16,37 +18,39 @@ import java.util.List;
 @ApiModel("任务、待办事项")
 public class OATask implements Serializable {
 
+    @TableId("OATaskId")
     @ApiModelProperty("任务id")
     private String oataskid;
 
-    private String oataskmgrid;
+    @TableField("OTCId")
+    @ApiModelProperty("来源id")
+    private String otcid;
 
+    @TableField("TaskType")
     @ApiModelProperty("任务类型")
     private String tasktype;
 
-    private String taskflow;
-
-    private String taskdepart;
-
-    private String tasklevel;
-
-    private String taskperson;
-
-    private String taskviewer;
+    @TableField("send_id")
+    @ApiModelProperty("任务发布人")
+    private String sendId;
 
     /**
      * 0刚发出来 100已完成
      */
+    @TableField("SysPercent")
     private Integer syspercent;
 
+    @TableField("StartDate")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("开始时间")
     private Date startdate;
 
+    @TableField("EndDate")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("结束时间")
     private Date enddate;
 
+    @TableField("PlanEndDate")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("计划完成时间")
     private Date planenddate;
@@ -54,181 +58,111 @@ public class OATask implements Serializable {
     /**
      * 未执行 执行中 执行完成
      */
+    @TableField("AppStatus")
     private String appstatus;
 
     /**
      * 发送部门
      */
+    @TableField(exist = false)
     @ApiModelProperty("发送部门")
     private String unitName;
 
+    @TableField("title")
+    @ApiModelProperty("任务名称")
+    private String title;
+
+    @TableField("Subject")
     @ApiModelProperty("任务内容")
     private String subject;
 
     /**
      * 已完成次数
      */
+    @TableField("Frequency")
     @ApiModelProperty("已完成次数")
     private Long frequency;
 
     /**
      * 总次数
      */
+    @TableField(exist = false)
     @ApiModelProperty("总次数")
     private Long totalFrequency;
 
-    private Integer attachmentflag;
-
-    private String priority;
-
+    @TableField("IsFinish")
     @ApiModelProperty("任务完成状态")
     private String isfinish;
 
-    private String oalabel;
-
-    private String linkedurl;
-
-    private String readback;
-
-    private String otcid;
-
-    /**
-     * 安全检查，复查，填报
-     */
-    private String otctype;
 
+    @TableField("CreatedOn")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")
-    private Date createdon = new Date();
+    private Date createdon;
 
+    @TableField("CreatedBy")
     @ApiModelProperty("创建人")
     private String createdby;
 
+    @TableField("ModifiedOn")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("修改时间")
-    private Date modifiedon = new Date();
+    private Date modifiedon;
 
+    @TableField("ModifiedBy")
     @ApiModelProperty("修改人")
     private String modifiedby;
 
-    private String docbody;
-
     /**
      * 任务已读人数
      */
+    @TableField(exist = false)
     @ApiModelProperty("任务已读人数")
     private Long checkNum;
 
     /**
      * 发布人
      */
+    @TableField(exist = false)
     @ApiModelProperty("发布人")
     private String sendName;
 
     /**
      * 任务状态
      */
+    @TableField(exist = false)
     @ApiModelProperty("任务状态")
     private String taskStatus;
 
     /**
      * 红色提醒日期
      */
+    @TableField(exist = false)
     @ApiModelProperty("红色提醒日期")
     private Integer redAlert;
 
     /**
      * 黄色
      */
+    @TableField(exist = false)
     @ApiModelProperty("黄色提醒日期")
     private Integer yellowAlert;
 
     /**
      * 删除状态 1：正常 2:已删除
      */
-    private Integer delState = DelState.NOT_DEL.getState();
+    @TableField("del_state")
+    private Integer delState;
 
     @ApiModelProperty("任务接收人")
     private List<OADistribution> distributions = new ArrayList<>();
 
-    public Integer getDelState() {
-        return delState;
+    public String getOtcid() {
+        return otcid;
     }
 
-    public void setDelState(Integer delState) {
-        this.delState = delState;
-    }
-
-    public Integer getRedAlert() {
-        return redAlert;
-    }
-
-    public void setRedAlert(Integer redAlert) {
-        this.redAlert = redAlert;
-    }
-
-    public Integer getYellowAlert() {
-        return yellowAlert;
-    }
-
-    public void setYellowAlert(Integer yellowAlert) {
-        this.yellowAlert = yellowAlert;
-    }
-
-    public Long getTotalFrequency() {
-        return totalFrequency;
-    }
-
-    public void setTotalFrequency(Long totalFrequency) {
-        this.totalFrequency = totalFrequency;
-    }
-
-    public Long getFrequency() {
-        return frequency;
-    }
-
-    public void setFrequency(Long frequency) {
-        this.frequency = frequency;
-    }
-
-    public String getUnitName() {
-        return unitName;
-    }
-
-    public void setUnitName(String unitName) {
-        this.unitName = unitName;
-    }
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-
-    public void setTaskStatus(String taskStatus) {
-        this.taskStatus = taskStatus;
-    }
-
-    public List<OADistribution> getDistributions() {
-        return distributions;
-    }
-
-    public void setDistributions(List<OADistribution> distributions) {
-        this.distributions = distributions;
-    }
-
-    public String getSendName() {
-        return sendName;
-    }
-
-    public void setSendName(String sendName) {
-        this.sendName = sendName;
-    }
-
-    public Long getCheckNum() {
-        return checkNum;
-    }
-
-    public void setCheckNum(Long checkNum) {
-        this.checkNum = checkNum;
+    public void setOtcid(String otcid) {
+        this.otcid = otcid;
     }
 
     public String getOataskid() {
@@ -239,14 +173,6 @@ public class OATask implements Serializable {
         this.oataskid = oataskid;
     }
 
-    public String getOataskmgrid() {
-        return oataskmgrid;
-    }
-
-    public void setOataskmgrid(String oataskmgrid) {
-        this.oataskmgrid = oataskmgrid;
-    }
-
     public String getTasktype() {
         return tasktype;
     }
@@ -255,44 +181,12 @@ public class OATask implements Serializable {
         this.tasktype = tasktype;
     }
 
-    public String getTaskflow() {
-        return taskflow;
+    public String getSendId() {
+        return sendId;
     }
 
-    public void setTaskflow(String taskflow) {
-        this.taskflow = taskflow;
-    }
-
-    public String getTaskdepart() {
-        return taskdepart;
-    }
-
-    public void setTaskdepart(String taskdepart) {
-        this.taskdepart = taskdepart;
-    }
-
-    public String getTasklevel() {
-        return tasklevel;
-    }
-
-    public void setTasklevel(String tasklevel) {
-        this.tasklevel = tasklevel;
-    }
-
-    public String getTaskperson() {
-        return taskperson;
-    }
-
-    public void setTaskperson(String taskperson) {
-        this.taskperson = taskperson;
-    }
-
-    public String getTaskviewer() {
-        return taskviewer;
-    }
-
-    public void setTaskviewer(String taskviewer) {
-        this.taskviewer = taskviewer;
+    public void setSendId(String sendId) {
+        this.sendId = sendId;
     }
 
     public Integer getSyspercent() {
@@ -335,6 +229,22 @@ public class OATask implements Serializable {
         this.appstatus = appstatus;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getSubject() {
         return subject;
     }
@@ -343,20 +253,20 @@ public class OATask implements Serializable {
         this.subject = subject;
     }
 
-    public Integer getAttachmentflag() {
-        return attachmentflag;
+    public Long getFrequency() {
+        return frequency;
     }
 
-    public void setAttachmentflag(Integer attachmentflag) {
-        this.attachmentflag = attachmentflag;
+    public void setFrequency(Long frequency) {
+        this.frequency = frequency;
     }
 
-    public String getPriority() {
-        return priority;
+    public Long getTotalFrequency() {
+        return totalFrequency;
     }
 
-    public void setPriority(String priority) {
-        this.priority = priority;
+    public void setTotalFrequency(Long totalFrequency) {
+        this.totalFrequency = totalFrequency;
     }
 
     public String getIsfinish() {
@@ -367,46 +277,6 @@ public class OATask implements Serializable {
         this.isfinish = isfinish;
     }
 
-    public String getOalabel() {
-        return oalabel;
-    }
-
-    public void setOalabel(String oalabel) {
-        this.oalabel = oalabel;
-    }
-
-    public String getLinkedurl() {
-        return linkedurl;
-    }
-
-    public void setLinkedurl(String linkedurl) {
-        this.linkedurl = linkedurl;
-    }
-
-    public String getReadback() {
-        return readback;
-    }
-
-    public void setReadback(String readback) {
-        this.readback = readback;
-    }
-
-    public String getOtcid() {
-        return otcid;
-    }
-
-    public void setOtcid(String otcid) {
-        this.otcid = otcid;
-    }
-
-    public String getOtctype() {
-        return otctype;
-    }
-
-    public void setOtctype(String otctype) {
-        this.otctype = otctype;
-    }
-
     public Date getCreatedon() {
         return createdon;
     }
@@ -439,123 +309,59 @@ public class OATask implements Serializable {
         this.modifiedby = modifiedby;
     }
 
-    public String getDocbody() {
-        return docbody;
+    public Long getCheckNum() {
+        return checkNum;
     }
 
-    public void setDocbody(String docbody) {
-        this.docbody = docbody;
+    public void setCheckNum(Long checkNum) {
+        this.checkNum = checkNum;
     }
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        OATask other = (OATask) that;
-        return (this.getOataskid() == null ? other.getOataskid() == null : this.getOataskid().equals(other.getOataskid()))
-            && (this.getOataskmgrid() == null ? other.getOataskmgrid() == null : this.getOataskmgrid().equals(other.getOataskmgrid()))
-            && (this.getTasktype() == null ? other.getTasktype() == null : this.getTasktype().equals(other.getTasktype()))
-            && (this.getTaskflow() == null ? other.getTaskflow() == null : this.getTaskflow().equals(other.getTaskflow()))
-            && (this.getTaskdepart() == null ? other.getTaskdepart() == null : this.getTaskdepart().equals(other.getTaskdepart()))
-            && (this.getTasklevel() == null ? other.getTasklevel() == null : this.getTasklevel().equals(other.getTasklevel()))
-            && (this.getTaskperson() == null ? other.getTaskperson() == null : this.getTaskperson().equals(other.getTaskperson()))
-            && (this.getTaskviewer() == null ? other.getTaskviewer() == null : this.getTaskviewer().equals(other.getTaskviewer()))
-            && (this.getSyspercent() == null ? other.getSyspercent() == null : this.getSyspercent().equals(other.getSyspercent()))
-            && (this.getStartdate() == null ? other.getStartdate() == null : this.getStartdate().equals(other.getStartdate()))
-            && (this.getEnddate() == null ? other.getEnddate() == null : this.getEnddate().equals(other.getEnddate()))
-            && (this.getPlanenddate() == null ? other.getPlanenddate() == null : this.getPlanenddate().equals(other.getPlanenddate()))
-            && (this.getAppstatus() == null ? other.getAppstatus() == null : this.getAppstatus().equals(other.getAppstatus()))
-            && (this.getSubject() == null ? other.getSubject() == null : this.getSubject().equals(other.getSubject()))
-            && (this.getAttachmentflag() == null ? other.getAttachmentflag() == null : this.getAttachmentflag().equals(other.getAttachmentflag()))
-            && (this.getPriority() == null ? other.getPriority() == null : this.getPriority().equals(other.getPriority()))
-            && (this.getIsfinish() == null ? other.getIsfinish() == null : this.getIsfinish().equals(other.getIsfinish()))
-            && (this.getOalabel() == null ? other.getOalabel() == null : this.getOalabel().equals(other.getOalabel()))
-            && (this.getLinkedurl() == null ? other.getLinkedurl() == null : this.getLinkedurl().equals(other.getLinkedurl()))
-            && (this.getReadback() == null ? other.getReadback() == null : this.getReadback().equals(other.getReadback()))
-            && (this.getOtcid() == null ? other.getOtcid() == null : this.getOtcid().equals(other.getOtcid()))
-            && (this.getOtctype() == null ? other.getOtctype() == null : this.getOtctype().equals(other.getOtctype()))
-            && (this.getCreatedon() == null ? other.getCreatedon() == null : this.getCreatedon().equals(other.getCreatedon()))
-            && (this.getCreatedby() == null ? other.getCreatedby() == null : this.getCreatedby().equals(other.getCreatedby()))
-            && (this.getModifiedon() == null ? other.getModifiedon() == null : this.getModifiedon().equals(other.getModifiedon()))
-            && (this.getModifiedby() == null ? other.getModifiedby() == null : this.getModifiedby().equals(other.getModifiedby()))
-            && (this.getDocbody() == null ? other.getDocbody() == null : this.getDocbody().equals(other.getDocbody()));
+    public String getSendName() {
+        return sendName;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getOataskid() == null) ? 0 : getOataskid().hashCode());
-        result = prime * result + ((getOataskmgrid() == null) ? 0 : getOataskmgrid().hashCode());
-        result = prime * result + ((getTasktype() == null) ? 0 : getTasktype().hashCode());
-        result = prime * result + ((getTaskflow() == null) ? 0 : getTaskflow().hashCode());
-        result = prime * result + ((getTaskdepart() == null) ? 0 : getTaskdepart().hashCode());
-        result = prime * result + ((getTasklevel() == null) ? 0 : getTasklevel().hashCode());
-        result = prime * result + ((getTaskperson() == null) ? 0 : getTaskperson().hashCode());
-        result = prime * result + ((getTaskviewer() == null) ? 0 : getTaskviewer().hashCode());
-        result = prime * result + ((getSyspercent() == null) ? 0 : getSyspercent().hashCode());
-        result = prime * result + ((getStartdate() == null) ? 0 : getStartdate().hashCode());
-        result = prime * result + ((getEnddate() == null) ? 0 : getEnddate().hashCode());
-        result = prime * result + ((getPlanenddate() == null) ? 0 : getPlanenddate().hashCode());
-        result = prime * result + ((getAppstatus() == null) ? 0 : getAppstatus().hashCode());
-        result = prime * result + ((getSubject() == null) ? 0 : getSubject().hashCode());
-        result = prime * result + ((getAttachmentflag() == null) ? 0 : getAttachmentflag().hashCode());
-        result = prime * result + ((getPriority() == null) ? 0 : getPriority().hashCode());
-        result = prime * result + ((getIsfinish() == null) ? 0 : getIsfinish().hashCode());
-        result = prime * result + ((getOalabel() == null) ? 0 : getOalabel().hashCode());
-        result = prime * result + ((getLinkedurl() == null) ? 0 : getLinkedurl().hashCode());
-        result = prime * result + ((getReadback() == null) ? 0 : getReadback().hashCode());
-        result = prime * result + ((getOtcid() == null) ? 0 : getOtcid().hashCode());
-        result = prime * result + ((getOtctype() == null) ? 0 : getOtctype().hashCode());
-        result = prime * result + ((getCreatedon() == null) ? 0 : getCreatedon().hashCode());
-        result = prime * result + ((getCreatedby() == null) ? 0 : getCreatedby().hashCode());
-        result = prime * result + ((getModifiedon() == null) ? 0 : getModifiedon().hashCode());
-        result = prime * result + ((getModifiedby() == null) ? 0 : getModifiedby().hashCode());
-        result = prime * result + ((getDocbody() == null) ? 0 : getDocbody().hashCode());
-        return result;
+    public void setSendName(String sendName) {
+        this.sendName = sendName;
     }
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", oataskid=").append(oataskid);
-        sb.append(", oataskmgrid=").append(oataskmgrid);
-        sb.append(", tasktype=").append(tasktype);
-        sb.append(", taskflow=").append(taskflow);
-        sb.append(", taskdepart=").append(taskdepart);
-        sb.append(", tasklevel=").append(tasklevel);
-        sb.append(", taskperson=").append(taskperson);
-        sb.append(", taskviewer=").append(taskviewer);
-        sb.append(", syspercent=").append(syspercent);
-        sb.append(", startdate=").append(startdate);
-        sb.append(", enddate=").append(enddate);
-        sb.append(", planenddate=").append(planenddate);
-        sb.append(", appstatus=").append(appstatus);
-        sb.append(", subject=").append(subject);
-        sb.append(", attachmentflag=").append(attachmentflag);
-        sb.append(", priority=").append(priority);
-        sb.append(", isfinish=").append(isfinish);
-        sb.append(", oalabel=").append(oalabel);
-        sb.append(", linkedurl=").append(linkedurl);
-        sb.append(", readback=").append(readback);
-        sb.append(", otcid=").append(otcid);
-        sb.append(", otctype=").append(otctype);
-        sb.append(", createdon=").append(createdon);
-        sb.append(", createdby=").append(createdby);
-        sb.append(", modifiedon=").append(modifiedon);
-        sb.append(", modifiedby=").append(modifiedby);
-        sb.append(", docbody=").append(docbody);
-        sb.append("]");
-        return sb.toString();
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+
+    public Integer getRedAlert() {
+        return redAlert;
+    }
+
+    public void setRedAlert(Integer redAlert) {
+        this.redAlert = redAlert;
+    }
+
+    public Integer getYellowAlert() {
+        return yellowAlert;
+    }
+
+    public void setYellowAlert(Integer yellowAlert) {
+        this.yellowAlert = yellowAlert;
+    }
+
+    public Integer getDelState() {
+        return delState;
+    }
+
+    public void setDelState(Integer delState) {
+        this.delState = delState;
+    }
+
+    public List<OADistribution> getDistributions() {
+        return distributions;
+    }
+
+    public void setDistributions(List<OADistribution> distributions) {
+        this.distributions = distributions;
     }
 }
diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InEntList.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InEntList.java
new file mode 100644
index 0000000..68dacea
--- /dev/null
+++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InEntList.java
@@ -0,0 +1,223 @@
+package com.rzyc.model.ent;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 企业清单
+ * </p>
+ *
+ * @author
+ * @since 2022-09-20
+ */
+@TableName("in_ent_list")
+@ApiModel(value="InEntList对象", description="企业清单")
+public class InEntList implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "企业清单id")
+    @TableId("ent_list_id")
+    private String entListId;
+
+    @ApiModelProperty(value = "清单项id")
+    @TableField("item_id")
+    private String itemId;
+
+    @ApiModelProperty(value = "清单id")
+    @TableField("list_id")
+    private String listId;
+
+    @ApiModelProperty(value = "企业id")
+    @TableField("enterprise_id")
+    private String enterpriseId;
+
+    @ApiModelProperty(value = "清单内容")
+    @TableField("item_content")
+    private String itemContent;
+
+    @ApiModelProperty(value = "考核指标 1:每年 2：每半年 4：每季度 12:每月")
+    @TableField("standard")
+    private Integer standard;
+
+    @ApiModelProperty(value = "频率")
+    @TableField("frequency")
+    private Integer frequency;
+
+    @ApiModelProperty(value = "附件地址 多个逗号隔开")
+    @TableField("enclosure")
+    private String enclosure;
+
+    @ApiModelProperty(value = "清单依据")
+    @TableField("item_basis")
+    private String itemBasis;
+
+    @ApiModelProperty(value = "清单主要证据")
+    @TableField("item_proof")
+    private String itemProof;
+
+    @ApiModelProperty(value = "清单法律法规")
+    @TableField("item_law")
+    private String itemLaw;
+
+    @ApiModelProperty(value = "排序")
+    @TableField("sort_id")
+    private Integer sortId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("modify_time")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("modify_by")
+    private String modifyBy;
+
+    public String getEntListId() {
+        return entListId;
+    }
+
+    public void setEntListId(String entListId) {
+        this.entListId = entListId;
+    }
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+    public String getListId() {
+        return listId;
+    }
+
+    public void setListId(String listId) {
+        this.listId = listId;
+    }
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+    public String getItemContent() {
+        return itemContent;
+    }
+
+    public void setItemContent(String itemContent) {
+        this.itemContent = itemContent;
+    }
+    public Integer getStandard() {
+        return standard;
+    }
+
+    public void setStandard(Integer standard) {
+        this.standard = standard;
+    }
+    public Integer getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(Integer frequency) {
+        this.frequency = frequency;
+    }
+    public String getEnclosure() {
+        return enclosure;
+    }
+
+    public void setEnclosure(String enclosure) {
+        this.enclosure = enclosure;
+    }
+    public String getItemBasis() {
+        return itemBasis;
+    }
+
+    public void setItemBasis(String itemBasis) {
+        this.itemBasis = itemBasis;
+    }
+    public String getItemProof() {
+        return itemProof;
+    }
+
+    public void setItemProof(String itemProof) {
+        this.itemProof = itemProof;
+    }
+    public String getItemLaw() {
+        return itemLaw;
+    }
+
+    public void setItemLaw(String itemLaw) {
+        this.itemLaw = itemLaw;
+    }
+    public Integer getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+    public String getModifyBy() {
+        return modifyBy;
+    }
+
+    public void setModifyBy(String modifyBy) {
+        this.modifyBy = modifyBy;
+    }
+
+    @Override
+    public String toString() {
+        return "InEntList{" +
+            "entListId=" + entListId +
+            ", itemId=" + itemId +
+            ", listId=" + listId +
+            ", enterpriseId=" + enterpriseId +
+            ", itemContent=" + itemContent +
+            ", standard=" + standard +
+            ", frequency=" + frequency +
+            ", enclosure=" + enclosure +
+            ", itemBasis=" + itemBasis +
+            ", itemProof=" + itemProof +
+            ", itemLaw=" + itemLaw +
+            ", sortId=" + sortId +
+            ", createTime=" + createTime +
+            ", createBy=" + createBy +
+            ", modifyTime=" + modifyTime +
+            ", modifyBy=" + modifyBy +
+        "}";
+    }
+}
diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java
new file mode 100644
index 0000000..896e824
--- /dev/null
+++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java
@@ -0,0 +1,115 @@
+package com.rzyc.model.ent;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 行业清单
+ * </p>
+ *
+ * @author
+ * @since 2022-09-20
+ */
+@TableName("in_list")
+@ApiModel(value="InList对象", description="行业清单")
+public class InList implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "行业清单id")
+    @TableId("list_id")
+    private String listId;
+
+    @ApiModelProperty(value = "清单名")
+    @TableField("name")
+    private String name;
+
+    @ApiModelProperty(value = "清单排序")
+    @TableField("sort_id")
+    private Integer sortId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("modify_time")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("modify_by")
+    private String modifyBy;
+
+    public String getListId() {
+        return listId;
+    }
+
+    public void setListId(String listId) {
+        this.listId = listId;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Integer getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+    public String getModifyBy() {
+        return modifyBy;
+    }
+
+    public void setModifyBy(String modifyBy) {
+        this.modifyBy = modifyBy;
+    }
+
+    @Override
+    public String toString() {
+        return "InList{" +
+            "listId=" + listId +
+            ", name=" + name +
+            ", sortId=" + sortId +
+            ", createTime=" + createTime +
+            ", createBy=" + createBy +
+            ", modifyTime=" + modifyTime +
+            ", modifyBy=" + modifyBy +
+        "}";
+    }
+}
diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java
new file mode 100644
index 0000000..5f74bea
--- /dev/null
+++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java
@@ -0,0 +1,211 @@
+package com.rzyc.model.ent;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 行业清单项
+ * </p>
+ *
+ * @author
+ * @since 2022-09-20
+ */
+@TableName("in_list_item")
+@ApiModel(value="InListItem对象", description="行业清单项")
+public class InListItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "清单项id")
+    @TableId("item_id")
+    private String itemId;
+
+    @ApiModelProperty(value = "行业清单id")
+    @TableField("list_id")
+    private String listId;
+
+    @ApiModelProperty(value = "行业id")
+    @TableField("industry_id")
+    private String industryId;
+
+    @ApiModelProperty(value = "清单内容")
+    @TableField("item_content")
+    private String itemContent;
+
+    @ApiModelProperty(value = "考核指标 1:每年 2：每半年 4：每季度 12:每月")
+    @TableField("standard")
+    private Integer standard;
+
+    @ApiModelProperty(value = "频率")
+    @TableField("frequency")
+    private Integer frequency;
+
+    @ApiModelProperty(value = "附件地址 多个逗号隔开")
+    @TableField("enclosure")
+    private String enclosure;
+
+    @ApiModelProperty(value = "清单依据")
+    @TableField("item_basis")
+    private String itemBasis;
+
+    @ApiModelProperty(value = "清单主要证据")
+    @TableField("item_proof")
+    private String itemProof;
+
+    @ApiModelProperty(value = "清单法律法规")
+    @TableField("item_law")
+    private String itemLaw;
+
+    @ApiModelProperty(value = "排序")
+    @TableField("sort_id")
+    private Integer sortId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("modify_time")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("modify_by")
+    private String modifyBy;
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+    public String getListId() {
+        return listId;
+    }
+
+    public void setListId(String listId) {
+        this.listId = listId;
+    }
+    public String getIndustryId() {
+        return industryId;
+    }
+
+    public void setIndustryId(String industryId) {
+        this.industryId = industryId;
+    }
+    public String getItemContent() {
+        return itemContent;
+    }
+
+    public void setItemContent(String itemContent) {
+        this.itemContent = itemContent;
+    }
+    public Integer getStandard() {
+        return standard;
+    }
+
+    public void setStandard(Integer standard) {
+        this.standard = standard;
+    }
+    public Integer getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(Integer frequency) {
+        this.frequency = frequency;
+    }
+    public String getEnclosure() {
+        return enclosure;
+    }
+
+    public void setEnclosure(String enclosure) {
+        this.enclosure = enclosure;
+    }
+    public String getItemBasis() {
+        return itemBasis;
+    }
+
+    public void setItemBasis(String itemBasis) {
+        this.itemBasis = itemBasis;
+    }
+    public String getItemProof() {
+        return itemProof;
+    }
+
+    public void setItemProof(String itemProof) {
+        this.itemProof = itemProof;
+    }
+    public String getItemLaw() {
+        return itemLaw;
+    }
+
+    public void setItemLaw(String itemLaw) {
+        this.itemLaw = itemLaw;
+    }
+    public Integer getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+    public String getModifyBy() {
+        return modifyBy;
+    }
+
+    public void setModifyBy(String modifyBy) {
+        this.modifyBy = modifyBy;
+    }
+
+    @Override
+    public String toString() {
+        return "InListItem{" +
+            "itemId=" + itemId +
+            ", listId=" + listId +
+            ", industryId=" + industryId +
+            ", itemContent=" + itemContent +
+            ", standard=" + standard +
+            ", frequency=" + frequency +
+            ", enclosure=" + enclosure +
+            ", itemBasis=" + itemBasis +
+            ", itemProof=" + itemProof +
+            ", itemLaw=" + itemLaw +
+            ", sortId=" + sortId +
+            ", createTime=" + createTime +
+            ", createBy=" + createBy +
+            ", modifyTime=" + modifyTime +
+            ", modifyBy=" + modifyBy +
+        "}";
+    }
+}
diff --git a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
index 5de17e5..24dfd5c 100644
--- a/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/OADistributionMapper.xml
@@ -13,90 +13,14 @@
     <result column="ModifiedOn" jdbcType="TIMESTAMP" property="modifiedon" />
     <result column="ModifiedBy" jdbcType="VARCHAR" property="modifiedby" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
+
+
   <sql id="Base_Column_List">
-    OADistributionId, OATaskId, SysUserId, SysChinaName, SysTelephone, AppStatus, CreatedOn,
+    OADistributionId, OATaskId,sned_id, SysUserId, SysChinaName, SysTelephone, title,
+    subject,start_time,end_time,AppStatus, CreatedOn,
     CreatedBy, ModifiedOn, ModifiedBy
   </sql>
-  <select id="selectByExample" parameterType="com.rzyc.model.OADistributionExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from OADistribution
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
-  </select>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
@@ -107,12 +31,7 @@
     delete from OADistribution
     where OADistributionId = #{oadistributionid,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.rzyc.model.OADistributionExample">
-    delete from OADistribution
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
+
   <insert id="insert" parameterType="com.rzyc.model.OADistribution">
     insert into OADistribution (OADistributionId, OATaskId, SysUserId,
       SysChinaName, SysTelephone, AppStatus,
@@ -190,66 +109,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.rzyc.model.OADistributionExample" resultType="java.lang.Long">
-    select count(*) from OADistribution
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update OADistribution
-    <set>
-      <if test="record.oadistributionid != null">
-        OADistributionId = #{record.oadistributionid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.oataskid != null">
-        OATaskId = #{record.oataskid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sysuserid != null">
-        SysUserId = #{record.sysuserid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.syschinaname != null">
-        SysChinaName = #{record.syschinaname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.systelephone != null">
-        SysTelephone = #{record.systelephone,jdbcType=VARCHAR},
-      </if>
-      <if test="record.appstatus != null">
-        AppStatus = #{record.appstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createdon != null">
-        CreatedOn = #{record.createdon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createdby != null">
-        CreatedBy = #{record.createdby,jdbcType=VARCHAR},
-      </if>
-      <if test="record.modifiedon != null">
-        ModifiedOn = #{record.modifiedon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.modifiedby != null">
-        ModifiedBy = #{record.modifiedby,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update OADistribution
-    set OADistributionId = #{record.oadistributionid,jdbcType=VARCHAR},
-      OATaskId = #{record.oataskid,jdbcType=VARCHAR},
-      SysUserId = #{record.sysuserid,jdbcType=VARCHAR},
-      SysChinaName = #{record.syschinaname,jdbcType=VARCHAR},
-      SysTelephone = #{record.systelephone,jdbcType=VARCHAR},
-      AppStatus = #{record.appstatus,jdbcType=VARCHAR},
-      CreatedOn = #{record.createdon,jdbcType=TIMESTAMP},
-      CreatedBy = #{record.createdby,jdbcType=VARCHAR},
-      ModifiedOn = #{record.modifiedon,jdbcType=TIMESTAMP},
-      ModifiedBy = #{record.modifiedby,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.rzyc.model.OADistribution">
     update OADistribution
     <set>
diff --git a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
index 65fca8b..09905d5 100644
--- a/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/OATaskMapper.xml
@@ -3,28 +3,16 @@
 <mapper namespace="com.rzyc.mapper.OATaskMapper">
   <resultMap id="BaseResultMap" type="com.rzyc.model.OATask">
     <id column="OATaskId" jdbcType="VARCHAR" property="oataskid" />
-    <result column="OATaskMgrId" jdbcType="VARCHAR" property="oataskmgrid" />
     <result column="TaskType" jdbcType="VARCHAR" property="tasktype" />
-    <result column="TaskFlow" jdbcType="VARCHAR" property="taskflow" />
-    <result column="TaskDepart" jdbcType="VARCHAR" property="taskdepart" />
-    <result column="Tasklevel" jdbcType="VARCHAR" property="tasklevel" />
-    <result column="TaskPerson" jdbcType="VARCHAR" property="taskperson" />
-    <result column="TaskViewer" jdbcType="VARCHAR" property="taskviewer" />
+    <result column="OTCId" jdbcType="VARCHAR" property="otcid" />
     <result column="SysPercent" jdbcType="INTEGER" property="syspercent" />
     <result column="StartDate" jdbcType="TIMESTAMP" property="startdate" />
     <result column="EndDate" jdbcType="TIMESTAMP" property="enddate" />
     <result column="PlanEndDate" jdbcType="TIMESTAMP" property="planenddate" />
     <result column="AppStatus" jdbcType="VARCHAR" property="appstatus" />
     <result column="Subject" jdbcType="VARCHAR" property="subject" />
-    <result column="AttachmentFlag" jdbcType="INTEGER" property="attachmentflag" />
     <result column="Frequency" jdbcType="BIGINT" property="frequency" />
-    <result column="Priority" jdbcType="VARCHAR" property="priority" />
     <result column="IsFinish" jdbcType="VARCHAR" property="isfinish" />
-    <result column="OALabel" jdbcType="VARCHAR" property="oalabel" />
-    <result column="LinkedUrl" jdbcType="VARCHAR" property="linkedurl" />
-    <result column="ReadBack" jdbcType="VARCHAR" property="readback" />
-    <result column="OTCId" jdbcType="VARCHAR" property="otcid" />
-    <result column="OTCType" jdbcType="VARCHAR" property="otctype" />
     <result column="RedAlert" jdbcType="VARCHAR" property="redAlert" />
     <result column="YellowAlert" jdbcType="VARCHAR" property="yellowAlert" />
     <result column="totalFrequency" jdbcType="BIGINT" property="totalFrequency" />
@@ -33,675 +21,58 @@
     <result column="ModifiedOn" jdbcType="TIMESTAMP" property="modifiedon" />
     <result column="ModifiedBy" jdbcType="VARCHAR" property="modifiedby" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.rzyc.model.OATask">
-    <result column="DocBody" jdbcType="LONGVARCHAR" property="docbody" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
+
+
   <sql id="Base_Column_List">
-    OATaskId, OATaskMgrId, TaskType, TaskFlow, TaskDepart, Tasklevel, TaskPerson, TaskViewer,
-    SysPercent, StartDate, EndDate, PlanEndDate, AppStatus, Subject, AttachmentFlag,Frequency,
-    Priority, IsFinish, OALabel, LinkedUrl, ReadBack, OTCId, OTCType, CreatedOn, CreatedBy,
+    OATaskId, TaskType,OTCId,send_id,SysPercent,
+    StartDate, EndDate, PlanEndDate, AppStatus, title,Subject, Frequency,
+    IsFinish, CreatedOn, CreatedBy,
     ModifiedOn, ModifiedBy
   </sql>
-  <sql id="Blob_Column_List">
-    DocBody
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.rzyc.model.OATaskExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from OATask
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.rzyc.model.OATaskExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from OATask
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from OATask
-    where OATaskId = #{oataskid,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from OATask
-    where OATaskId = #{oataskid,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.rzyc.model.OATaskExample">
-    delete from OATask
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
+
   <insert id="insert" parameterType="com.rzyc.model.OATask">
-    insert into OATask (OATaskId, OATaskMgrId, TaskType,
-      TaskFlow, TaskDepart, Tasklevel,
-      TaskPerson, TaskViewer, SysPercent,
+    insert into OATask (OATaskId, TaskType,OTCId,send_id,
+    SysPercent,
       StartDate, EndDate, PlanEndDate,
-      AppStatus, Subject, AttachmentFlag,Frequency,
+      AppStatus,title, Subject, AttachmentFlag,Frequency,
       Priority, IsFinish, OALabel,
       LinkedUrl, ReadBack, OTCId,del_state,
       OTCType, CreatedOn, CreatedBy,
       ModifiedOn, ModifiedBy, DocBody
       )
-    values (#{oataskid,jdbcType=VARCHAR}, #{oataskmgrid,jdbcType=VARCHAR}, #{tasktype,jdbcType=VARCHAR},
-      #{taskflow,jdbcType=VARCHAR}, #{taskdepart,jdbcType=VARCHAR}, #{tasklevel,jdbcType=VARCHAR},
-      #{taskperson,jdbcType=VARCHAR}, #{taskviewer,jdbcType=VARCHAR}, #{syspercent,jdbcType=INTEGER},
-      #{startdate,jdbcType=TIMESTAMP}, #{enddate,jdbcType=TIMESTAMP}, #{planenddate,jdbcType=TIMESTAMP},
-      #{appstatus,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR},
-      #{attachmentflag,jdbcType=INTEGER},
-      #{frequency,jdbcType=BIGINT},
-      #{priority,jdbcType=VARCHAR}, #{isfinish,jdbcType=VARCHAR}, #{oalabel,jdbcType=VARCHAR},
-      #{linkedurl,jdbcType=VARCHAR}, #{readback,jdbcType=VARCHAR},
+    values (#{oataskid,jdbcType=VARCHAR},
+            #{tasktype,jdbcType=VARCHAR},
             #{otcid,jdbcType=VARCHAR},
-            #{delState,jdbcType=VARCHAR},
-      #{otctype,jdbcType=VARCHAR}, #{createdon,jdbcType=TIMESTAMP}, #{createdby,jdbcType=VARCHAR},
-      #{modifiedon,jdbcType=TIMESTAMP}, #{modifiedby,jdbcType=VARCHAR}, #{docbody,jdbcType=LONGVARCHAR}
+            #{sendId,jdbcType=VARCHAR},
+            #{syspercent,jdbcType=INTEGER},
+      #{startdate,jdbcType=TIMESTAMP}, #{enddate,jdbcType=TIMESTAMP}, #{planenddate,jdbcType=TIMESTAMP},
+      #{appstatus,jdbcType=VARCHAR},
+      #{title,jdbcType=VARCHAR},
+            #{subject,jdbcType=VARCHAR},
+      #{frequency,jdbcType=BIGINT},
+      #{isfinish,jdbcType=VARCHAR},
+        #{delState,jdbcType=VARCHAR},#{createdon,jdbcType=TIMESTAMP}, #{createdby,jdbcType=VARCHAR},
+      #{modifiedon,jdbcType=TIMESTAMP}, #{modifiedby,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.rzyc.model.OATask">
-    insert into OATask
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="oataskid != null">
-        OATaskId,
-      </if>
-      <if test="oataskmgrid != null">
-        OATaskMgrId,
-      </if>
-      <if test="tasktype != null">
-        TaskType,
-      </if>
-      <if test="taskflow != null">
-        TaskFlow,
-      </if>
-      <if test="taskdepart != null">
-        TaskDepart,
-      </if>
-      <if test="tasklevel != null">
-        Tasklevel,
-      </if>
-      <if test="taskperson != null">
-        TaskPerson,
-      </if>
-      <if test="taskviewer != null">
-        TaskViewer,
-      </if>
-      <if test="syspercent != null">
-        SysPercent,
-      </if>
-      <if test="startdate != null">
-        StartDate,
-      </if>
-      <if test="enddate != null">
-        EndDate,
-      </if>
-      <if test="planenddate != null">
-        PlanEndDate,
-      </if>
-      <if test="appstatus != null">
-        AppStatus,
-      </if>
-      <if test="subject != null">
-        Subject,
-      </if>
-      <if test="attachmentflag != null">
-        AttachmentFlag,
-      </if>
-      <if test="frequency != null">
-        Frequency,
-      </if>
-      <if test="priority != null">
-        Priority,
-      </if>
-      <if test="isfinish != null">
-        IsFinish,
-      </if>
-      <if test="oalabel != null">
-        OALabel,
-      </if>
-      <if test="linkedurl != null">
-        LinkedUrl,
-      </if>
-      <if test="readback != null">
-        ReadBack,
-      </if>
-      <if test="otcid != null">
-        OTCId,
-      </if>
-      <if test="otctype != null">
-        OTCType,
-      </if>
-      <if test="createdon != null">
-        CreatedOn,
-      </if>
-      <if test="createdby != null">
-        CreatedBy,
-      </if>
-      <if test="modifiedon != null">
-        ModifiedOn,
-      </if>
-      <if test="modifiedby != null">
-        ModifiedBy,
-      </if>
-      <if test="docbody != null">
-        DocBody,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="oataskid != null">
-        #{oataskid,jdbcType=VARCHAR},
-      </if>
-      <if test="oataskmgrid != null">
-        #{oataskmgrid,jdbcType=VARCHAR},
-      </if>
-      <if test="tasktype != null">
-        #{tasktype,jdbcType=VARCHAR},
-      </if>
-      <if test="taskflow != null">
-        #{taskflow,jdbcType=VARCHAR},
-      </if>
-      <if test="taskdepart != null">
-        #{taskdepart,jdbcType=VARCHAR},
-      </if>
-      <if test="tasklevel != null">
-        #{tasklevel,jdbcType=VARCHAR},
-      </if>
-      <if test="taskperson != null">
-        #{taskperson,jdbcType=VARCHAR},
-      </if>
-      <if test="taskviewer != null">
-        #{taskviewer,jdbcType=VARCHAR},
-      </if>
-      <if test="syspercent != null">
-        #{syspercent,jdbcType=INTEGER},
-      </if>
-      <if test="startdate != null">
-        #{startdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="enddate != null">
-        #{enddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="planenddate != null">
-        #{planenddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="appstatus != null">
-        #{appstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="subject != null">
-        #{subject,jdbcType=VARCHAR},
-      </if>
-      <if test="attachmentflag != null">
-        #{attachmentflag,jdbcType=INTEGER},
-      </if>
-      <if test="frequency != null">
-        #{frequency,jdbcType=BIGINT},
-      </if>
-      <if test="priority != null">
-        #{priority,jdbcType=VARCHAR},
-      </if>
-      <if test="isfinish != null">
-        #{isfinish,jdbcType=VARCHAR},
-      </if>
-      <if test="oalabel != null">
-        #{oalabel,jdbcType=VARCHAR},
-      </if>
-      <if test="linkedurl != null">
-        #{linkedurl,jdbcType=VARCHAR},
-      </if>
-      <if test="readback != null">
-        #{readback,jdbcType=VARCHAR},
-      </if>
-      <if test="otcid != null">
-        #{otcid,jdbcType=VARCHAR},
-      </if>
-      <if test="otctype != null">
-        #{otctype,jdbcType=VARCHAR},
-      </if>
-      <if test="createdon != null">
-        #{createdon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdby != null">
-        #{createdby,jdbcType=VARCHAR},
-      </if>
-      <if test="modifiedon != null">
-        #{modifiedon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifiedby != null">
-        #{modifiedby,jdbcType=VARCHAR},
-      </if>
-      <if test="docbody != null">
-        #{docbody,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.rzyc.model.OATaskExample" resultType="java.lang.Long">
-    select count(*) from OATask
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update OATask
-    <set>
-      <if test="record.oataskid != null">
-        OATaskId = #{record.oataskid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.oataskmgrid != null">
-        OATaskMgrId = #{record.oataskmgrid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tasktype != null">
-        TaskType = #{record.tasktype,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskflow != null">
-        TaskFlow = #{record.taskflow,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskdepart != null">
-        TaskDepart = #{record.taskdepart,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tasklevel != null">
-        Tasklevel = #{record.tasklevel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskperson != null">
-        TaskPerson = #{record.taskperson,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskviewer != null">
-        TaskViewer = #{record.taskviewer,jdbcType=VARCHAR},
-      </if>
-      <if test="record.syspercent != null">
-        SysPercent = #{record.syspercent,jdbcType=INTEGER},
-      </if>
-      <if test="record.startdate != null">
-        StartDate = #{record.startdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.enddate != null">
-        EndDate = #{record.enddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.planenddate != null">
-        PlanEndDate = #{record.planenddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.appstatus != null">
-        AppStatus = #{record.appstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subject != null">
-        Subject = #{record.subject,jdbcType=VARCHAR},
-      </if>
-      <if test="record.attachmentflag != null">
-        AttachmentFlag = #{record.attachmentflag,jdbcType=INTEGER},
-      </if>
-      <if test="record.frequency != null">
-        Frequency = #{record.frequency,jdbcType=BIGINT},
-      </if>
-      <if test="record.priority != null">
-        Priority = #{record.priority,jdbcType=VARCHAR},
-      </if>
-      <if test="record.isfinish != null">
-        IsFinish = #{record.isfinish,jdbcType=VARCHAR},
-      </if>
-      <if test="record.oalabel != null">
-        OALabel = #{record.oalabel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.linkedurl != null">
-        LinkedUrl = #{record.linkedurl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.readback != null">
-        ReadBack = #{record.readback,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otcid != null">
-        OTCId = #{record.otcid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.otctype != null">
-        OTCType = #{record.otctype,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createdon != null">
-        CreatedOn = #{record.createdon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createdby != null">
-        CreatedBy = #{record.createdby,jdbcType=VARCHAR},
-      </if>
-      <if test="record.modifiedon != null">
-        ModifiedOn = #{record.modifiedon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.modifiedby != null">
-        ModifiedBy = #{record.modifiedby,jdbcType=VARCHAR},
-      </if>
-      <if test="record.docbody != null">
-        DocBody = #{record.docbody,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update OATask
-    set OATaskId = #{record.oataskid,jdbcType=VARCHAR},
-      OATaskMgrId = #{record.oataskmgrid,jdbcType=VARCHAR},
-      TaskType = #{record.tasktype,jdbcType=VARCHAR},
-      TaskFlow = #{record.taskflow,jdbcType=VARCHAR},
-      TaskDepart = #{record.taskdepart,jdbcType=VARCHAR},
-      Tasklevel = #{record.tasklevel,jdbcType=VARCHAR},
-      TaskPerson = #{record.taskperson,jdbcType=VARCHAR},
-      TaskViewer = #{record.taskviewer,jdbcType=VARCHAR},
-      SysPercent = #{record.syspercent,jdbcType=INTEGER},
-      StartDate = #{record.startdate,jdbcType=TIMESTAMP},
-      EndDate = #{record.enddate,jdbcType=TIMESTAMP},
-      PlanEndDate = #{record.planenddate,jdbcType=TIMESTAMP},
-      AppStatus = #{record.appstatus,jdbcType=VARCHAR},
-      Subject = #{record.subject,jdbcType=VARCHAR},
-      AttachmentFlag = #{record.attachmentflag,jdbcType=INTEGER},
-      Frequency = #{record.frequency,jdbcType=BIGINT},
-      Priority = #{record.priority,jdbcType=VARCHAR},
-      IsFinish = #{record.isfinish,jdbcType=VARCHAR},
-      OALabel = #{record.oalabel,jdbcType=VARCHAR},
-      LinkedUrl = #{record.linkedurl,jdbcType=VARCHAR},
-      ReadBack = #{record.readback,jdbcType=VARCHAR},
-      OTCId = #{record.otcid,jdbcType=VARCHAR},
-      OTCType = #{record.otctype,jdbcType=VARCHAR},
-      CreatedOn = #{record.createdon,jdbcType=TIMESTAMP},
-      CreatedBy = #{record.createdby,jdbcType=VARCHAR},
-      ModifiedOn = #{record.modifiedon,jdbcType=TIMESTAMP},
-      ModifiedBy = #{record.modifiedby,jdbcType=VARCHAR},
-      DocBody = #{record.docbody,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update OATask
-    set OATaskId = #{record.oataskid,jdbcType=VARCHAR},
-      OATaskMgrId = #{record.oataskmgrid,jdbcType=VARCHAR},
-      TaskType = #{record.tasktype,jdbcType=VARCHAR},
-      TaskFlow = #{record.taskflow,jdbcType=VARCHAR},
-      TaskDepart = #{record.taskdepart,jdbcType=VARCHAR},
-      Tasklevel = #{record.tasklevel,jdbcType=VARCHAR},
-      TaskPerson = #{record.taskperson,jdbcType=VARCHAR},
-      TaskViewer = #{record.taskviewer,jdbcType=VARCHAR},
-      SysPercent = #{record.syspercent,jdbcType=INTEGER},
-      StartDate = #{record.startdate,jdbcType=TIMESTAMP},
-      EndDate = #{record.enddate,jdbcType=TIMESTAMP},
-      PlanEndDate = #{record.planenddate,jdbcType=TIMESTAMP},
-      AppStatus = #{record.appstatus,jdbcType=VARCHAR},
-      Subject = #{record.subject,jdbcType=VARCHAR},
-      AttachmentFlag = #{record.attachmentflag,jdbcType=INTEGER},
-      Frequency = #{record.frequency,jdbcType=BIGINT},
-      Priority = #{record.priority,jdbcType=VARCHAR},
-      IsFinish = #{record.isfinish,jdbcType=VARCHAR},
-      OALabel = #{record.oalabel,jdbcType=VARCHAR},
-      LinkedUrl = #{record.linkedurl,jdbcType=VARCHAR},
-      ReadBack = #{record.readback,jdbcType=VARCHAR},
-      OTCId = #{record.otcid,jdbcType=VARCHAR},
-      OTCType = #{record.otctype,jdbcType=VARCHAR},
-      CreatedOn = #{record.createdon,jdbcType=TIMESTAMP},
-      CreatedBy = #{record.createdby,jdbcType=VARCHAR},
-      ModifiedOn = #{record.modifiedon,jdbcType=TIMESTAMP},
-      ModifiedBy = #{record.modifiedby,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.rzyc.model.OATask">
-    update OATask
-    <set>
-      <if test="oataskmgrid != null">
-        OATaskMgrId = #{oataskmgrid,jdbcType=VARCHAR},
-      </if>
-      <if test="tasktype != null">
-        TaskType = #{tasktype,jdbcType=VARCHAR},
-      </if>
-      <if test="taskflow != null">
-        TaskFlow = #{taskflow,jdbcType=VARCHAR},
-      </if>
-      <if test="taskdepart != null">
-        TaskDepart = #{taskdepart,jdbcType=VARCHAR},
-      </if>
-      <if test="tasklevel != null">
-        Tasklevel = #{tasklevel,jdbcType=VARCHAR},
-      </if>
-      <if test="taskperson != null">
-        TaskPerson = #{taskperson,jdbcType=VARCHAR},
-      </if>
-      <if test="taskviewer != null">
-        TaskViewer = #{taskviewer,jdbcType=VARCHAR},
-      </if>
-      <if test="syspercent != null">
-        SysPercent = #{syspercent,jdbcType=INTEGER},
-      </if>
-      <if test="startdate != null">
-        StartDate = #{startdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="enddate != null">
-        EndDate = #{enddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="planenddate != null">
-        PlanEndDate = #{planenddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="appstatus != null">
-        AppStatus = #{appstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="subject != null">
-        Subject = #{subject,jdbcType=VARCHAR},
-      </if>
-      <if test="attachmentflag != null">
-        AttachmentFlag = #{attachmentflag,jdbcType=INTEGER},
-      </if>
-      <if test="frequency != null">
-        Frequency = #{frequency,jdbcType=BIGINT},
-      </if>
-      <if test="priority != null">
-        Priority = #{priority,jdbcType=VARCHAR},
-      </if>
-      <if test="isfinish != null">
-        IsFinish = #{isfinish,jdbcType=VARCHAR},
-      </if>
-      <if test="oalabel != null">
-        OALabel = #{oalabel,jdbcType=VARCHAR},
-      </if>
-      <if test="linkedurl != null">
-        LinkedUrl = #{linkedurl,jdbcType=VARCHAR},
-      </if>
-      <if test="readback != null">
-        ReadBack = #{readback,jdbcType=VARCHAR},
-      </if>
-      <if test="otcid != null">
-        OTCId = #{otcid,jdbcType=VARCHAR},
-      </if>
-      <if test="otctype != null">
-        OTCType = #{otctype,jdbcType=VARCHAR},
-      </if>
-      <if test="createdon != null">
-        CreatedOn = #{createdon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdby != null">
-        CreatedBy = #{createdby,jdbcType=VARCHAR},
-      </if>
-      <if test="modifiedon != null">
-        ModifiedOn = #{modifiedon,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifiedby != null">
-        ModifiedBy = #{modifiedby,jdbcType=VARCHAR},
-      </if>
-      <if test="docbody != null">
-        DocBody = #{docbody,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where OATaskId = #{oataskid,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.rzyc.model.OATask">
-    update OATask
-    set OATaskMgrId = #{oataskmgrid,jdbcType=VARCHAR},
-      TaskType = #{tasktype,jdbcType=VARCHAR},
-      TaskFlow = #{taskflow,jdbcType=VARCHAR},
-      TaskDepart = #{taskdepart,jdbcType=VARCHAR},
-      Tasklevel = #{tasklevel,jdbcType=VARCHAR},
-      TaskPerson = #{taskperson,jdbcType=VARCHAR},
-      TaskViewer = #{taskviewer,jdbcType=VARCHAR},
-      SysPercent = #{syspercent,jdbcType=INTEGER},
-      StartDate = #{startdate,jdbcType=TIMESTAMP},
-      EndDate = #{enddate,jdbcType=TIMESTAMP},
-      PlanEndDate = #{planenddate,jdbcType=TIMESTAMP},
-      AppStatus = #{appstatus,jdbcType=VARCHAR},
-      Subject = #{subject,jdbcType=VARCHAR},
-      AttachmentFlag = #{attachmentflag,jdbcType=INTEGER},
-      Frequency = #{frequency,jdbcType=BIGINT},
-      Priority = #{priority,jdbcType=VARCHAR},
-      IsFinish = #{isfinish,jdbcType=VARCHAR},
-      OALabel = #{oalabel,jdbcType=VARCHAR},
-      LinkedUrl = #{linkedurl,jdbcType=VARCHAR},
-      ReadBack = #{readback,jdbcType=VARCHAR},
-      OTCId = #{otcid,jdbcType=VARCHAR},
-      OTCType = #{otctype,jdbcType=VARCHAR},
-      CreatedOn = #{createdon,jdbcType=TIMESTAMP},
-      CreatedBy = #{createdby,jdbcType=VARCHAR},
-      ModifiedOn = #{modifiedon,jdbcType=TIMESTAMP},
-      ModifiedBy = #{modifiedby,jdbcType=VARCHAR},
-      DocBody = #{docbody,jdbcType=LONGVARCHAR}
-    where OATaskId = #{oataskid,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.rzyc.model.OATask">
-    update OATask
-    set OATaskMgrId = #{oataskmgrid,jdbcType=VARCHAR},
-      TaskType = #{tasktype,jdbcType=VARCHAR},
-      TaskFlow = #{taskflow,jdbcType=VARCHAR},
-      TaskDepart = #{taskdepart,jdbcType=VARCHAR},
-      Tasklevel = #{tasklevel,jdbcType=VARCHAR},
-      TaskPerson = #{taskperson,jdbcType=VARCHAR},
-      TaskViewer = #{taskviewer,jdbcType=VARCHAR},
-      SysPercent = #{syspercent,jdbcType=INTEGER},
-      StartDate = #{startdate,jdbcType=TIMESTAMP},
-      EndDate = #{enddate,jdbcType=TIMESTAMP},
-      PlanEndDate = #{planenddate,jdbcType=TIMESTAMP},
-      AppStatus = #{appstatus,jdbcType=VARCHAR},
-      Subject = #{subject,jdbcType=VARCHAR},
-      AttachmentFlag = #{attachmentflag,jdbcType=INTEGER},
-      Frequency = #{frequency,jdbcType=INTEGER},
-      Priority = #{priority,jdbcType=VARCHAR},
-      IsFinish = #{isfinish,jdbcType=VARCHAR},
-      OALabel = #{oalabel,jdbcType=VARCHAR},
-      LinkedUrl = #{linkedurl,jdbcType=VARCHAR},
-      ReadBack = #{readback,jdbcType=VARCHAR},
-      OTCId = #{otcid,jdbcType=VARCHAR},
-      OTCType = #{otctype,jdbcType=VARCHAR},
-      CreatedOn = #{createdon,jdbcType=TIMESTAMP},
-      CreatedBy = #{createdby,jdbcType=VARCHAR},
-      ModifiedOn = #{modifiedon,jdbcType=TIMESTAMP},
-      ModifiedBy = #{modifiedby,jdbcType=VARCHAR}
-    where OATaskId = #{oataskid,jdbcType=VARCHAR}
-  </update>
+
 
   <!--任务列表-->
   <resultMap id="TaskResultMap" type="com.rzyc.model.OATask">
     <id column="OATaskId" jdbcType="VARCHAR" property="oataskid" />
-    <result column="OATaskMgrId" jdbcType="VARCHAR" property="oataskmgrid" />
     <result column="TaskType" jdbcType="VARCHAR" property="tasktype" />
-    <result column="TaskFlow" jdbcType="VARCHAR" property="taskflow" />
-    <result column="TaskDepart" jdbcType="VARCHAR" property="taskdepart" />
-    <result column="Tasklevel" jdbcType="VARCHAR" property="tasklevel" />
-    <result column="TaskPerson" jdbcType="VARCHAR" property="taskperson" />
-    <result column="TaskViewer" jdbcType="VARCHAR" property="taskviewer" />
+    <result column="OTCId" jdbcType="VARCHAR" property="otcid" />
     <result column="SysPercent" jdbcType="INTEGER" property="syspercent" />
     <result column="StartDate" jdbcType="TIMESTAMP" property="startdate" />
     <result column="EndDate" jdbcType="TIMESTAMP" property="enddate" />
     <result column="PlanEndDate" jdbcType="TIMESTAMP" property="planenddate" />
     <result column="AppStatus" jdbcType="VARCHAR" property="appstatus" />
     <result column="Subject" jdbcType="VARCHAR" property="subject" />
-    <result column="AttachmentFlag" jdbcType="INTEGER" property="attachmentflag" />
     <result column="Frequency" jdbcType="BIGINT" property="frequency" />
     <result column="totalFrequency" jdbcType="BIGINT" property="totalFrequency" />
-    <result column="Priority" jdbcType="VARCHAR" property="priority" />
     <result column="IsFinish" jdbcType="VARCHAR" property="isfinish" />
     <result column="RedAlert" jdbcType="VARCHAR" property="redAlert" />
     <result column="YellowAlert" jdbcType="VARCHAR" property="yellowAlert" />
-    <result column="OALabel" jdbcType="VARCHAR" property="oalabel" />
-    <result column="LinkedUrl" jdbcType="VARCHAR" property="linkedurl" />
-    <result column="ReadBack" jdbcType="VARCHAR" property="readback" />
-    <result column="OTCId" jdbcType="VARCHAR" property="otcid" />
-    <result column="OTCType" jdbcType="VARCHAR" property="otctype" />
     <result column="CreatedOn" jdbcType="TIMESTAMP" property="createdon" />
     <result column="CreatedBy" jdbcType="VARCHAR" property="createdby" />
     <result column="ModifiedOn" jdbcType="TIMESTAMP" property="modifiedon" />
@@ -895,38 +266,32 @@
 
   <!--批量导入任务-->
   <insert id="insertList" parameterType="com.rzyc.model.OATask">
-    insert into OATask (OATaskId, OATaskMgrId, TaskType,
-      TaskFlow, TaskDepart, Tasklevel,
-      TaskPerson, TaskViewer, SysPercent,
+    insert into OATask (OATaskId, TaskType,OTCId,send_id,
+      SysPercent,
       StartDate, EndDate, PlanEndDate,
-      AppStatus, Subject, AttachmentFlag,Frequency,
-      Priority, IsFinish, OALabel,
-      LinkedUrl, ReadBack, OTCId,del_state,
-      OTCType, CreatedOn, CreatedBy,
+      AppStatus, title,Subject,Frequency,
+      IsFinish,
+      del_state, CreatedOn, CreatedBy,
       ModifiedOn, ModifiedBy, DocBody
       )
     values
     <foreach collection="records" item="record" separator=",">
-      (#{record.oataskid,jdbcType=VARCHAR}, #{record.oataskmgrid,jdbcType=VARCHAR},
+      (#{record.oataskid,jdbcType=VARCHAR},
       #{record.tasktype,jdbcType=VARCHAR},
-      #{record.taskflow,jdbcType=VARCHAR}, #{record.taskdepart,jdbcType=VARCHAR},
-      #{record.tasklevel,jdbcType=VARCHAR},
-      #{record.taskperson,jdbcType=VARCHAR}, #{record.taskviewer,jdbcType=VARCHAR},
+      #{record.otcid,jdbcType=VARCHAR},
+      #{record.sendId,jdbcType=VARCHAR},
       #{record.syspercent,jdbcType=INTEGER},
       #{record.startdate,jdbcType=TIMESTAMP}, #{record.enddate,jdbcType=TIMESTAMP},
       #{record.planenddate,jdbcType=TIMESTAMP},
-      #{record.appstatus,jdbcType=VARCHAR}, #{record.subject,jdbcType=VARCHAR},
-      #{record.attachmentflag,jdbcType=INTEGER},
+      #{record.appstatus,jdbcType=VARCHAR},
+      #{record.title,jdbcType=VARCHAR},
+       #{record.subject,jdbcType=VARCHAR},
       #{record.frequency,jdbcType=BIGINT},
-      #{record.priority,jdbcType=VARCHAR}, #{record.isfinish,jdbcType=VARCHAR},
-      #{record.oalabel,jdbcType=VARCHAR},
-      #{record.linkedurl,jdbcType=VARCHAR}, #{record.readback,jdbcType=VARCHAR},
-      #{record.otcid,jdbcType=VARCHAR},
+       #{record.isfinish,jdbcType=VARCHAR},
       #{record.delState,jdbcType=VARCHAR},
-      #{record.otctype,jdbcType=VARCHAR}, #{record.createdon,jdbcType=TIMESTAMP},
+       #{record.createdon,jdbcType=TIMESTAMP},
       #{record.createdby,jdbcType=VARCHAR},
-      #{record.modifiedon,jdbcType=TIMESTAMP}, #{record.modifiedby,jdbcType=VARCHAR},
-      #{record.docbody,jdbcType=LONGVARCHAR}
+      #{record.modifiedon,jdbcType=TIMESTAMP}, #{record.modifiedby,jdbcType=VARCHAR}
       )
     </foreach>
 
@@ -988,11 +353,6 @@
     ORDER BY ot.`StartDate` DESC;
   </select>
 
-  <!--删除履职任务-->
-  <update id="delFactorTask" >
-    update OATask set del_state = 2
-    where `OTCId` = #{otcId} and `TaskType` = '履职任务'
-  </update>
 
   <!--接收任务列表-->
   <select id="receiveTaskPages" resultMap="TaskResultMap">
diff --git a/inventory-dao/src/main/resources/mapper/OaTaskTypeMapper.xml b/inventory-dao/src/main/resources/mapper/OaTaskTypeMapper.xml
index f30c505..1767956 100644
--- a/inventory-dao/src/main/resources/mapper/OaTaskTypeMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/OaTaskTypeMapper.xml
@@ -39,66 +39,12 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
+
   <sql id="Base_Column_List">
     type_id, name, sort_id, modified, created, modify_time, create_time
   </sql>
-  <select id="selectByExample" parameterType="com.rzyc.model.OaTaskTypeExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from oa_task_type
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
-  </select>
-  <delete id="deleteByExample" parameterType="com.rzyc.model.OaTaskTypeExample">
-    delete from oa_task_type
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
+
+
   <insert id="insert" parameterType="com.rzyc.model.OaTaskType">
     insert into oa_task_type (type_id, name, sort_id,
       modified, created, modify_time,
@@ -156,54 +102,8 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.rzyc.model.OaTaskTypeExample" resultType="java.lang.Long">
-    select count(*) from oa_task_type
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update oa_task_type
-    <set>
-      <if test="record.typeId != null">
-        type_id = #{record.typeId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sortId != null">
-        sort_id = #{record.sortId,jdbcType=INTEGER},
-      </if>
-      <if test="record.modified != null">
-        modified = #{record.modified,jdbcType=VARCHAR},
-      </if>
-      <if test="record.created != null">
-        created = #{record.created,jdbcType=VARCHAR},
-      </if>
-      <if test="record.modifyTime != null">
-        modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update oa_task_type
-    set type_id = #{record.typeId,jdbcType=VARCHAR},
-      name = #{record.name,jdbcType=VARCHAR},
-      sort_id = #{record.sortId,jdbcType=INTEGER},
-      modified = #{record.modified,jdbcType=VARCHAR},
-      created = #{record.created,jdbcType=VARCHAR},
-      modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
+
+
 
   <!--任务类型-->
   <select id="findBySortId" resultMap="BaseResultMap">
diff --git a/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml
new file mode 100644
index 0000000..57df20f
--- /dev/null
+++ b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rzyc.mapper.ent.InEntListMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.rzyc.model.ent.InEntList">
+        <id column="ent_list_id" property="entListId" />
+        <result column="item_id" property="itemId" />
+        <result column="list_id" property="listId" />
+        <result column="enterprise_id" property="enterpriseId" />
+        <result column="item_content" property="itemContent" />
+        <result column="standard" property="standard" />
+        <result column="frequency" property="frequency" />
+        <result column="enclosure" property="enclosure" />
+        <result column="item_basis" property="itemBasis" />
+        <result column="item_proof" property="itemProof" />
+        <result column="item_law" property="itemLaw" />
+        <result column="sort_id" property="sortId" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="modify_time" property="modifyTime" />
+        <result column="modify_by" property="modifyBy" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ent_list_id, item_id, list_id, enterprise_id, item_content, standard, frequency, enclosure, item_basis, item_proof, item_law, sort_id, create_time, create_by, modify_time, modify_by
+    </sql>
+
+</mapper>
diff --git a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml
new file mode 100644
index 0000000..32f2880
--- /dev/null
+++ b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rzyc.mapper.ent.InListItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.rzyc.model.ent.InListItem">
+        <id column="item_id" property="itemId" />
+        <result column="list_id" property="listId" />
+        <result column="industry_id" property="industryId" />
+        <result column="item_content" property="itemContent" />
+        <result column="standard" property="standard" />
+        <result column="frequency" property="frequency" />
+        <result column="enclosure" property="enclosure" />
+        <result column="item_basis" property="itemBasis" />
+        <result column="item_proof" property="itemProof" />
+        <result column="item_law" property="itemLaw" />
+        <result column="sort_id" property="sortId" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="modify_time" property="modifyTime" />
+        <result column="modify_by" property="modifyBy" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        item_id, list_id, industry_id, item_content, standard, frequency, enclosure, item_basis, item_proof, item_law, sort_id, create_time, create_by, modify_time, modify_by
+    </sql>
+
+</mapper>
diff --git a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml
new file mode 100644
index 0000000..3f6e8bb
--- /dev/null
+++ b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rzyc.mapper.ent.InListMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.rzyc.model.ent.InList">
+        <id column="list_id" property="listId" />
+        <result column="name" property="name" />
+        <result column="sort_id" property="sortId" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="modify_time" property="modifyTime" />
+        <result column="modify_by" property="modifyBy" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        list_id, name, sort_id, create_time, create_by, modify_time, modify_by
+    </sql>
+
+</mapper>
diff --git a/inventory-ent/pom.xml b/inventory-ent/pom.xml
index 189a0b2..863ebf2 100644
--- a/inventory-ent/pom.xml
+++ b/inventory-ent/pom.xml
@@ -148,21 +148,6 @@
         </dependency>
         <!-- baidu end -->
 
-
-        <!--分页插件 start -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 插件 end -->
-
         <!--xunfeiVoice start-->
         <dependency>
             <groupId>commons-codec</groupId>
diff --git a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java
index eeb944d..0dbdc45 100644
--- a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java
+++ b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java
@@ -2553,48 +2553,6 @@ public class BaseController {
         bookEntCheck.setJoinUser(joinUser);
     }
 
-    /**
-     * 任务详情
-     * @param oaTask
-     * @param sysUserId
-     * @throws Exception
-     */
-    protected void getTaskDetail(OATask oaTask,String sysUserId)throws Exception{
-        //发布人名
-        SysUser sysUser = sysUserMapper.selectByPrimaryKey(oaTask.getCreatedby());
-        if(null != sysUser){
-            oaTask.setSendName(sysUser.getChinaname());
-        }
-
-        //接收人列表
-        List<OADistribution> distributions = new ArrayList<>();
-        if("1".equals(oaTask.getTasklevel())){
-            //修改任务读取状态
-            sysUserId = getListPerformId(sysUserId);
-            oaDistributionMapper.changeStatus(oaTask.getOataskid(),sysUserId);
-            //查询部门
-            distributions = oaDistributionMapper.receiveUnit(oaTask.getOataskid());
-        }else if("2".equals(oaTask.getTasklevel())){
-            //修改任务读取状态
-            oaDistributionMapper.changeStatus(oaTask.getOataskid(),sysUserId);
-            //查询用户
-            distributions = oaDistributionMapper.receiveUser(oaTask.getOataskid());
-            String unitName = getUnitName(oaTask.getTaskperson());
-            if(null != distributions && distributions.size() > 0 && StringUtils.isNotBlank(unitName)){
-                for (OADistribution distribution : distributions){
-                    distribution.setReceiveName(unitName + "-" + distribution.getReceiveName());
-                }
-            }
-        }
-        oaTask.setDistributions(distributions);
-
-        if("上级提醒".equals(oaTask.getTasktype())){
-            //修改
-            List<String> taskIds = new ArrayList<>();
-            taskIds.add(oaTask.getOataskid());
-            oaTaskMapper.changeIsFinish(taskIds);
-        }
-    }
 
     /**
      * 生成企业二维码
diff --git a/inventory-gov/pom.xml b/inventory-gov/pom.xml
index 6fda531..56adec3 100644
--- a/inventory-gov/pom.xml
+++ b/inventory-gov/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.12</version>
+            <version>8.0.30</version>
         </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
@@ -148,21 +148,6 @@
         </dependency>
         <!-- baidu end -->
 
-
-        <!--分页插件 start -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 插件 end -->
-
         <!--xunfeiVoice start-->
         <dependency>
             <groupId>commons-codec</groupId>
diff --git a/inventory-gov/src/main/java/com/rzyc/config/ConstantsConfigure.java b/inventory-gov/src/main/java/com/rzyc/config/ConstantsConfigure.java
index d17ebdf..ad6db50 100644
--- a/inventory-gov/src/main/java/com/rzyc/config/ConstantsConfigure.java
+++ b/inventory-gov/src/main/java/com/rzyc/config/ConstantsConfigure.java
@@ -68,18 +68,6 @@ public final class ConstantsConfigure {
 	@Value("${onstants.zip_path}")
 	private String zipPath;
 
-	//工作要务任务类型id
-	@Value("${onstants.work_prioritiesh}")
-	private String workPriorities;
-
-	public String getWorkPriorities() {
-		return workPriorities;
-	}
-
-	public void setWorkPriorities(String workPriorities) {
-		this.workPriorities = workPriorities;
-	}
-
 	public String getZipPath() {
 		return zipPath;
 	}
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java
index 7989b7e..a5aa1ca 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java
@@ -1359,10 +1359,9 @@ public class MinWorkController extends BaseController{
         OATask oaTask = new OATask();
         oaTask.setOataskid(RandomNumber.getUUid());
         oaTask.setTasktype(taskType);
-        oaTask.setTaskdepart(sysUser.getSysunitorentid());
         oaTask.setStartdate(new Date());
         oaTask.setPlanenddate(new Date());
-        oaTask.setTaskperson(sysUser.getSysuserid());
+        oaTask.setSendId(sysUser.getSysuserid());
         oaTask.setIsfinish("否");
         oaTask.setModifiedby(sysUser.getChinaname());
         oaTask.setCreatedby(sysUser.getChinaname());
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
index 80d10e6..6d9d45f 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
@@ -1009,7 +1009,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
             String[] strs = taskId.split(",");
             List<String> taskIds = Arrays.asList(strs);
             for (String str : taskIds){
-                OATask oaTask = oaTaskMapper.selectByPrimaryKey(str);
+                OATask oaTask = oaTaskMapper.findById(str);
                 if(null != oaTask){
                     //修改任务状态
                     changeTaskState(oaTask,listfactorid);
@@ -1083,7 +1083,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
             String[] strs = taskId.split(",");
             List<String> taskIds = Arrays.asList(strs);
             for (String str : taskIds){
-                OATask oaTask = oaTaskMapper.selectByPrimaryKey(str);
+                OATask oaTask = oaTaskMapper.findById(str);
                 if(null != oaTask){
                     //修改任务状态
                     changeTaskState(oaTask,listfactorid);