diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index 35222c20..1b9921f9 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.mdm.entity.DbFiledsDto;
 import com.hzya.frame.mdm.entity.MdmDataDto;
 import com.hzya.frame.mdm.entity.MdmDataFiledDto;
@@ -61,6 +62,7 @@ import com.hzya.frame.sysnew.buttonConfig.dao.ISysButtonConfigDao;
 import com.hzya.frame.sysnew.buttonConfig.entity.SysButtonConfigEntity;
 import com.hzya.frame.sysnew.menuConfig.dao.ISysMenuConfigDao;
 import com.hzya.frame.sysnew.menuConfig.entity.SysMenuConfigEntity;
+import com.hzya.frame.util.PluginUtils;
 import com.hzya.frame.uuid.UUIDUtils;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
@@ -1531,9 +1533,14 @@ public class MdmServiceImpl implements IMdmService {
         mdmViewVo.setListList(listListVo);
 
         List<MdmViewButtonVo> buttonList = new ArrayList<>();
-        MdmViewButtonVo mdmViewButtonVo = new MdmViewButtonVo();
+        buttonList.add(new MdmViewButtonVo("new","新建"));
+        buttonList.add(new MdmViewButtonVo("resize","重置"));
+        buttonList.add(new MdmViewButtonVo("search","查询"));
+        buttonList.add(new MdmViewButtonVo("edit","修改"));
+        buttonList.add(new MdmViewButtonVo("dele","删除"));
+        buttonList.add(new MdmViewButtonVo("view","查看"));
+        buttonList.add(new MdmViewButtonVo("send","下发"));
         mdmViewVo.setButtonList(buttonList);
-
         return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);
     }
 
@@ -2690,6 +2697,20 @@ public class MdmServiceImpl implements IMdmService {
             return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
         }
         //TODO 后续完成下发或者删除业务
+        //1、根据服务名查询分发数据
+        MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
+        mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode"));
+        mdmModuleEntity.setSts("Y");
+        List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
+        //if（）
+        MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
+        //mdmModuleDistributeEntity
+        //mdmModuleDistributeDao.
+        //2、查找插件
+        //3、调用插件
+        //PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(jsonObjectStr.getString("plug_id"));
+        //JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObjectStr);
+
         return BaseResult.getSuccessMessageEntity("处理分发数据成功");
     }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java
index ef3fc571..d2f73683 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.java
@@ -6,60 +6,30 @@ import com.hzya.frame.web.entity.BaseEntity;
  * 集成任务-实例详情(IntegrationTaskLog)实体类
  *
  * @author makejava
