添加节点类型、标签等

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

@@ -168,6 +168,9 @@ public class XmMenuController {
 				xmMenu.setMmUsername(user.getUsername());
 			}
 			xmMenuService.insert(xmMenu);
+			if(StringUtils.hasText(xmMenu.getPmenuId())){
+				this.xmMenuService.updateMenuChildrenCntByMenuId(xmMenu.getPmenuId());
+			}
 			m.put("data",xmMenu);
 		}catch (BizException e) { 
 			tips=e.getTips();
@@ -205,6 +208,9 @@ public class XmMenuController {
 					tips.setFailureMsg("存在"+childCount+"个子故事关联该故事，不允许删除");
 				}else {
 					xmMenuService.deleteByPk(xmMenu);
+					if(StringUtils.hasText(xmMenu.getPmenuId())){
+						this.xmMenuService.updateMenuChildrenCntByMenuId(xmMenu.getPmenuId());
+					}
 				}
 			} 
 		}catch (BizException e) { 

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

@@ -229,7 +229,10 @@ public class XmProjectPhaseController {
 			excludePhaseIds.add(xmProjectPhase.getId());
 			Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds);
 			if(judgetTips.isOk()) { 
-				xmProjectPhaseService.insert(xmProjectPhase); 
+				xmProjectPhaseService.insert(xmProjectPhase);
+				if(StringUtils.hasText(xmProjectPhase.getParentPhaseId())){
+					this.xmProjectPhaseService.updatePhaseChildrenCntByPhaseId(xmProjectPhase.getParentPhaseId());
+				}
 				xmRecordService.addXmPhaseRecord(projectId, xmProjectPhase.getId(), "项目-阶段计划-新增计划", "新增阶段计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
 				m.put("data",xmProjectPhase);
 			}else {
@@ -282,6 +285,9 @@ public class XmProjectPhaseController {
 				}else {
 
 					xmProjectPhaseService.deleteByPk(xmProjectPhase);
+					if(StringUtils.hasText(xmProjectPhase.getParentPhaseId())){
+						this.xmProjectPhaseService.updatePhaseChildrenCntByPhaseId(xmProjectPhase.getParentPhaseId());
+					}
 					xmRecordService.addXmPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-阶段计划-删除计划", "删除阶段计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
 				}
 			}

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

@@ -261,6 +261,12 @@ public class XmTaskController {
 		Tips tips=new Tips("成功新增一条数据");
 		try{
 
+
+			if(!StringUtils.hasText(xmTaskVo.getNtype())){
+				tips.setFailureMsg("节点类型ntype不能为空");
+				m.put("tips", tips);
+				return m;
+			}
 			User user=LoginUtils.getCurrentUserInfo();
 			xmTaskVo.setCreateUserid(user.getUserid());
 			xmTaskVo.setCreateUsername(user.getUsername());
@@ -299,7 +305,10 @@ public class XmTaskController {
 			taskBudgetCost=taskBudgetCost.add(taskBudgetInnerUserAt).add(taskBudgetOutUserAt).add(taskBudgetNouserAt);   
 			Tips judgetTips=xmTaskService.judgetBudget(projectPhaseId, taskBudgetCost,taskBudgetInnerUserAt,taskBudgetOutUserAt,taskBudgetNouserAt,null);
 			if(judgetTips.isOk()) {
-				xmTaskVo = xmTaskService.addTask(xmTaskVo); 
+				xmTaskVo = xmTaskService.addTask(xmTaskVo);
+				if(StringUtils.hasText(xmTaskVo.getParentTaskid())){
+					xmTaskService.updateTaskChildrenCntByTaskId(xmTaskVo.getParentTaskid());
+				}
 			}else {
 				tips=judgetTips;
 			}
@@ -424,7 +433,13 @@ public class XmTaskController {
 				m.put("tips", tips);
 				return m;
 			}
+			if(StringUtils.hasText(xmTaskDb.getParentTaskid())){
+				xmTaskService.updateTaskChildrenCntByTaskId(xmTaskDb.getParentTaskid());
+			}
 			xmTaskService.deleteTask(xmTask);
+			if(StringUtils.hasText(xmTaskDb.getParentTaskid())){
+				xmTaskService.updateTaskChildrenCntByTaskId(xmTaskDb.getParentTaskid());
+			}
 		}catch (BizException e) {
 			tips=e.getTips();
 			logger.error("",e);

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

@@ -35,7 +35,11 @@ public class XmMenuService extends BaseService {
 		// TODO Auto-generated method stub
 		return this.selectList("selectListMapByWhereWithState", xmMenu);
 	}
-	
+
+
+	public void updateMenuChildrenCntByMenuId(String menuId){
+		super.update("updateMenuChildrenCntByMenuId",menuId);
+	}
 
 	@Transactional
 	public void batchInsertOrUpdate(List<XmMenuVo> xmMenus) {

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

@@ -145,6 +145,11 @@ public class XmProjectPhaseService extends BaseService {
 		Long i= this.selectOne("checkExistsTask", phaseId);
 		return i;
 	}
+
+
+	public void updatePhaseChildrenCntByPhaseId(String phaseId){
+		super.update("updatePhaseChildrenCntByPhaseId",phaseId);
+	}
 	
 	public Long checkExistsChildren(String phaseId) {
 		Long i= this.selectOne("checkExistsChildren", phaseId);

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

@@ -120,6 +120,11 @@ public class XmTaskService extends BaseService {
 		
 	}
 
+
+	public void updateTaskChildrenCntByTaskId(String taskId){
+		super.update("updateTaskChildrenCntByTaskId",taskId);
+	}
+
 	public List<Map<String,Object>> getTask(Map<String,Object> xmTask){  
 		List<Map<String,Object>> mapList = this.selectListMapByWhere(xmTask);//所有数据 
 		return mapList;

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

@@ -58,7 +58,13 @@
 		order by res.seq_no asc
 	</select>
 
-
+	<update id="updateMenuChildrenCntByMenuId" parameterType="String">
+		UPDATE xm_menu t
+		LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.pmenu_id AS menu_id FROM xm_menu tt WHERE tt.pmenu_id = #{menuId} ) t2 ON t2.menu_id = t.menu_id
+		SET t.children_cnt = ifnull( t2.children_cnt, 0 )
+		WHERE
+		t.menu_id = #{menuId}
+	</update>
 	<!--结束 自定义sql函数区域-->
 	
 

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

@@ -65,7 +65,13 @@
 		select count(1) from xm_project_phase res where res.parent_phase_id = #{id}
 	</select>
 
-
+	<update id="updatePhaseChildrenCntByPhaseId" parameterType="String">
+		UPDATE xm_project_phase t
+		LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_phase_id AS id FROM xm_project_phase tt WHERE tt.parent_phase_id = #{id} ) t2 ON t2.id = t.id
+		SET t.children_cnt = ifnull( t2.children_cnt, 0 )
+		WHERE
+		t.id = #{id}
+	</update>
 	<!--结束 自定义sql函数区域-->
 	
 

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

@@ -78,6 +78,15 @@
 		update  xm_task set menu_id = #{menuId}, menu_name = #{menuName},product_id=#{productId},product_name=#{productName} where id = #{id}
 	</update>
 
+	<update id="updateTaskChildrenCntByTaskId" parameterType="String">
+		UPDATE xm_task t
+		LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_taskid AS id FROM xm_task tt WHERE tt.parent_taskid = #{id} ) t2 ON t2.id = t.id
+		SET t.children_cnt = ifnull( t2.children_cnt, 0 )
+		WHERE
+		t.id = #{id}
+	</update>
+
+
 	<!-- 插入流程审批表数据 -->
 	<insert id="insertProcessApprova"
 			parameterType="HashMap"