diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index ce088356..bcb99133 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -188,6 +188,8 @@ public class XmTaskController {
 		params.put("taskOut","1");
 		params.put("ntype","0");
 		params.put("toTaskCenter","1");
+
+		QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
 		List<Map<String,Object>> datas=xmTaskService.getTask(params);
 
 		return Result.ok().setData(datas).setTotal(page.getTotal());
@@ -198,7 +200,10 @@ public class XmTaskController {
 	public Result getXmTaskAttDist(@ApiIgnore @RequestParam Map<String,Object> params){
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
-		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAttDist(params);
+
+		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
+		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAttDist(page,qw,params);
 		return Result.ok("ok","成功",datas);
 	}
 
@@ -206,7 +211,10 @@ public class XmTaskController {
 	public Result getXmTaskAgeDist(@ApiIgnore @RequestParam Map<String,Object> params){
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
-		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(params);
+
+		IPage page=QueryTools.initPage(params);
+		QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
+		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(page,qw,params);
 		return Result.ok("ok","成功",datas);
 	}
 
@@ -237,7 +245,8 @@ public class XmTaskController {
 		User user=LoginUtils.getCurrentUserInfo();		
 		IPage page=QueryTools.initPage(params);
 		params.put("pbranchId",user.getBranchId());
-		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskSort(params);
+		QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
+		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskSort(page,qw,params);
 		return Result.ok().setData(datas).setTotal(page.getTotal());
 		
 		
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java
index d354bda1..39cda5dc 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmTaskMapper.java
@@ -38,15 +38,15 @@ public interface XmTaskMapper extends BaseMapper<XmTask> {
 
     void batchUpdateBudgetWorkloadAndRate(Map<String, Object> map);
 
-    List<Map<String, Object>> getXmTaskAttDist(Map<String, Object> xmTask);
+    List<Map<String, Object>> getXmTaskAttDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
-    List<Map<String, Object>> getXmTaskAgeDist(Map<String, Object> xmTask);
+    List<Map<String, Object>> getXmTaskAgeDist(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
     void upBrowseTimes(Map<String, Object> map);
 
     void updateSomeFieldByPkAfterPaySuccess(XmTask xmTaskUpdate);
 
-    List<Map<String, Object>> getXmTaskSort(Map<String, Object> xmTask);
+    List<Map<String, Object>> getXmTaskSort(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
     List<XmTask> listTenTaskByProjectIdAndProductId(Map<String, Object> projectId);
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
index b7de7da7..cb6d40a6 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
@@ -828,16 +828,16 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
 		baseMapper.batchUpdateBudgetWorkloadAndRate(map("ids",ids,"budgetWorkload",budgetWorkload));
 	}
 
-	public List<Map<String, Object>> getXmTaskAttDist(Map<String, Object> xmTask) {
-		return baseMapper.getXmTaskAttDist(xmTask);
+	public List<Map<String, Object>> getXmTaskAttDist(IPage page, QueryWrapper ew, Map<String,Object> ext) {
+		return baseMapper.getXmTaskAttDist(page,ew,ext);
 	}
 
-	public List<Map<String, Object>> getXmTaskAgeDist(Map<String, Object> xmTask) {
-		return baseMapper.getXmTaskAgeDist(xmTask);
+	public List<Map<String, Object>> getXmTaskAgeDist(IPage page, QueryWrapper ew, Map<String,Object> ext) {
+		return baseMapper.getXmTaskAgeDist(page,ew,ext);
 	}
 
-	public List<Map<String, Object>> getXmTaskSort(Map<String, Object> xmTask) {
-		return baseMapper.getXmTaskSort(xmTask);
+	public List<Map<String, Object>> getXmTaskSort(IPage page, QueryWrapper ew, Map<String,Object> ext) {
+		return baseMapper.getXmTaskSort(page,ew,ext);
 	}
 
 	@Override
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRecordVisitMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRecordVisitMapper.xml
deleted file mode 100644
index 634c902b..00000000
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRecordVisitMapper.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?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.xm.core.entity.XmRecordVisit">
-	
-	
-	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
-
-    <sql id="whereForMap">
-         <if test=" ids != null">  and (res.id) in
-             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-                 ( #{item})
-             </foreach>
-         </if>
-        <if test="key != null and key !='' ">       </if>
-    </sql>
-
-	<update id="updateTaskBrowseTimesAndBrowseUsers" parameterType="List">
-		<foreach collection="list" item="item" index="index" separator=";" >
-			update xm_task t set t.browse_users=ifnull(t.browse_users,0)+#{item.browseUsers},t.browse_times=ifnull(t.browse_times,0)+#{item.browseTimes}
-			where t.id=#{item.id}
-		</foreach>
-	</update>
-	<!--结束 自定义sql函数区域-->
-	
-
-	
-	<!-- 通过条件查询获取数据列表 返回list<map> -->
-	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_record_visit res
-		<where>
-		    <include refid="whereForMap"/>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
-	<select id="selectListByWhere" parameterType="com.xm.core.entity.XmRecordVisit" resultType="com.xm.core.entity.XmRecordVisit">
-		select * from xm_record_visit res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	
-		<!-- 通过主键查询获取数据对象 返回object -->
-	<select id="selectOneObject" parameterType="com.xm.core.entity.XmRecordVisit" resultType="com.xm.core.entity.XmRecordVisit">
-		select * from xm_record_visit res
-		where 
-			res.id = #{id}
-	</select>
-    <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmRecordVisit">
-        select * from xm_record_visit res
-        where  (res.id) in
-             <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                 ( #{item})
-             </foreach>
-    </select>
-	<!-- 通过主键查询获取数据对象 返回map-->
-	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
-		select * from xm_record_visit res
-		where 
-			 res.id = #{id}
-	</select>
-	<!-- 获取数据条目 返回long -->
-	<select id="countByWhere" parameterType="com.xm.core.entity.XmRecordVisit" resultType="long">
-		select count(*) from xm_record_visit res
-		<where>
-			<include refid="where"/>
-		</where>
-	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmRecordVisit" useGeneratedKeys="false"   keyProperty="id">
-		insert into xm_record_visit(
-			<include refid="columns"/>
-		) values (
-		#{id},#{operUserid},#{operUsername},#{operTime},#{objType},#{action},#{remarks},#{gloNo},#{branchId},#{ip},#{bizId},#{pbizId},#{bizName}
-		)
-	</insert>
-	
-	<!-- 按条件删除若干条记录-->
-	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmRecordVisit">
-		delete from xm_record_visit res
-		<where>  
-			<include refid="where"/>
-		</where>
-	</delete>
-	
-	<!-- 按主键删除一条记录-->
-	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmRecordVisit">
-		delete from xm_record_visit 
-		where id = #{id} 
-	</delete>
-	
-	<!-- 根据条件修改若干条记录 -->
-	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmRecordVisit">
-		update  xm_record_visit 
-		<set>
-			<include refid="someFieldSet"/>
-		</set>
-		where id = #{id} 
-	</update>
-	
-		<!-- 根据主键修改一条记录 -->
-	<update id="updateByPk" parameterType="com.xm.core.entity.XmRecordVisit">
-		update  xm_record_visit 
-		<set>
-			<include refid="set"/>
-		</set>
-		where id = #{id} 
-	</update>
-
-	<!-- 批量新增  批量插入 借用insert 循环插入实现
-	<insert id="batchInsert" parameterType="List">
- 	</insert>
- 	-->
- 	
-	<!-- 批量更新 -->
-	<update id="batchUpdate" parameterType="List">   
-		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_record_visit 
-		set 
-			<include refid="batchSet"/>
-			where id = #{item.id}  
-		</foreach> 
-	</update>
-
-	<!-- 批量修改某几个字段 -->
-	<delete id="editSomeFields" parameterType="HashMap">
-		update  xm_record_visit
-        <set>
-            <include refid="someFieldSet"/>
-        </set>
-        where  (id) in
-             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-                 ( #{item})
-             </foreach>
-	</delete>
-	<!-- 批量删除 -->
-	<delete id="batchDelete" parameterType="List">  
-		delete from xm_record_visit 
-			where
-			(id) in
-                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                    (  #{item.id} )
-                </foreach>
-	</delete>
-	
-	
-	<!--sql片段 列-->
-	<sql id="columns">
-		id,oper_userid,oper_username,oper_time,obj_type,action,remarks,glo_no,branch_id,ip,biz_id,pbiz_id,biz_name
-	</sql>
-
-	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
-	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
-		<if test="operUserid != null and operUserid != ''">      and res.oper_userid = #{operUserid}     </if>
-		<if test="operUsername != null and operUsername != ''">      and res.oper_username = #{operUsername}     </if>
-		<if test="operTime != null">      and date_format(res.oper_time,'%Y-%m-%d') = date_format(#{operTime},'%Y-%m-%d')     </if>
-		<if test="objType != null and objType != ''">      and res.obj_type = #{objType}     </if>
-		<if test="action != null and action != ''">      and res.action = #{action}     </if>
-		<if test="remarks != null and remarks != ''">      and res.remarks = #{remarks}     </if>
-		<if test="gloNo != null and gloNo != ''">      and res.glo_no = #{gloNo}     </if>
-		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
-		<if test="ip != null and ip != ''">      and res.ip = #{ip}     </if>
-		<if test="bizId != null and bizId != ''">      and res.biz_id = #{bizId}     </if>
-		<if test="pbizId != null and pbizId != ''">      and res.pbiz_id = #{pbizId}     </if>
-		<if test="bizName != null and bizName != ''">      and res.biz_name = #{bizName}     </if>
-	</sql>
-	<!--sql片段 更新字段 -->
-	<sql id="set">
-		oper_userid = #{operUserid},
-		oper_username = #{operUsername},
-		oper_time = #{operTime},
-		obj_type = #{objType},
-		action = #{action},
-		remarks = #{remarks},
-		glo_no = #{gloNo},
-		branch_id = #{branchId},
-		ip = #{ip},
-		biz_id = #{bizId},
-		pbiz_id = #{pbizId},
-		biz_name = #{bizName}
-	</sql>
-	<sql id="someFieldSet">
-		<if test="operUserid != null and operUserid != ''"> oper_userid = #{operUserid},     </if>
-		<if test="operUsername != null and operUsername != ''"> oper_username = #{operUsername},     </if>
-		<if test="operTime != null"> oper_time = #{operTime},     </if>
-		<if test="objType != null and objType != ''"> obj_type = #{objType},     </if>
-		<if test="action != null and action != ''"> action = #{action},     </if>
-		<if test="remarks != null and remarks != ''"> remarks = #{remarks},     </if>
-		<if test="gloNo != null and gloNo != ''"> glo_no = #{gloNo},     </if>
-		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
-		<if test="ip != null and ip != ''"> ip = #{ip},     </if>
-		<if test="bizId != null and bizId != ''"> biz_id = #{bizId},     </if>
-		<if test="pbizId != null and pbizId != ''"> pbiz_id = #{pbizId},     </if>
-		<if test="bizName != null and bizName != ''"> biz_name = #{bizName},     </if>
-	</sql>
-	<!--sql片段 批量更新 -->
-	<sql id="batchSet">
-			oper_userid = #{item.operUserid},
-			oper_username = #{item.operUsername},
-			oper_time = #{item.operTime},
-			obj_type = #{item.objType},
-			action = #{item.action},
-			remarks = #{item.remarks},
-			glo_no = #{item.gloNo},
-			branch_id = #{item.branchId},
-			ip = #{item.ip},
-			biz_id = #{item.bizId},
-			pbiz_id = #{item.pbizId},
-			biz_name = #{item.bizName}
-	</sql>
-</mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mybatis-config.xml b/xm-core/src/main/resources/mybatis/mybatis-config.xml
deleted file mode 100644
index 6dbc255a..00000000
--- a/xm-core/src/main/resources/mybatis/mybatis-config.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD SQL Map Config 3.0//EN"  
-	"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-	<settings> 
-  		<setting name="cacheEnabled" value="true" /><!-- 全局映射器启用缓存 -->
-        <setting name="useGeneratedKeys" value="true" /> 
-        <setting name="defaultExecutorType" value="REUSE" /> 
-        <setting name="mapUnderscoreToCamelCase" value="true" />  
-        <setting name="callSettersOnNulls" value="true" />
-        <setting name="jdbcTypeForNull" value="NULL"/>   
-    </settings>
-    <typeHandlers>   
-		<typeHandler javaType="String" jdbcType="CLOB" handler="org.apache.ibatis.type.ClobTypeHandler"/> 
-		<!--<typeHandler javaType="oracle.sql.CLOB" jdbcType="CLOB" handler="org.apache.ibatis.type.ClobTypeHandler"/>-->  
-		<!--<typeHandler javaType="oracle.sql.TIMESTAMP" jdbcType="TIMESTAMP" handler="org.apache.ibatis.type.DateTypeHandler"/>-->  
-	</typeHandlers>
-	<objectWrapperFactory type="com.mdp.mybatis.MapWrapperFactory"></objectWrapperFactory>
-	<plugins> 
-		<!-- com.github.pagehelper为PageHelper类所在包名 -->
-        <plugin interceptor="com.github.pagehelper.PageInterceptor">
-            <!-- 4.0.0以后版本可以不设置该参数-->
-            <!--<property name="dialect" value="oracle"/> -->
-            <!-- 该参数默认为false -->
-            <!-- 设置为true时，会将RowBounds第一个参数offset当成pageNum页码使用 -->
-            <!-- 和startPage中的pageNum效果一样-->
-            <property name="offsetAsPageNum" value="true"/>
-            <!-- 该参数默认为false -->
-            <!-- 设置为true时，使用RowBounds分页会进行count查询 -->
-            <property name="rowBoundsWithCount" value="true"/>
-            <!-- 设置为true时，如果pageSize=0或者RowBounds.limit = 0就会查询出全部的结果 -->
-            <!-- （相当于没有执行分页查询，但是返回结果仍然是Page类型）-->
-            <property name="pageSizeZero" value="true"/>
-            <!-- 3.3.0版本可用 - 分页参数合理化，默认false禁用 -->
-            <!-- 启用合理化时，如果pageNum<1会查询第一页，如果pageNum>pages会查询最后一页 -->
-            <!-- 禁用合理化时，如果pageNum<1或pageNum>pages会返回空数据 -->
-            <property name="reasonable" value="true"/>
-            <!-- 3.5.0版本可用 - 为了支持startPage(Object params)方法 -->
-            <!-- 增加了一个`params`参数来配置参数映射，用于从Map或ServletRequest中取值 -->
-            <!-- 可以配置pageNum,pageSize,count,pageSizeZero,reasonable,orderBy,不配置映射的用默认值 -->
-            <!-- 不理解该含义的前提下，不要随便复制该配置 -->
-             <!-- <property name="params" value="pageNum=currentPage;pageSize=limit;"/> -->
-            <!-- 支持通过Mapper接口参数来传递分页参数 -->
-             <!-- <property name="supportMethodsArguments" value="true"/>-->
-            <!-- always总是返回PageInfo类型,check检查返回类型是否为PageInfo,none返回Page -->
-             <!-- <property name="returnPageInfo" value="check"/>-->
-        </plugin>
-	</plugins>
-</configuration>
\ No newline at end of file