diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
index 460c3661..6bc12118 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
@@ -1,12 +1,9 @@
 package com.xm.core.ctrl;
 
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.core.entity.Result;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.entity.XmGroupState;
-import com.xm.core.service.XmGroupStateService;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -14,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java
index b8f8f4a9..bbabdfef 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java
@@ -6,7 +6,6 @@ import com.mdp.core.entity.Result;
 import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.RequestUtils;
 import com.xm.core.entity.XmProjectContract;
-import com.xm.core.service.XmProjectContractService;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java
index 0c477886..fd184d7e 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java
@@ -6,7 +6,6 @@ import com.mdp.core.entity.Result;
 import com.mdp.core.query.QueryTools;
 import com.mdp.core.utils.RequestUtils;
 import com.xm.core.entity.XmProjectTaskTypeState;
-import com.xm.core.service.XmProjectTaskTypeStateService;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java
index 620234fa..fa9d3878 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xm.core.entity.XmMenu;
+import com.xm.core.vo.XmIterationMenuVo;
+import com.xm.core.vo.XmPhaseMenusVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -38,5 +40,37 @@ public interface XmMenuMapper extends BaseMapper<XmMenu> {
     List<Map<String, Object>> queryTaskUsersByMenuId(String menuId);
 
     List<XmMenu> selectExistIterationMenus(Map<String, Object> menuIds);
+
+    void doBatchDeleteByProductIds(List<String> productIds);
+
+    void batchUnIteration(XmIterationMenuVo xmIterationMenus);
+
+    void batchIteration(XmIterationMenuVo xmIterationMenus);
+
+    void batchUnProductPhase(XmPhaseMenusVo xmPhaseMenusVo);
+
+    void batchProductPhase(XmPhaseMenusVo xmPhaseMenusVo);
+
+    List<XmMenu> listTenMenuByProductIdAndIterationId(Map<String, Object> map);
+
+    void batchChangeParent(Map<String, Object> map);
+
+    List<XmMenu> selectListByIdsWithsChildrenCnt(List<String> ids);
+
+    void sumParents(List<String> pidPathsList);
+
+    void batchSumParents(List<String> ids);
+
+    List<Map<String, Object>> getXmMenuAttDist(Map<String, Object> xmMenu);
+
+    List<Map<String, Object>> getXmMenuAgeDist(Map<String, Object> xmMenu);
+
+    List<Map<String, Object>> getXmMenuSort(Map<String, Object> xmMenu);
+
+    void updateUps(List<String> menuIds);
+
+    void updateComments(List<String> menuIds);
+
+    void upReads(Map<String, Object> map);
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java
deleted file mode 100644
index 7ed59934..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmProjectGroupState 表 XM.xm_group_state 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmGroupStateService")
-public class XmGroupStateService extends BaseService<XmGroupStateMapper,XmGroupState> {
-	
-	/**
-	 * 计算bug、task、测试案例、等数据
-	 * @param projectId
-	 * @return
-	 */
-	public int loadTasksToXmProjectGroupState(String projectId) {
-		 
-		return baseMapper.loadTasksToXmProjectGroupState( projectId);
-	}
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
deleted file mode 100644
index c2d65695..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import com.xm.core.entity.XmGroupUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectGroupUser 表 XM.xm_group_user 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmGroupUserService")
-public class XmGroupUserService extends BaseService<XmGroupUserMapper,XmGroupUser> {
-
-
-	@Autowired
-	XmRecordService xmRecordService;
-	
-	public List<XmGroupUser> selectGroupUserListByProjectId(String projectId) {
-		return baseMapper.selectGroupUserListByProjectId( projectId); 
-	}
-
-	public List<XmGroupUser> selectGroupUserListByProductId(String productId) {
-		return baseMapper.selectGroupUserListByProductId( productId);
-	}
-
-
-	public void doBatchDelete(List<XmGroupUser> canDelUsers) {
-		super.batchDelete(canDelUsers);
-	}
-
-	/** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java
index c0ae0905..95a44517 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java
@@ -94,12 +94,13 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
 		List<XmMenu> xmMenuList = new ArrayList<>();
 		if (addList.size() > 0) {
 			xmMenuList.addAll(addList.stream().map(i -> (XmMenu) i).collect(Collectors.toList()));
-			this.batchInsert(addList);
+			this.saveBatch(xmMenuList);
 			this.xmMenuStateService.batchLoadXmMenuToState(xmMenus.get(0).getProductId());
 		}
 		if (editList.size() > 0) {
-			xmMenuList.addAll(editList.stream().map(i -> (XmMenu) i).collect(Collectors.toList()));
-			this.batchUpdate(editList);
+			List<XmMenu> updateList = editList.stream().map(i -> (XmMenu) i).collect(Collectors.toList());
+			xmMenuList.addAll(updateList);
+			this.updateBatchById(updateList);
 		}
 		if (xmMenuList.size() > 0) {
 			pushService.pushXmMenus(xmMenuList);
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java
deleted file mode 100644
index b32156d6..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.xm.core.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.mdp.core.err.BizException;
-import com.xm.core.entity.XmProjectContract;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmProjectContract 表 XM.xm_project_contract 当前主键(包括多主键): ht_id; 
- ***/
-@Service("xm.core.xmProjectContractService")
-public class XmProjectContractService extends BaseService<XmProjectContractMapper, XmProjectContract> {
-
-	/**
-	 * 自定义查询，支持多表关联
-	 * @param page 分页条件
-	 * @param ew 一定要，并且必须加@Param("ew")注解
-	 * @param ext 如果xml中需要根据某些值进行特殊处理，可以通过这个进行传递，非必须，注解也可以不加
-	 * @return
-	 */
-	public List<Map<String,Object>> selectListMapByWhere(IPage page, QueryWrapper ew, Map<String,Object> ext){
-		return baseMapper.selectListMapByWhere(page,ew,ext);
-	}
-	
-
-	/**
-	 * 流程审批过程中回调该接口，更新业务数据
-	 * 如果发起流程时上送了restUrl，则无论流程中是否配置了监听器都会在流程发生以下事件时推送数据过来
-	 * eventName: PROCESS_STARTED 流程启动完成 全局
-	 *            PROCESS_COMPLETED 流程正常结束 全局
-	 *            PROCESS_CANCELLED 流程删除 全局
-	 *            create 人工任务启动
-	 *            complete 人工任务完成  
-	 *            assignment 人工任务分配给了具体的人
-	 *            delete 人工任务被删除
-	 *            TASK_COMPLETED_FORM_DATA_UPDATE 人工任务提交完成后，智能表单数据更新
-	 *            
-	 * 其中 create/complete/assignment/delete事件是需要在模型中人工节点上配置了委托代理表达式 ${taskBizCallListener}才会推送过来。
-	 * 在人工任务节点上配置 任务监听器  建议事件为 complete,其它assignment/create/complete/delete也可以，一般建议在complete,委托代理表达式 ${taskBizCallListener}
-	 * 
-	 * @param flowVars {flowBranchId,agree,procInstId,startUserid,assignee,actId,taskName,mainTitle,branchId,bizKey,commentMsg,eventName,modelKey} 等 
-	 * @return 如果tips.isOk==false，将影响流程提交
-	 **/
-	public void processApprova(Map<String, Object> flowVars) { 
-		String eventName=(String) flowVars.get("eventName"); 
-		String agree=(String) flowVars.get("agree"); 
-		String branchId=(String) flowVars.get("branchId"); 
-		String empVacationId=(String) flowVars.get("empVacationId");  
-		String bizKey=(String) flowVars.get("bizKey");
-		if("employee_vacation_info_approva".equals(bizKey) ) { 
-		}else {
-			throw new BizException("不支持的业务,请上送业务编码【bizKey】参数");
-		}
-		if("complete".equals(eventName)) { 
-			if("1".equals(agree)) {
-				this.updateFlowStateByProcInst("", flowVars);
-			}else {
-				this.updateFlowStateByProcInst("", flowVars);
-			}
-		}else {
-			if("PROCESS_STARTED".equals(eventName)) {   
-				Map<String,Object> bizQuery=new HashMap<>(); 
-				bizQuery.put("empVacationId", empVacationId);
-				if(StringUtils.isEmpty(empVacationId)) {
-					throw new BizException("请上送empVacationId");
-				}
-				if(StringUtils.isEmpty(branchId)) {
-					throw new BizException("请上送branchId");
-				} 
-				List<Map<String,Object>> bizList=this.selectListMapByWhere(bizQuery);
-				if(bizList==null || bizList.size()==0) {
-					throw new BizException("没有找到对应请假单,请假单为【"+empVacationId+"】");
-				}else {
-					Map<String,Object> bizObject=bizList.get(0);
-					if("1".equals(bizObject.get("bizFlowState"))) {
-						throw new BizException("该请假单正在审批中，不能再发起审批");
-					}
-				}
-				flowVars.put("id", this.createKey("id"));
-					this.baseMapper.insertProcessApprova( flowVars);   
-					this.updateFlowStateByProcInst("1", flowVars);
-			}else if("PROCESS_COMPLETED".equals(eventName)) {
-				if("1".equals(agree)) { 
-					this.updateFlowStateByProcInst("2", flowVars); 
-					
-				}else { 
-					this.updateFlowStateByProcInst("3", flowVars);
-				} 
-			}else if("PROCESS_CANCELLED".equals(eventName)) { 
-				this.updateFlowStateByProcInst("4", flowVars);
-			}
-		} 
-	}
-	
-	private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) {
-		baseMapper.updateFlowStateByProcInstForDeleteSuccess( flowVars);
-		
-	}
-
-	public void updateFlowStateByProcInst(String flowState,Map<String, Object> flowVars) {
-		flowVars.put("flowState", flowState);
-		flowVars.put("bizFlowState", flowState);
-		if("1".equals(flowState)) {
-			flowVars.put("bizProcInstId", flowVars.get("procInstId"));
-		}
-		baseMapper.updateProcessApprova( flowVars);
-	}
-    
-	/** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java
deleted file mode 100644
index 408b0507..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.xm.core.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.xm.core.entity.XmProjectTaskTypeState;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmProjectTaskTypeState 表 XM.xm_project_task_type_state 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmProjectTaskTypeStateService")
-public class XmProjectTaskTypeStateService extends BaseService<XmProjectTaskTypeStateMapper, XmProjectTaskTypeState> {
-
-	public void loadTasksToXmProjectTaskTypeState(String projectId) {
-		baseMapper.loadTasksToXmProjectTaskTypeState( projectId);
-	}
-
-	/**
-	 * 自定义查询，支持多表关联
-	 * @param page 分页条件
-	 * @param ew 一定要，并且必须加@Param("ew")注解
-	 * @param ext 如果xml中需要根据某些值进行特殊处理，可以通过这个进行传递，非必须，注解也可以不加
-	 * @return
-	 */
-	public List<Map<String,Object>> selectListMapByWhere(IPage page, QueryWrapper ew, Map<String,Object> ext){
-		return baseMapper.selectListMapByWhere(page,ew,ext);
-	}
-}
-