diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskSkill.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskSkill.java
index 93cfc418..b3b37a96 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskSkill.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskSkill.java
@@ -1,107 +1,47 @@
-package com.xm.core.entity;
+package  com.xm.core.entity;
 
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 组织 com.qqkj  顶级模块 oa 大模块 xm  小模块 <br> 
+ * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskSkill所有属性名: <br>
- *	id,taskId,taskSkillId,taskSkillName,skillRemarks;<br>
- * 表 XM.xm_task_skill xm_task_skill的所有字段名: <br>
- *	id,task_id,task_skill_id,task_skill_name,skill_remarks;<br>
+ *	"taskId","任务编号","skillId","技能要求","skillName","技能名称","categoryId","技能分类";<br>
  * 当前主键(包括多主键):<br>
- *	id;<br>
+ *	task_id,skill_id;<br>
  */
-@ApiModel(description="xm_task_skill")
+ @Data
+@ApiModel(description="任务技能关联表")
 public class XmTaskSkill  implements java.io.Serializable {
 	
 	private static final long serialVersionUID = 1L;
 	
-	@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
-	String id;
-  	
-	
-	@ApiModelProperty(notes="任务编号",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="任务编号,主键",allowEmptyValue=true,example="",allowableValues="")
 	String taskId;
 	
-	@ApiModelProperty(notes="技能要求",allowEmptyValue=true,example="",allowableValues="")
-	String taskSkillId;
+	@ApiModelProperty(notes="技能要求,主键",allowEmptyValue=true,example="",allowableValues="")
+	String skillId;
+  	
 	
 	@ApiModelProperty(notes="技能名称",allowEmptyValue=true,example="",allowableValues="")
-	String taskSkillName;
+	String skillName;
 	
-	@ApiModelProperty(notes="技能描述",allowEmptyValue=true,example="",allowableValues="")
-	String skillRemarks;
+	@ApiModelProperty(notes="技能分类",allowEmptyValue=true,example="",allowableValues="")
+	String categoryId;
 
-	/**主键**/
-	public XmTaskSkill(String id) {
-		this.id = id;
-	}
-    
-    /**xm_task_skill**/
-	public XmTaskSkill() {
-	}
-	
 	/**
-	 * 主键
+	 *任务编号,技能要求
 	 **/
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * 任务编号
-	 **/
-	public void setTaskId(String taskId) {
+	public XmTaskSkill(String taskId,String skillId) {
 		this.taskId = taskId;
+		this.skillId = skillId;
 	}
-	/**
-	 * 技能要求
-	 **/
-	public void setTaskSkillId(String taskSkillId) {
-		this.taskSkillId = taskSkillId;
-	}
-	/**
-	 * 技能名称
-	 **/
-	public void setTaskSkillName(String taskSkillName) {
-		this.taskSkillName = taskSkillName;
-	}
-	/**
-	 * 技能描述
-	 **/
-	public void setSkillRemarks(String skillRemarks) {
-		this.skillRemarks = skillRemarks;
-	}
-	
-	/**
-	 * 主键
-	 **/
-	public String getId() {
-		return this.id;
-	}
-	/**
-	 * 任务编号
-	 **/
-	public String getTaskId() {
-		return this.taskId;
-	}
-	/**
-	 * 技能要求
-	 **/
-	public String getTaskSkillId() {
-		return this.taskSkillId;
-	}
-	/**
-	 * 技能名称
-	 **/
-	public String getTaskSkillName() {
-		return this.taskSkillName;
-	}
-	/**
-	 * 技能描述
-	 **/
-	public String getSkillRemarks() {
-		return this.skillRemarks;
+    
+    /**
+     * 任务技能关联表
+     **/
+	public XmTaskSkill() {
 	}
 
 }
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml
index 74599e5b..205b0296 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml
@@ -3,18 +3,24 @@
 <mapper namespace="com.xm.core.entity.XmTaskSkill">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
-		
-		
-		
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
+
+    <sql id="whereForMap">
+         <if test=" pkList != null">  and (res.task_id, res.skill_id) in
+             <foreach collection="pkList" item="item" index="index" open="(" separator="," close=")" >
+                ( #{item.taskId},  #{item.skillId})
+             </foreach>
+         </if>
+        <if test="key != null and key !='' ">       </if>
+    </sql>
+
 	<update id="updateXmTaskSkillIdsAndNamesByTaskId"
-		parameterType="String">
-		update xm_task t,(select task_id, group_concat(e.task_skill_id  Separator ',') as  task_skill_ids,group_concat(e.task_skill_name  Separator ',') as task_skill_names from  xm_task_skill e where e.task_id=#{taskId}) e1
-		set t.task_skill_ids=  e1.task_skill_ids , t.task_skill_names =  e1.task_skill_names
-		 
+			parameterType="String">
+		update xm_task t,(select task_id, group_concat(e.skill_id  Separator ',') as  task_skill_ids,group_concat(e.skill_name  Separator ',') as task_skill_names from  xm_task_skill e where e.task_id=#{taskId}) e1
+		set t.skill_ids=  e1.task_skill_ids , t.task_skill_names =  e1.task_skill_names
+
 		where e1.task_id=#{taskId}  and t.id=e1.task_id
-	</update>	
+	</update>
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -22,15 +28,9 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_task_skill res
-		<where> 
-			<if test="ids != null">  and     
-				id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
+		<where>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test="key != null and key !='' ">    </if>
 		</where>
 	</select>
 	
@@ -46,28 +46,36 @@
 	<select id="selectOneObject" parameterType="com.xm.core.entity.XmTaskSkill" resultType="com.xm.core.entity.XmTaskSkill">
 		select * from xm_task_skill res
 		where 
-			res.id = #{id}
+			res.task_id = #{taskId}
+			and res.skill_id = #{skillId}
 	</select>
-	
+    <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTaskSkill">
+        select * from xm_task_skill res
+        where  (res.task_id, res.skill_id) in
+             <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                ( #{item.taskId},  #{item.skillId})
+             </foreach>
+    </select>
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_task_skill res
 		where 
-			 res.id = #{id}
+			 res.task_id = #{taskId}
+			and  res.skill_id = #{skillId}
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmTaskSkill" resultType="long">
-		select count(1) from xm_task_skill res
+		select count(*) from xm_task_skill res
 		<where>
 			<include refid="where"/>
 		</where>
 	</select>
-	<!-- 新增一条记录  主键id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmTaskSkill" useGeneratedKeys="false" keyProperty="id">
+	<!-- 新增一条记录  主键task_id,skill_id,-->
+	<insert id="insert" parameterType="com.xm.core.entity.XmTaskSkill" useGeneratedKeys="false"  >
 		insert into xm_task_skill(
 			<include refid="columns"/>
 		) values (
-		#{id},#{taskId},#{taskSkillId},#{taskSkillName},#{skillRemarks}
+		#{taskId},#{skillId},#{skillName},#{categoryId}
 		)
 	</insert>
 	
@@ -81,26 +89,26 @@
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmTaskSkill">
-		delete from xm_task_skill
-		where id = #{id} 
+		delete from xm_task_skill 
+		where task_id = #{taskId} and skill_id = #{skillId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmTaskSkill">
-		update  xm_task_skill
+		update  xm_task_skill 
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
-		where id = #{id} 
+		where task_id = #{taskId} and skill_id = #{skillId} 
 	</update>
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmTaskSkill">
-		update  xm_task_skill
+		update  xm_task_skill 
 		<set>
 			<include refid="set"/>
 		</set>
-		where id = #{id} 
+		where task_id = #{taskId} and skill_id = #{skillId} 
 	</update>
 
 	<!-- 批量新增  批量插入 借用insert 循环插入实现
@@ -111,53 +119,59 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_task_skill
+   		update  xm_task_skill 
 		set 
 			<include refid="batchSet"/>
-			where id = #{item.id}  
+			where task_id = #{item.taskId} and skill_id = #{item.skillId}  
 		</foreach> 
 	</update>
+
+	<!-- 批量修改某几个字段 -->
+	<delete id="editSomeFields" parameterType="HashMap">
+		update  xm_task_skill
+        <set>
+            <include refid="someFieldSet"/>
+        </set>
+        where  (task_id, skill_id) in
+             <foreach collection="pkList" item="item" index="index" open="(" separator="," close=")" >
+                ( #{item.taskId},  #{item.skillId})
+             </foreach>
+	</delete>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_task_skill
-			where id in
-			    <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >  
-			        #{item.id }  
-			    </foreach>  
+		delete from xm_task_skill 
+			where
+			(task_id, skill_id) in
+                <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                    (  #{item.taskId},  #{item.skillId} )
+                </foreach>
 	</delete>
 	
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,task_id,task_skill_id,task_skill_name,skill_remarks
+		task_id,skill_id,skill_name,category_id
 	</sql>
-	
+
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
 	<sql id="where">
-		<if test="id != null and id != ''">      and res.id = #{id}     </if>
 		<if test="taskId != null and taskId != ''">      and res.task_id = #{taskId}     </if>
-		<if test="taskSkillId != null and taskSkillId != ''">      and res.task_skill_id = #{taskSkillId}     </if>
-		<if test="taskSkillName != null and taskSkillName != ''">      and res.task_skill_name = #{taskSkillName}     </if>
-		<if test="skillRemarks != null and skillRemarks != ''">      and res.skill_remarks = #{skillRemarks}     </if>
+		<if test="skillId != null and skillId != ''">      and res.skill_id = #{skillId}     </if>
+		<if test="skillName != null and skillName != ''">      and res.skill_name = #{skillName}     </if>
+		<if test="categoryId != null and categoryId != ''">      and res.category_id = #{categoryId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
-		task_id = #{taskId},
-		task_skill_id = #{taskSkillId},
-		task_skill_name = #{taskSkillName},
-		skill_remarks = #{skillRemarks}
+		skill_name = #{skillName},
+		category_id = #{categoryId}
 	</sql>
 	<sql id="someFieldSet">
-		<if test="taskId != null and taskId != ''"> task_id = #{taskId},     </if>
-		<if test="taskSkillId != null and taskSkillId != ''"> task_skill_id = #{taskSkillId},     </if>
-		<if test="taskSkillName != null and taskSkillName != ''"> task_skill_name = #{taskSkillName},     </if>
-		<if test="skillRemarks != null and skillRemarks != ''"> skill_remarks = #{skillRemarks},     </if>
+		<if test="skillName != null and skillName != ''"> skill_name = #{skillName},     </if>
+		<if test="categoryId != null and categoryId != ''"> category_id = #{categoryId},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
-			task_id = #{item.taskId},
-			task_skill_id = #{item.taskSkillId},
-			task_skill_name = #{item.taskSkillName},
-			skill_remarks = #{item.skillRemarks}
+			skill_name = #{item.skillName},
+			category_id = #{item.categoryId}
 	</sql>
 </mapper>
\ No newline at end of file