添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -67,7 +67,7 @@ public class XmTaskController {
 	
 	@Autowired
 	private XmPushMsgService xmPushMsgService;
-
+	@Autowired
 	private XmProjectService xmProjectService;
 	@Autowired
 	XmProjectPhaseService xmProjectPhaseService;

xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@@ -396,7 +396,7 @@ public class XmTaskService extends BaseService {
 	@Transactional
 	public void batchRelTasksWithMenu(BatchRelTasksWithMenu tasksWithMenu,XmMenu xmMenuDb) {
 		Map<String,Object> map=map("menuId",tasksWithMenu.getMenuId(),"menuName",xmMenuDb.getMenuName(),"productId",xmMenuDb.getProductId(),"taskIds",tasksWithMenu.getTaskIds());
-		 super.update("batchRelTasksWithMenu",tasksWithMenu);
+		 super.update("batchRelTasksWithMenu",map);
 	}
 
 	@Transactional

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml

@@ -20,7 +20,11 @@
 			and exists( select 1 from xm_task t inner join xm_menu im on t.menu_id=im.menu_id where t.project_phase_id=res.id and im.iteration_id=#{iterationId})
 		</if>
 		<if test='productId!=null and productId!="" '>
-			and exists( select 1 from xm_task t where t.product_id=#{productId})
+			and exists( select 1 from xm_task t where t.product_id=#{productId} and t.project_phase_id=res.id)
+		</if>
+		<if test=" taskFilterType !=null and taskFilterType!=''">
+			and  <if test="taskFilterType=='not-join'"> not </if>
+			exists( select 1 from xm_task t where  t.project_phase_id=res.id)
 		</if>
 		<if test="key != null and key !='' ">       </if>
 		<if test="isTop!=null and isTop!=''">

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@@ -104,19 +104,19 @@
 		</foreach>
 	</update>
 	<update id="batchRelTasksWithMenu" parameterType="HashMap">
-		update xm_task res set res.menu_id=${menuId},res.menu_name =${menuName} res.product_id=#{productId}
+		update xm_task res set res.menu_id=#{menuId},res.menu_name =#{menuName}, res.product_id=#{productId}
 		where res.id in
 		<foreach collection="taskIds" item="item" index="index" open="(" separator="," close=")" >
-			( #{item})
+			#{item}
 		</foreach>
 		and res.ntype='0'
 	</update>
 
 	<update id="batchRelTasksWithPhase" parameterType="com.xm.core.vo.BatchRelTasksWithPhase">
-		update xm_task res set res.project_phase_id=${projectPhaseId}
+		update xm_task res set res.project_phase_id=#{projectPhaseId}
 		where res.id in
 		<foreach collection="taskIds" item="item" index="index" open="(" separator="," close=")" >
-			( #{item})
+			#{item}
 		</foreach>
 		and res.ntype='0'
 	</update>