Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
d504f3acc1
  1. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 5
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java
  3. 9
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

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

@ -1090,7 +1090,7 @@ public class XmTaskController {
BatchRelTasksWithMenu tasksWithMenu=new BatchRelTasksWithMenu(); BatchRelTasksWithMenu tasksWithMenu=new BatchRelTasksWithMenu();
tasksWithMenu.setMenuId(xmMenuDb.getMenuId()); tasksWithMenu.setMenuId(xmMenuDb.getMenuId());
tasksWithMenu.setTaskIds(allowTasks.stream().map(i->i.getId()).collect(Collectors.toList())); tasksWithMenu.setTaskIds(allowTasks.stream().map(i->i.getId()).collect(Collectors.toList()));
xmTaskService.batchRelTasksWithMenu(tasksWithMenu);
xmTaskService.batchRelTasksWithMenu(tasksWithMenu,xmMenuDb);
} }
msgs.add("成功将"+allowTasks.size()+"个任务与需求关联。"); msgs.add("成功将"+allowTasks.size()+"个任务与需求关联。");
for (XmTask t : allowTasks) { for (XmTask t : allowTasks) {

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

@ -391,10 +391,11 @@ public class XmTaskService extends BaseService {
/** /**
* 批量更新任务的需求为新的需求或者更新为空 * 批量更新任务的需求为新的需求或者更新为空
* @param xmTasks
* @param tasksWithMenu
*/ */
@Transactional @Transactional
public void batchRelTasksWithMenu(BatchRelTasksWithMenu tasksWithMenu) {
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",tasksWithMenu);
} }

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

@ -103,7 +103,14 @@
( #{item}) ( #{item})
</foreach> </foreach>
</update> </update>
<update id="batchRelTasksWithPhase" parameterType="HashMap">
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})
</foreach>
and res.ntype='0'
</update>
<!-- 插入流程审批表数据 --> <!-- 插入流程审批表数据 -->
<insert id="insertProcessApprova" <insert id="insertProcessApprova"

Loading…
Cancel
Save