- * @since 2024-05-15 14:06:41
+ * @since 2024-05-06 15:37:55
  */
 public class IntegrationTaskLogEntity extends BaseEntity {
  
   /**  集成任务-实例_id */
    private String taskLinvingId;
-  /**  返回结果 */
-   private String result;
-  /**  原始查询条件 */
-   private String queryCondition;
-  /**  源系统主键 */
-   private String rootAppPk;
-  /**  原系统单据 */
-   private String rootAppBill;
-  /**  最新源系统数据详情 */
-   private String rootAppNewData;
-  /**  最新传输信息 */
-   private String newTransmitInfo;
-  /**  最新推送时间 */
-   private Date newPushDate;
-  /**  是否补推(Y是N不是) */
-   private String repairPust;
-  /**  场景id */
-   private String senceId;
-  /**  最新推送状态 */
-   private String newState;
-  /**  单据业务日期 */
-   private String businessDate;
-  /**  插件id */
-   private String pluginId;
-  /**  处理时间 */
-   private Date processingTime;
-  /**  处理备注 */
-   private String processingRemarks;
-  /**  处理⼈名称 */
-   private String processorName;
-  /**  处理⼈ */
-   private String processor;
-  /**  下游系统单号 */
-   private String newSystemNumber;
-  /**  下游系统主键 */
-   private String newSystemPrimary;
+  /**  integration_task_id */
+   private String taskId;
+  /**  任务编码 */
+   private String taskCode;
+  /**  任务名称 */
+   private String taskName;
+  /**  任务状态1、执行中2、执行成功 3、执行失败 4\当前任务已停止*/
+   private String taskStatus;
+  /**  当前任务开始时间 */
+   private Date startTime;
+  /**  结束时间 */
+   private Date endTime;
+  /**  耗时 */
+   private String diffTime;
+  /**  公司id */
+   private String companyId;
   /**  备注 */
    private String remark;
-  /**  扩展1 */
-   private String def1;
-  /**  扩展2 */
-   private String def2;
-  /**  扩展3 */
-   private String def3;
-  /**  扩展4 */
-   private String def4;
-  /**  扩展5 */
-   private String def5;
 
 
     public String getTaskLinvingId() {
@@ -70,148 +40,68 @@ public class IntegrationTaskLogEntity extends BaseEntity {
         this.taskLinvingId = taskLinvingId;
     }
 
-    public String getResult() {
-        return result;
+    public String getTaskId() {
+        return taskId;
     }
 
-    public void setResult(String result) {
-        this.result = result;
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
     }
 
-    public String getQueryCondition() {
-        return queryCondition;
+    public String getTaskCode() {
+        return taskCode;
     }
 
-    public void setQueryCondition(String queryCondition) {
-        this.queryCondition = queryCondition;
+    public void setTaskCode(String taskCode) {
+        this.taskCode = taskCode;
     }
 
-    public String getRootAppPk() {
-        return rootAppPk;
+    public String getTaskName() {
+        return taskName;
     }
 
-    public void setRootAppPk(String rootAppPk) {
-        this.rootAppPk = rootAppPk;
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
     }
 
-    public String getRootAppBill() {
-        return rootAppBill;
+    public String getTaskStatus() {
+        return taskStatus;
     }
 
-    public void setRootAppBill(String rootAppBill) {
-        this.rootAppBill = rootAppBill;
+    public void setTaskStatus(String taskStatus) {
+        this.taskStatus = taskStatus;
     }
 
-    public String getRootAppNewData() {
-        return rootAppNewData;
+    public Date getStartTime() {
+        return startTime;
     }
 
-    public void setRootAppNewData(String rootAppNewData) {
-        this.rootAppNewData = rootAppNewData;
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
     }
 
-    public String getNewTransmitInfo() {
-        return newTransmitInfo;
+    public Date getEndTime() {
+        return endTime;
     }
 
-    public void setNewTransmitInfo(String newTransmitInfo) {
-        this.newTransmitInfo = newTransmitInfo;
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
     }
 
-    public Date getNewPushDate() {
-        return newPushDate;
+    public String getDiffTime() {
+        return diffTime;
     }
 
-    public void setNewPushDate(Date newPushDate) {
-        this.newPushDate = newPushDate;
+    public void setDiffTime(String diffTime) {
+        this.diffTime = diffTime;
     }
 
-    public String getRepairPust() {
-        return repairPust;
+    public String getCompanyId() {
+        return companyId;
     }
 
-    public void setRepairPust(String repairPust) {
-        this.repairPust = repairPust;
-    }
-
-    public String getSenceId() {
-        return senceId;
-    }
-
-    public void setSenceId(String senceId) {
-        this.senceId = senceId;
-    }
-
-    public String getNewState() {
-        return newState;
-    }
-
-    public void setNewState(String newState) {
-        this.newState = newState;
-    }
-
-    public String getBusinessDate() {
-        return businessDate;
-    }
-
-    public void setBusinessDate(String businessDate) {
-        this.businessDate = businessDate;
-    }
-
-    public String getPluginId() {
-        return pluginId;
-    }
-
-    public void setPluginId(String pluginId) {
-        this.pluginId = pluginId;
-    }
-
-    public Date getProcessingTime() {
-        return processingTime;
-    }
-
-    public void setProcessingTime(Date processingTime) {
-        this.processingTime = processingTime;
-    }
-
-    public String getProcessingRemarks() {
-        return processingRemarks;
-    }
-
-    public void setProcessingRemarks(String processingRemarks) {
-        this.processingRemarks = processingRemarks;
-    }
-
-    public String getProcessorName() {
-        return processorName;
-    }
-
-    public void setProcessorName(String processorName) {
-        this.processorName = processorName;
-    }
-
-    public String getProcessor() {
-        return processor;
-    }
-
-    public void setProcessor(String processor) {
-        this.processor = processor;
-    }
-
-    public String getNewSystemNumber() {
-        return newSystemNumber;
-    }
-
-    public void setNewSystemNumber(String newSystemNumber) {
-        this.newSystemNumber = newSystemNumber;
-    }
-
-    public String getNewSystemPrimary() {
-        return newSystemPrimary;
-    }
-
-    public void setNewSystemPrimary(String newSystemPrimary) {
-        this.newSystemPrimary = newSystemPrimary;
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
     }
 
     public String getRemark() {
@@ -221,46 +111,5 @@ public class IntegrationTaskLogEntity extends BaseEntity {
     public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    public String getDef1() {
-        return def1;
-    }
-
-    public void setDef1(String def1) {
-        this.def1 = def1;
-    }
-
-    public String getDef2() {
-        return def2;
-    }
-
-    public void setDef2(String def2) {
-        this.def2 = def2;
-    }
-
-    public String getDef3() {
-        return def3;
-    }
-
-    public void setDef3(String def3) {
-        this.def3 = def3;
-    }
-
-    public String getDef4() {
-        return def4;
-    }
-
-    public void setDef4(String def4) {
-        this.def4 = def4;
-    }
-
-    public String getDef5() {
-        return def5;
-    }
-
-    public void setDef5(String def5) {
-        this.def5 = def5;
-    }
-
 }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
index c2f42e0e..a5a9d746 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
@@ -2,453 +2,327 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.sysnew.integtationTaskLog.dao.impl.IntegrationTaskLogDaoImpl">
 
-    <resultMap id="get-IntegrationTaskLogEntity-result" type="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
+    <resultMap id="get-IntegrationTaskLogEntity-result"
+               type="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
        <result property="id" column="id" jdbcType="VARCHAR"/>
            <result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/>
-           <result property="result" column="result" jdbcType="VARCHAR"/>
-           <result property="queryCondition" column="query_condition" jdbcType="VARCHAR"/>
-           <result property="rootAppPk" column="root_app_pk" jdbcType="VARCHAR"/>
-           <result property="rootAppBill" column="root_app_bill" jdbcType="VARCHAR"/>
-           <result property="rootAppNewData" column="root_app_new_data" jdbcType="VARCHAR"/>
-           <result property="newTransmitInfo" column="new_transmit_info" jdbcType="VARCHAR"/>
-           <result property="newPushDate" column="new_push_date" jdbcType="TIMESTAMP"/>
-           <result property="repairPust" column="repair_pust" jdbcType="VARCHAR"/>
-           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="taskId" column="task_id" jdbcType="VARCHAR"/>
+        <result property="taskCode" column="task_code" jdbcType="VARCHAR"/>
+        <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="taskStatus" column="task_status" jdbcType="VARCHAR"/>
+        <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
+        <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
+        <result property="diffTime" column="diff_time" jdbcType="VARCHAR"/>
+        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
            <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
            <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
-           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
            <result property="sts" column="sts" jdbcType="VARCHAR"/>
-           <result property="sorts" column="sorts" jdbcType="INTEGER"/>
-           <result property="senceId" column="sence_id" jdbcType="VARCHAR"/>
-           <result property="newState" column="new_state" jdbcType="VARCHAR"/>
-           <result property="businessDate" column="business_date" jdbcType="VARCHAR"/>
-           <result property="pluginId" column="plugin_id" jdbcType="VARCHAR"/>
-           <result property="processingTime" column="processing_time" jdbcType="TIMESTAMP"/>
-           <result property="processingRemarks" column="processing_remarks" jdbcType="VARCHAR"/>
-           <result property="processorName" column="processor_name" jdbcType="VARCHAR"/>
-           <result property="processor" column="processor" jdbcType="VARCHAR"/>
-           <result property="newSystemNumber" column="new_system_number" jdbcType="VARCHAR"/>
-           <result property="newSystemPrimary" column="new_system_primary" jdbcType="VARCHAR"/>
-           <result property="remark" column="remark" jdbcType="VARCHAR"/>
-           <result property="def1" column="def1" jdbcType="VARCHAR"/>
-           <result property="def2" column="def2" jdbcType="VARCHAR"/>
-           <result property="def3" column="def3" jdbcType="VARCHAR"/>
-           <result property="def4" column="def4" jdbcType="VARCHAR"/>
-           <result property="def5" column="def5" jdbcType="VARCHAR"/>
+        <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
-    <sql id = "IntegrationTaskLogEntity_Base_Column_List">
+    <sql id="IntegrationTaskLogEntity_Base_Column_List">
         id
        ,task_linving_id 
-        ,result 
-        ,query_condition 
-        ,root_app_pk 
-        ,root_app_bill 
-        ,root_app_new_data 
-        ,new_transmit_info 
-        ,new_push_date 
-        ,repair_pust 
-        ,create_time 
+        ,task_id
+        ,task_code
+        ,task_name
+        ,remark
+        ,task_status
+        ,start_time
+        ,end_time
+        ,diff_time
+        ,sorts
         ,create_user_id 
-        ,modify_time 
-        ,modify_user_id 
+        ,create_time
+        ,modify_user_id
+        ,modify_time
         ,sts 
-        ,sorts 
-        ,sence_id 
-        ,new_state 
-        ,business_date 
-        ,plugin_id 
-        ,processing_time 
-        ,processing_remarks 
-        ,processor_name 
-        ,processor 
-        ,new_system_number 
-        ,new_system_primary 
-        ,remark 
-        ,def1 
-        ,def2 
-        ,def3 
-        ,def4 
-        ,def5 
+        ,org_id
+        ,company_id
      </sql>
+    <!--通过ID获取数据 -->
+    <select id="entity_get" resultMap="get-IntegrationTaskLogEntity-result">
+        select
+        <include refid="IntegrationTaskLogEntity_Base_Column_List"/>
+        from integration_task_log where id = #{id} and sts = 'Y'
+    </select>
  <!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-IntegrationTaskLogEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+    <select id="entity_list_base" resultMap="get-IntegrationTaskLogEntity-result"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
     select
-    <include refid="IntegrationTaskLogEntity_Base_Column_List" />
-    from integration_task_living_details
+        <include refid="IntegrationTaskLogEntity_Base_Column_List"/>
+        from integration_task_log
     <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id = #{taskLinvingId} </if>
-            <if test="result != null and result != ''"> and result = #{result} </if>
-            <if test="queryCondition != null and queryCondition != ''"> and query_condition = #{queryCondition} </if>
-            <if test="rootAppPk != null and rootAppPk != ''"> and root_app_pk = #{rootAppPk} </if>
-            <if test="rootAppBill != null and rootAppBill != ''"> and root_app_bill = #{rootAppBill} </if>
-            <if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data = #{rootAppNewData} </if>
-            <if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info = #{newTransmitInfo} </if>
-            <if test="newPushDate != null"> and new_push_date = #{newPushDate} </if>
-            <if test="repairPust != null and repairPust != ''"> and repair_pust = #{repairPust} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
-            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="senceId != null and senceId != ''"> and sence_id = #{senceId} </if>
-            <if test="newState != null and newState != ''"> and new_state = #{newState} </if>
-            <if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
-            <if test="pluginId != null and pluginId != ''"> and plugin_id = #{pluginId} </if>
-            <if test="processingTime != null"> and processing_time = #{processingTime} </if>
-            <if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks = #{processingRemarks} </if>
-            <if test="processorName != null and processorName != ''"> and processor_name = #{processorName} </if>
-            <if test="processor != null and processor != ''"> and processor = #{processor} </if>
-            <if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number = #{newSystemNumber} </if>
-            <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </if>
-            <if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
-            <if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
-            <if test="def3 != null and def3 != ''"> and def3 = #{def3} </if>
-            <if test="def4 != null and def4 != ''"> and def4 = #{def4} </if>
-            <if test="def5 != null and def5 != ''"> and def5 = #{def5} </if>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id = #{taskLinvingId}</if>
+            <if test="taskId != null and taskId != ''">and task_id = #{taskId}</if>
+            <if test="taskCode != null and taskCode != ''">and task_code = #{taskCode}</if>
+            <if test="taskName != null and taskName != ''">and task_name = #{taskName}</if>
+            <if test="remark != null and remark != ''">and remark = #{remark}</if>
+            <if test="taskStatus != null and taskStatus != ''">and task_status = #{taskStatus}</if>
+            <if test="startTime != null">and start_time = #{startTime}</if>
+            <if test="endTime != null">and end_time = #{endTime}</if>
+            <if test="diffTime != null and diffTime != ''">and diff_time = #{diffTime}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             and sts='Y'
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
 </select>
     
 <!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
-        select  count(1)   from integration_task_living_details
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+        select count(1) from integration_task_log
     <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id = #{taskLinvingId} </if>
-            <if test="result != null and result != ''"> and result = #{result} </if>
-            <if test="queryCondition != null and queryCondition != ''"> and query_condition = #{queryCondition} </if>
-            <if test="rootAppPk != null and rootAppPk != ''"> and root_app_pk = #{rootAppPk} </if>
-            <if test="rootAppBill != null and rootAppBill != ''"> and root_app_bill = #{rootAppBill} </if>
-            <if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data = #{rootAppNewData} </if>
-            <if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info = #{newTransmitInfo} </if>
-            <if test="newPushDate != null"> and new_push_date = #{newPushDate} </if>
-            <if test="repairPust != null and repairPust != ''"> and repair_pust = #{repairPust} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
-            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="senceId != null and senceId != ''"> and sence_id = #{senceId} </if>
-            <if test="newState != null and newState != ''"> and new_state = #{newState} </if>
-            <if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
-            <if test="pluginId != null and pluginId != ''"> and plugin_id = #{pluginId} </if>
-            <if test="processingTime != null"> and processing_time = #{processingTime} </if>
-            <if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks = #{processingRemarks} </if>
-            <if test="processorName != null and processorName != ''"> and processor_name = #{processorName} </if>
-            <if test="processor != null and processor != ''"> and processor = #{processor} </if>
-            <if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number = #{newSystemNumber} </if>
-            <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </if>
-            <if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
-            <if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
-            <if test="def3 != null and def3 != ''"> and def3 = #{def3} </if>
-            <if test="def4 != null and def4 != ''"> and def4 = #{def4} </if>
-            <if test="def5 != null and def5 != ''"> and def5 = #{def5} </if>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id = #{taskLinvingId}</if>
+            <if test="taskId != null and taskId != ''">and task_id = #{taskId}</if>
+            <if test="taskCode != null and taskCode != ''">and task_code = #{taskCode}</if>
+            <if test="taskName != null and taskName != ''">and task_name = #{taskName}</if>
+            <if test="remark != null and remark != ''">and remark = #{remark}</if>
+            <if test="taskStatus != null and taskStatus != ''">and task_status = #{taskStatus}</if>
+            <if test="startTime != null">and start_time = #{startTime}</if>
+            <if test="endTime != null">and end_time = #{endTime}</if>
+            <if test="diffTime != null and diffTime != ''">and diff_time = #{diffTime}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             and sts='Y'
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-IntegrationTaskLogEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+    <select id="entity_list_like" resultMap="get-IntegrationTaskLogEntity-result"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
     select
-    <include refid="IntegrationTaskLogEntity_Base_Column_List" />
-    from integration_task_living_details
+        <include refid="IntegrationTaskLogEntity_Base_Column_List"/>
+        from integration_task_log
     <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
-            <if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id like concat('%',#{taskLinvingId},'%') </if>
-            <if test="result != null and result != ''"> and result like concat('%',#{result},'%') </if>
-            <if test="queryCondition != null and queryCondition != ''"> and query_condition like concat('%',#{queryCondition},'%') </if>
-            <if test="rootAppPk != null and rootAppPk != ''"> and root_app_pk like concat('%',#{rootAppPk},'%') </if>
-            <if test="rootAppBill != null and rootAppBill != ''"> and root_app_bill like concat('%',#{rootAppBill},'%') </if>
-            <if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data like concat('%',#{rootAppNewData},'%') </if>
-            <if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info like concat('%',#{newTransmitInfo},'%') </if>
-            <if test="newPushDate != null"> and new_push_date like concat('%',#{newPushDate},'%') </if>
-            <if test="repairPust != null and repairPust != ''"> and repair_pust like concat('%',#{repairPust},'%') </if>
-            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
-            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
-            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
-            <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
-            <if test="senceId != null and senceId != ''"> and sence_id like concat('%',#{senceId},'%') </if>
-            <if test="newState != null and newState != ''"> and new_state like concat('%',#{newState},'%') </if>
-            <if test="businessDate != null and businessDate != ''"> and business_date like concat('%',#{businessDate},'%') </if>
-            <if test="pluginId != null and pluginId != ''"> and plugin_id like concat('%',#{pluginId},'%') </if>
-            <if test="processingTime != null"> and processing_time like concat('%',#{processingTime},'%') </if>
-            <if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks like concat('%',#{processingRemarks},'%') </if>
-            <if test="processorName != null and processorName != ''"> and processor_name like concat('%',#{processorName},'%') </if>
-            <if test="processor != null and processor != ''"> and processor like concat('%',#{processor},'%') </if>
-            <if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number like concat('%',#{newSystemNumber},'%') </if>
-            <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary like concat('%',#{newSystemPrimary},'%') </if>
-            <if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </if>
-            <if test="def1 != null and def1 != ''"> and def1 like concat('%',#{def1},'%') </if>
-            <if test="def2 != null and def2 != ''"> and def2 like concat('%',#{def2},'%') </if>
-            <if test="def3 != null and def3 != ''"> and def3 like concat('%',#{def3},'%') </if>
-            <if test="def4 != null and def4 != ''"> and def4 like concat('%',#{def4},'%') </if>
-            <if test="def5 != null and def5 != ''"> and def5 like concat('%',#{def5},'%') </if>
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id like
+                concat('%',#{taskLinvingId},'%')
+            </if>
+            <if test="taskId != null and taskId != ''">and task_id like concat('%',#{taskId},'%')</if>
+            <if test="taskCode != null and taskCode != ''">and task_code like concat('%',#{taskCode},'%')</if>
+            <if test="taskName != null and taskName != ''">and task_name like concat('%',#{taskName},'%')</if>
+            <if test="remark != null and remark != ''">and remark like concat('%',#{remark},'%')</if>
+            <if test="taskStatus != null and taskStatus != ''">and task_status like concat('%',#{taskStatus},'%')</if>
+            <if test="startTime != null">and start_time like concat('%',#{startTime},'%')</if>
+            <if test="endTime != null">and end_time like concat('%',#{endTime},'%')</if>
+            <if test="diffTime != null and diffTime != ''">and diff_time like concat('%',#{diffTime},'%')</if>
+            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
+            <if test="companyId != null and companyId != ''">and company_id like concat('%',#{companyId},'%')</if>
             and sts='Y'
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
 </select>
 
 <!-- 查询列表 字段采用or格式 -->
-<select id="IntegrationTaskLogentity_list_or" resultMap="get-IntegrationTaskLogEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+    <select id="IntegrationTaskLogentity_list_or" resultMap="get-IntegrationTaskLogEntity-result"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
     select
-    <include refid="IntegrationTaskLogEntity_Base_Column_List" />
-    from integration_task_living_details
+        <include refid="IntegrationTaskLogEntity_Base_Column_List"/>
+        from integration_task_log
     <trim prefix="where" prefixOverrides="and"> 
-         <if test="id != null and id != ''"> or id = #{id} </if>
-             <if test="taskLinvingId != null and taskLinvingId != ''"> or task_linving_id = #{taskLinvingId} </if>
-             <if test="result != null and result != ''"> or result = #{result} </if>
-             <if test="queryCondition != null and queryCondition != ''"> or query_condition = #{queryCondition} </if>
-             <if test="rootAppPk != null and rootAppPk != ''"> or root_app_pk = #{rootAppPk} </if>
-             <if test="rootAppBill != null and rootAppBill != ''"> or root_app_bill = #{rootAppBill} </if>
-             <if test="rootAppNewData != null and rootAppNewData != ''"> or root_app_new_data = #{rootAppNewData} </if>
-             <if test="newTransmitInfo != null and newTransmitInfo != ''"> or new_transmit_info = #{newTransmitInfo} </if>
-             <if test="newPushDate != null"> or new_push_date = #{newPushDate} </if>
-             <if test="repairPust != null and repairPust != ''"> or repair_pust = #{repairPust} </if>
-             <if test="create_time != null"> or create_time = #{create_time} </if>
-              <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
-              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
-              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
-              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
-             <if test="sorts != null"> or sorts = #{sorts} </if>
-             <if test="senceId != null and senceId != ''"> or sence_id = #{senceId} </if>
-             <if test="newState != null and newState != ''"> or new_state = #{newState} </if>
-             <if test="businessDate != null and businessDate != ''"> or business_date = #{businessDate} </if>
-             <if test="pluginId != null and pluginId != ''"> or plugin_id = #{pluginId} </if>
-             <if test="processingTime != null"> or processing_time = #{processingTime} </if>
-             <if test="processingRemarks != null and processingRemarks != ''"> or processing_remarks = #{processingRemarks} </if>
-             <if test="processorName != null and processorName != ''"> or processor_name = #{processorName} </if>
-             <if test="processor != null and processor != ''"> or processor = #{processor} </if>
-             <if test="newSystemNumber != null and newSystemNumber != ''"> or new_system_number = #{newSystemNumber} </if>
-             <if test="newSystemPrimary != null and newSystemPrimary != ''"> or new_system_primary = #{newSystemPrimary} </if>
-             <if test="remark != null and remark != ''"> or remark = #{remark} </if>
-             <if test="def1 != null and def1 != ''"> or def1 = #{def1} </if>
-             <if test="def2 != null and def2 != ''"> or def2 = #{def2} </if>
-             <if test="def3 != null and def3 != ''"> or def3 = #{def3} </if>
-             <if test="def4 != null and def4 != ''"> or def4 = #{def4} </if>
-             <if test="def5 != null and def5 != ''"> or def5 = #{def5} </if>
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">or task_linving_id = #{taskLinvingId}</if>
+            <if test="taskId != null and taskId != ''">or task_id = #{taskId}</if>
+            <if test="taskCode != null and taskCode != ''">or task_code = #{taskCode}</if>
+            <if test="taskName != null and taskName != ''">or task_name = #{taskName}</if>
+            <if test="remark != null and remark != ''">or remark = #{remark}</if>
+            <if test="taskStatus != null and taskStatus != ''">or task_status = #{taskStatus}</if>
+            <if test="startTime != null">or start_time = #{startTime}</if>
+            <if test="endTime != null">or end_time = #{endTime}</if>
+            <if test="diffTime != null and diffTime != ''">or diff_time = #{diffTime}</if>
+            <if test="sorts != null">or sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
+            <if test="companyId != null and companyId != ''">or company_id = #{companyId}</if>
             and sts='Y'
     </trim>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
 </select>
 
 <!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity"  >
-    insert into integration_task_living_details(
+    <insert id="entity_insert"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+        insert into integration_task_log(
   <trim suffix="" suffixOverrides=",">
-       <if test="id != null and id != ''"> id , </if>
-            <if test="taskLinvingId != null and taskLinvingId != ''"> task_linving_id , </if>
-            <if test="result != null and result != ''"> result , </if>
-            <if test="queryCondition != null and queryCondition != ''"> query_condition , </if>
-            <if test="rootAppPk != null and rootAppPk != ''"> root_app_pk , </if>
-            <if test="rootAppBill != null and rootAppBill != ''"> root_app_bill , </if>
-            <if test="rootAppNewData != null and rootAppNewData != ''"> root_app_new_data , </if>
-            <if test="newTransmitInfo != null and newTransmitInfo != ''"> new_transmit_info , </if>
-            <if test="newPushDate != null"> new_push_date , </if>
-            <if test="repairPust != null and repairPust != ''"> repair_pust , </if>
-            <if test="create_time != null"> create_time , </if>
-            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
-            <if test="modify_time != null"> modify_time , </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
-            <if test="sts != null and sts != ''"> sts , </if>
-            <if test="sorts != null"> sorts , </if>
-            <if test="senceId != null and senceId != ''"> sence_id , </if>
-            <if test="newState != null and newState != ''"> new_state , </if>
-            <if test="businessDate != null and businessDate != ''"> business_date , </if>
-            <if test="pluginId != null and pluginId != ''"> plugin_id , </if>
-            <if test="processingTime != null"> processing_time , </if>
-            <if test="processingRemarks != null and processingRemarks != ''"> processing_remarks , </if>
-            <if test="processorName != null and processorName != ''"> processor_name , </if>
-            <if test="processor != null and processor != ''"> processor , </if>
-            <if test="newSystemNumber != null and newSystemNumber != ''"> new_system_number , </if>
-            <if test="newSystemPrimary != null and newSystemPrimary != ''"> new_system_primary , </if>
-            <if test="remark != null and remark != ''"> remark , </if>
-            <if test="def1 != null and def1 != ''"> def1 , </if>
-            <if test="def2 != null and def2 != ''"> def2 , </if>
-            <if test="def3 != null and def3 != ''"> def3 , </if>
-            <if test="def4 != null and def4 != ''"> def4 , </if>
-            <if test="def5 != null and def5 != ''"> def5 , </if>
-            <if test="sorts == null ">sorts,</if>
+            <if test="id != null and id != ''">id ,</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">task_linving_id ,</if>
+            <if test="taskId != null and taskId != ''">task_id ,</if>
+            <if test="taskCode != null and taskCode != ''">task_code ,</if>
+            <if test="taskName != null and taskName != ''">task_name ,</if>
+            <if test="remark != null and remark != ''">remark ,</if>
+            <if test="taskStatus != null and taskStatus != ''">task_status ,</if>
+            <if test="startTime != null">start_time ,</if>
+            <if test="endTime != null">end_time ,</if>
+            <if test="diffTime != null and diffTime != ''">diff_time ,</if>
+            <if test="sorts != null">sorts ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="org_id != null and org_id != ''">org_id ,</if>
+            <if test="companyId != null and companyId != ''">company_id ,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
  <trim suffix="" suffixOverrides=",">
-       <if test="id != null and id != ''"> #{id} ,</if>
-            <if test="taskLinvingId != null and taskLinvingId != ''"> #{taskLinvingId} ,</if>
-            <if test="result != null and result != ''"> #{result} ,</if>
-            <if test="queryCondition != null and queryCondition != ''"> #{queryCondition} ,</if>
-            <if test="rootAppPk != null and rootAppPk != ''"> #{rootAppPk} ,</if>
-            <if test="rootAppBill != null and rootAppBill != ''"> #{rootAppBill} ,</if>
-            <if test="rootAppNewData != null and rootAppNewData != ''"> #{rootAppNewData} ,</if>
-            <if test="newTransmitInfo != null and newTransmitInfo != ''"> #{newTransmitInfo} ,</if>
-            <if test="newPushDate != null"> #{newPushDate} ,</if>
-            <if test="repairPust != null and repairPust != ''"> #{repairPust} ,</if>
-            <if test="create_time != null"> #{create_time} ,</if>
-            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
-            <if test="modify_time != null"> #{modify_time} ,</if>
-            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
-            <if test="sts != null and sts != ''"> #{sts} ,</if>
-            <if test="sorts != null"> #{sorts} ,</if>
-            <if test="senceId != null and senceId != ''"> #{senceId} ,</if>
-            <if test="newState != null and newState != ''"> #{newState} ,</if>
-            <if test="businessDate != null and businessDate != ''"> #{businessDate} ,</if>
-            <if test="pluginId != null and pluginId != ''"> #{pluginId} ,</if>
-            <if test="processingTime != null"> #{processingTime} ,</if>
-            <if test="processingRemarks != null and processingRemarks != ''"> #{processingRemarks} ,</if>
-            <if test="processorName != null and processorName != ''"> #{processorName} ,</if>
-            <if test="processor != null and processor != ''"> #{processor} ,</if>
-            <if test="newSystemNumber != null and newSystemNumber != ''"> #{newSystemNumber} ,</if>
-            <if test="newSystemPrimary != null and newSystemPrimary != ''"> #{newSystemPrimary} ,</if>
-            <if test="remark != null and remark != ''"> #{remark} ,</if>
-            <if test="def1 != null and def1 != ''"> #{def1} ,</if>
-            <if test="def2 != null and def2 != ''"> #{def2} ,</if>
-            <if test="def3 != null and def3 != ''"> #{def3} ,</if>
-            <if test="def4 != null and def4 != ''"> #{def4} ,</if>
-            <if test="def5 != null and def5 != ''"> #{def5} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living_details a WHERE a.sts = 'Y' ),</if>
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">#{taskLinvingId} ,</if>
+            <if test="taskId != null and taskId != ''">#{taskId} ,</if>
+            <if test="taskCode != null and taskCode != ''">#{taskCode} ,</if>
+            <if test="taskName != null and taskName != ''">#{taskName} ,</if>
+            <if test="remark != null and remark != ''">#{remark} ,</if>
+            <if test="taskStatus != null and taskStatus != ''">#{taskStatus} ,</if>
+            <if test="startTime != null">#{startTime} ,</if>
+            <if test="endTime != null">#{endTime} ,</if>
+            <if test="diffTime != null and diffTime != ''">#{diffTime} ,</if>
+            <if test="sorts != null">#{sorts} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="org_id != null and org_id != ''">#{org_id} ,</if>
+            <if test="companyId != null and companyId != ''">#{companyId} ,</if>
+
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
 </insert>
 <!-- 批量新增 -->
-<insert id="entityInsertBatch"  >
-  insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5,  sts) 
+    <insert id="entityInsertBatch" >
+        insert into integration_task_log(task_linving_id, task_id, task_code, task_name, remark, task_status,
+        start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,
+        company_id, sts)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}, 'Y')
+            (#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.remark},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
+            'Y')
     </foreach>
 </insert>
 <!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch"  >
-    insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5)
+    <insert id="entityInsertOrUpdateBatch" >
+        insert into integration_task_log(task_linving_id, task_id, task_code, task_name, remark, task_status,
+        start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,
+        company_id)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5})
+            (#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.remark},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
     </foreach>
     on duplicate key update
     task_linving_id = values(task_linving_id),
-    result = values(result),
-    query_condition = values(query_condition),
-    root_app_pk = values(root_app_pk),
-    root_app_bill = values(root_app_bill),
-    root_app_new_data = values(root_app_new_data),
-    new_transmit_info = values(new_transmit_info),
-    new_push_date = values(new_push_date),
-    repair_pust = values(repair_pust),
+        task_id = values(task_id),
+        task_code = values(task_code),
+        task_name = values(task_name),
+        remark = values(remark),
+        task_status = values(task_status),
+        start_time = values(start_time),
+        end_time = values(end_time),
+        diff_time = values(diff_time),
+        sorts = values(sorts),
+        create_user_id = values(create_user_id),
     create_time = values(create_time),
-    create_user_id = values(create_user_id),
+        modify_user_id = values(modify_user_id),
     modify_time = values(modify_time),
-    modify_user_id = values(modify_user_id),
     sts = values(sts),
-    sence_id = values(sence_id),
-    new_state = values(new_state),
-    business_date = values(business_date),
-    plugin_id = values(plugin_id),
-    processing_time = values(processing_time),
-    processing_remarks = values(processing_remarks),
-    processor_name = values(processor_name),
-    processor = values(processor),
-    new_system_number = values(new_system_number),
-    new_system_primary = values(new_system_primary),
-    remark = values(remark),
-    def1 = values(def1),
-    def2 = values(def2),
-    def3 = values(def3),
-    def4 = values(def4),
-    def5 = values(def5)</insert>
+        org_id = values(org_id),
+        company_id = values(company_id)
+    </insert>
 <!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
-update integration_task_living_details  set
+    <update id="entity_update"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+        update integration_task_log set
 <trim suffix="" suffixOverrides=",">
-  <if test="taskLinvingId != null and taskLinvingId != ''"> task_linving_id = #{taskLinvingId},</if>
-  <if test="result != null and result != ''"> result = #{result},</if>
-  <if test="queryCondition != null and queryCondition != ''"> query_condition = #{queryCondition},</if>
-  <if test="rootAppPk != null and rootAppPk != ''"> root_app_pk = #{rootAppPk},</if>
-  <if test="rootAppBill != null and rootAppBill != ''"> root_app_bill = #{rootAppBill},</if>
-  <if test="rootAppNewData != null and rootAppNewData != ''"> root_app_new_data = #{rootAppNewData},</if>
-  <if test="newTransmitInfo != null and newTransmitInfo != ''"> new_transmit_info = #{newTransmitInfo},</if>
-  <if test="newPushDate != null"> new_push_date = #{newPushDate},</if>
-  <if test="repairPust != null and repairPust != ''"> repair_pust = #{repairPust},</if>
-  <if test="create_time != null"> create_time = #{create_time},</if>
-    <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
-    <if test="modify_time != null"> modify_time = #{modify_time},</if>
-    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
-    <if test="sts != null and sts != ''"> sts = #{sts},</if>
-  <if test="senceId != null and senceId != ''"> sence_id = #{senceId},</if>
-  <if test="newState != null and newState != ''"> new_state = #{newState},</if>
-  <if test="businessDate != null and businessDate != ''"> business_date = #{businessDate},</if>
-  <if test="pluginId != null and pluginId != ''"> plugin_id = #{pluginId},</if>
-  <if test="processingTime != null"> processing_time = #{processingTime},</if>
-  <if test="processingRemarks != null and processingRemarks != ''"> processing_remarks = #{processingRemarks},</if>
-  <if test="processorName != null and processorName != ''"> processor_name = #{processorName},</if>
-  <if test="processor != null and processor != ''"> processor = #{processor},</if>
-  <if test="newSystemNumber != null and newSystemNumber != ''"> new_system_number = #{newSystemNumber},</if>
-  <if test="newSystemPrimary != null and newSystemPrimary != ''"> new_system_primary = #{newSystemPrimary},</if>
-  <if test="remark != null and remark != ''"> remark = #{remark},</if>
-  <if test="def1 != null and def1 != ''"> def1 = #{def1},</if>
-  <if test="def2 != null and def2 != ''"> def2 = #{def2},</if>
-  <if test="def3 != null and def3 != ''"> def3 = #{def3},</if>
-  <if test="def4 != null and def4 != ''"> def4 = #{def4},</if>
-  <if test="def5 != null and def5 != ''"> def5 = #{def5},</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">task_linving_id = #{taskLinvingId},</if>
+            <if test="taskId != null and taskId != ''">task_id = #{taskId},</if>
+            <if test="taskCode != null and taskCode != ''">task_code = #{taskCode},</if>
+            <if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="taskStatus != null and taskStatus != ''">task_status = #{taskStatus},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="diffTime != null and diffTime != ''">diff_time = #{diffTime},</if>
+            <if test="sorts != null">sorts = #{sorts},</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+            <if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
+            <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
 </trim>
 where id = #{id}
 </update>
 <!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
-update integration_task_living_details  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+    <update id="entity_logicDelete"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+update integration_task_log  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
 where id = #{id}
 </update>
 <!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
-update integration_task_living_details  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
+        update integration_task_log set sts= 'N' ,modify_time = #{modify_time},modify_user_id =
+        #{modify_user_id}
  <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id = #{taskLinvingId} </if>
-            <if test="result != null and result != ''"> and result = #{result} </if>
-            <if test="queryCondition != null and queryCondition != ''"> and query_condition = #{queryCondition} </if>
-            <if test="rootAppPk != null and rootAppPk != ''"> and root_app_pk = #{rootAppPk} </if>
-            <if test="rootAppBill != null and rootAppBill != ''"> and root_app_bill = #{rootAppBill} </if>
-            <if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data = #{rootAppNewData} </if>
-            <if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info = #{newTransmitInfo} </if>
-            <if test="newPushDate != null"> and new_push_date = #{newPushDate} </if>
-            <if test="repairPust != null and repairPust != ''"> and repair_pust = #{repairPust} </if>
-                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="senceId != null and senceId != ''"> and sence_id = #{senceId} </if>
-            <if test="newState != null and newState != ''"> and new_state = #{newState} </if>
-            <if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
-            <if test="pluginId != null and pluginId != ''"> and plugin_id = #{pluginId} </if>
-            <if test="processingTime != null"> and processing_time = #{processingTime} </if>
-            <if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks = #{processingRemarks} </if>
-            <if test="processorName != null and processorName != ''"> and processor_name = #{processorName} </if>
-            <if test="processor != null and processor != ''"> and processor = #{processor} </if>
-            <if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number = #{newSystemNumber} </if>
-            <if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </if>
-            <if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
-            <if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
-            <if test="def3 != null and def3 != ''"> and def3 = #{def3} </if>
-            <if test="def4 != null and def4 != ''"> and def4 = #{def4} </if>
-            <if test="def5 != null and def5 != ''"> and def5 = #{def5} </if>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id = #{taskLinvingId}</if>
+            <if test="taskId != null and taskId != ''">and task_id = #{taskId}</if>
+            <if test="taskCode != null and taskCode != ''">and task_code = #{taskCode}</if>
+            <if test="taskName != null and taskName != ''">and task_name = #{taskName}</if>
+            <if test="remark != null and remark != ''">and remark = #{remark}</if>
+            <if test="taskStatus != null and taskStatus != ''">and task_status = #{taskStatus}</if>
+            <if test="startTime != null">and start_time = #{startTime}</if>
+            <if test="endTime != null">and end_time = #{endTime}</if>
+            <if test="diffTime != null and diffTime != ''">and diff_time = #{diffTime}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             and sts='Y'
     </trim>
 </update>
 <!--通过主键删除-->
 <delete id="entity_delete">
-    delete from integration_task_living_details where id = #{id}
+    delete from integration_task_log where id = #{id}
 </delete>
 
 </mapper>
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
index 67165e65..32bcfd0c 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
@@ -1,12 +1,33 @@
 package com.hzya.frame.sysnew.integtationTaskLog.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity;
 import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
 /**
  * 集成任务-实例详情(IntegrationTaskLog)表服务接口
  *
  * @author makejava
- * @since 2024-05-15 14:06:43
+ * @since 2024-05-06 15:37:55
  */
 public interface IIntegrationTaskLogService extends IBaseService<IntegrationTaskLogEntity, String>{
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 查询任务日志列表分页
+     * @Date 11:52 上午 2024/3/27
+     **/
+    JsonResultEntity queryEntityPage(JSONObject jsonObject);
+
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 获取任务
+     * @Date 2:36 下午 2024/3/27
+     **/
+    JsonResultEntity getEntity(JSONObject jsonObject);
 }
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
index fe28a014..0cf7b360 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
@@ -1,17 +1,24 @@
 package com.hzya.frame.sysnew.integtationTaskLog.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity;
 import com.hzya.frame.sysnew.integtationTaskLog.dao.IIntegrationTaskLogDao;
 import com.hzya.frame.sysnew.integtationTaskLog.service.IIntegrationTaskLogService;
-import org.springframework.stereotype.Service; 
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
 import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
 /**
  * 集成任务-实例详情(IntegrationTaskLog)表服务实现类
  *
  * @author makejava
- * @since 2024-05-15 14:06:46
+ * @since 2024-05-06 15:37:55
  */
 @Service(value = "integrationTaskLogService")
 public class IntegrationTaskLogServiceImpl extends BaseService<IntegrationTaskLogEntity, String> implements IIntegrationTaskLogService {
@@ -23,4 +30,48 @@ public class IntegrationTaskLogServiceImpl extends BaseService<IntegrationTaskLo
 		this.integrationTaskLogDao = dao;
 		this.dao = dao;
 	}
+
+	/**
+	 * @param jsonObject
+	 * @return com.hzya.frame.web.entity.JsonResultEntity
+	 * @Author lvleigang
+	 * @Description 查询任务日志列表分页
+	 * @Date 11:52 上午 2024/3/27
+	 **/
+	@Override
+	public JsonResultEntity queryEntityPage(JSONObject jsonObject) {
+		IntegrationTaskLogEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLogEntity.class);
+		//判断分页
+		if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) {
+			return BaseResult.getFailureMessageEntity("分页查询参数不存在");
+		}
+		PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
+		List<IntegrationTaskLogEntity> list = integrationTaskLogDao.queryByLike(entity);
+		PageInfo pageInfo = new PageInfo(list);
+		return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+	}
+
+
+	/**
+	 * @param jsonObject
+	 * @return com.hzya.frame.web.entity.JsonResultEntity
+	 * @Author lvleigang
+	 * @Description 获取任务日志
+	 * @Date 2:36 下午 2024/3/27
+	 **/
+	@Override
+	public JsonResultEntity getEntity(JSONObject jsonObject) {
+		IntegrationTaskLogEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLogEntity.class);
+		if (entity == null) {
+			return BaseResult.getFailureMessageEntity("参数不允许为空");
+		}
+		if (entity.getId() == null || "".equals(entity.getId())) {
+			return BaseResult.getFailureMessageEntity("系统错误");
+		}
+		entity = integrationTaskLogDao.get(entity.getId());
+		if (entity == null) {
+			return BaseResult.getFailureMessageEntity("获取任务日志失败");
+		}
+		return BaseResult.getSuccessMessageEntity("获取任务日志成功", entity);
+	}
 }