添加节点类型、标签等

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

@@ -184,54 +184,7 @@ public class XmMenuController {
 	}
 	@RequestMapping(value="/listWithPlan",method=RequestMethod.GET)
 	public Map<String,Object> listWithPlan( @RequestParam Map<String,Object> xmMenu){
-		Map<String,Object> m = new HashMap<>();
-		RequestUtils.transformArray(xmMenu, "menuIds");
-		RequestUtils.transformArray(xmMenu, "tagIdList");
-		PageUtils.startPage(xmMenu);
-		Tips tips=new Tips("查询成功");
-		String menuId= (String) xmMenu.get("menuId");
-		Object menuIds=  xmMenu.get("menuIds");
-		String projectId= (String) xmMenu.get("projectId");
-		String mmUserid= (String) xmMenu.get("mmUserid");
-		String pmenuId= (String) xmMenu.get("pmenuId");
-		String productId= (String) xmMenu.get("productId");
-		String excludeIterationId= (String) xmMenu.get("excludeIterationId");
-
-		User user = LoginUtils.getCurrentUserInfo();
-
-		xmMenu.put("userid",user.getUserid());
-		if( !StringUtils.hasText(menuId) && !(StringUtils.hasText(projectId) || StringUtils.hasText(mmUserid)|| StringUtils.hasText(pmenuId)||menuIds!=null
-				|| StringUtils.hasText(productId) || StringUtils.hasText(excludeIterationId)  ) ){
-			xmMenu.put("compete",user.getUserid());
-		}
-		List<Map<String,Object>>	xmMenuList = xmMenuService.selectListMapByWhereWithPlan(xmMenu);	//列出XmMenu列表
-		PageUtils.responePage(m, xmMenuList);
-		if("1".equals(xmMenu.get("withParents"))  && !"1".equals(xmMenu.get("isTop"))&& xmMenuList.size()>0){
-			Set<String> pidPathsSet=new HashSet<>();
-			Set<String> idSet=new HashSet<>();
-			for (Map<String, Object> map : xmMenuList) {
-				String id= (String) map.get("menuId");
-				idSet.add(id);
-				String pidPaths= (String) map.get("pidPaths");
-				pidPaths=PubTool.getPidPaths(pidPaths,id);
-				if(pidPaths==null || pidPaths.length()<=2){
-					continue;
-				}
-				pidPathsSet.add(pidPaths);
-			}
-			if(pidPathsSet!=null && pidPathsSet.size()>0){
-				List<Map<String,Object>> parentList=xmMenuService.selectListMapByWhereWithPlan(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
-				parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList());
-				if(parentList!=null && parentList.size()>0){
-					xmMenuList.addAll(parentList);
-					m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
-				}
-			}
-		}
-
-		m.put("data",xmMenuList);
-		m.put("tips", tips);
-		return m;
+		return this.listWithState(xmMenu);
 	}
 
 

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

@@ -734,12 +734,12 @@ public class XmProductPhaseController {
 		m.put("tips", tips);
 		return m;
 	}
-	@ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loadTasksToXmProjectPhase")
+	@ApiOperation( value = "计算bug、task、测试案例、等数据",notes="loaMenusToXmProductPhase")
 	@ApiResponses({
 			@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
 	})
 	@HasQx(value = "xm_core_xmProjectPhase_loadTasksToXmProjectPhase",name = "计算各个计划对应的bug、task、测试案例等数据",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
-	@RequestMapping(value="/loadTasksToXmProjectPhase",method=RequestMethod.POST)
+	@RequestMapping(value="/loaMenusToXmProductPhase",method=RequestMethod.POST)
 	public Map<String,Object> loadTasksToXmProjectPhase(@RequestBody Map<String,Object> params) {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功修改数据");
@@ -760,7 +760,7 @@ public class XmProductPhaseController {
 				m.put("tips", tips);
 				return m;
 			}
-			int i= xmProjectPhaseService.loadTasksToXmProjectPhase(xmProduct.getId());
+			int i= xmProjectPhaseService.loaMenusToXmProductPhase(xmProduct.getId());
 			xmRecordService.addProductPhaseRecord(xmProduct.getId(), "", "产品-计划-汇总统计", "计算项目计划进度","",null);
 
 

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

@@ -10,6 +10,7 @@ import com.xm.core.entity.XmProjectPhase;
 import com.xm.core.entity.XmTask;
 import com.xm.core.vo.XmProjectGroupVo;
 import com.xm.core.vo.XmProjectPhaseVo;
+import org.apache.poi.sl.usermodel.FreeformShape;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -584,5 +585,8 @@ public class XmProjectPhaseService extends BaseService {
 		return tips;
 	}
 
+	public int loaMenusToXmProductPhase(String productId) {
+		return super.update("loaMenusToXmProductPhase",productId);
+	}
 }
 

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

@@ -116,6 +116,11 @@
 	<update id="loadTasksToXmProjectPhase" parameterType="String" statementType="CALLABLE">
 		{call load_tasks_to_xm_project_phase(#{projectId,mode=IN})}
 	</update>
+
+	<update id="loaMenusToXmProductPhase" parameterType="String" statementType="CALLABLE">
+		{call loaMenusToXmProductPhase(#{productId,mode=IN})}
+	</update>
+
 	<select id="checkExistsTask" parameterType="String" resultType="Long">
 		select count(1) from xm_task t where t.project_phase_id=#{phaseId}
 	</select>