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 51451496..21b9980f 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 @@ -67,7 +67,7 @@ public class XmTaskController { @Autowired private XmPushMsgService xmPushMsgService; - + @Autowired private XmProjectService xmProjectService; @Autowired XmProjectPhaseService xmProjectPhaseService; 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 6d909edc..903daedd 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 @@ -396,7 +396,7 @@ public class XmTaskService extends BaseService { @Transactional public void batchRelTasksWithMenu(BatchRelTasksWithMenu tasksWithMenu,XmMenu xmMenuDb) { Map map=map("menuId",tasksWithMenu.getMenuId(),"menuName",xmMenuDb.getMenuName(),"productId",xmMenuDb.getProductId(),"taskIds",tasksWithMenu.getTaskIds()); - super.update("batchRelTasksWithMenu",tasksWithMenu); + super.update("batchRelTasksWithMenu",map); } @Transactional diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml index edf4dcd4..6bf1bfdc 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml +++ b/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}) - 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) + + + and not + exists( select 1 from xm_task t where t.project_phase_id=res.id) diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 43dee5c2..675d390b 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -104,19 +104,19 @@ - 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 - ( #{item}) + #{item} and res.ntype='0' - update xm_task res set res.project_phase_id=${projectPhaseId} + update xm_task res set res.project_phase_id=#{projectPhaseId} where res.id in - ( #{item}) + #{item} and res.ntype='0'