From dcaa3304d9091e6ce426cb37a79c7545be84a31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 3 Oct 2023 04:43:01 +0800
Subject: [PATCH] 2.0

---
 .../core/service/XmBranchStateHisService.java | 13 ++++-
 .../service/XmBranchTaskTypeStateService.java | 20 ++++++-
 .../xm/core/service/XmBudgetLaborService.java | 17 +++++-
 .../core/service/XmBudgetNlaborService.java   | 17 +++++-
 .../xm/core/service/XmCostNlaborService.java  | 17 +++++-
 .../com/xm/core/service/XmEnvListService.java | 14 ++++-
 .../com/xm/core/service/XmFuncService.java    | 14 ++++-
 .../service/XmIterationStateHisService.java   | 21 ++++++-
 .../core/service/XmIterationStateService.java | 23 ++++++--
 .../xm/core/service/XmMenuCommentService.java | 17 +++++-
 .../xm/core/service/XmMenuOperQxService.java  | 22 ++------
 .../xm/core/service/XmMenuPlanService.java    | 16 +++++-
 .../com/xm/core/service/XmMenuService.java    | 14 ++++-
 .../xm/core/service/XmMenuStateService.java   | 16 +++++-
 .../com/xm/core/service/XmMyFocusService.java | 14 ++++-
 .../service/XmProductProjectLinkService.java  | 16 +++++-
 .../com/xm/core/service/XmProductService.java | 14 ++++-
 .../service/XmProductStateHisService.java     | 21 ++++++-
 .../core/service/XmProductStateService.java   | 20 ++++++-
 .../service/XmProjectContractService.java     | 18 +++++-
 .../core/service/XmProjectKpiHisService.java  | 21 ++++++-
 .../xm/core/service/XmProjectKpiService.java  | 24 ++++++--
 .../com/xm/core/service/XmProjectService.java | 14 ++++-
 .../service/XmProjectStateHisService.java     | 21 ++++++-
 .../core/service/XmProjectStateService.java   | 22 ++++++--
 .../XmProjectTaskTypeStateService.java        | 20 ++++++-
 .../core/service/XmQuestionHandleService.java | 16 +++++-
 .../xm/core/service/XmQuestionService.java    | 14 ++++-
 .../xm/core/service/XmQuestionTagService.java | 17 ------
 .../com/xm/core/service/XmRecordService.java  | 18 +++++-
 .../xm/core/service/XmRecordVisitService.java | 55 -------------------
 .../xm/core/service/XmRptConfigService.java   | 25 ++++++---
 .../com/xm/core/service/XmRptDataService.java | 25 ++++++---
 .../core/service/XmTaskBidOrderService.java   | 15 ++++-
 .../xm/core/service/XmTaskEvalService.java    | 21 ++++++-
 .../core/service/XmTaskExecuserService.java   | 14 ++++-
 .../xm/core/service/XmTaskOrderService.java   | 15 ++++-
 .../service/XmTaskSbillDetailService.java     | 13 +++++
 .../xm/core/service/XmTaskSbillService.java   | 14 ++++-
 .../com/xm/core/service/XmTaskService.java    | 14 ++++-
 .../xm/core/service/XmTaskSkillService.java   | 16 +++++-
 .../xm/core/service/XmTestCaseService.java    | 16 +++++-
 .../xm/core/service/XmTestCasedbService.java  | 19 ++++++-
 .../core/service/XmTestPlanCaseService.java   | 16 +++++-
 .../xm/core/service/XmTestPlanService.java    | 21 ++++++-
 .../xm/core/service/XmWorkloadService.java    | 17 +++++-
 46 files changed, 664 insertions(+), 183 deletions(-)
 delete mode 100644 xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java
 delete mode 100644 xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java

diff --git a/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java
index 578f155c..13e278ec 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java
@@ -1,5 +1,7 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.mapper.XmBranchStateHisMapper;
@@ -17,7 +19,16 @@ import java.util.Map;
 @Service("xm.core.xmBranchStateHisService")
 public class XmBranchStateHisService extends BaseService<XmBranchStateHisMapper, XmBranchStateHis> {
 	static Logger logger =LoggerFactory.getLogger(XmBranchStateHisService.class);
-
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
     public List<Map<String, Object>> listXmBranchFiveDayTaskCnt(Map<String, Object> xmBranchStateHis) {
         return super.selectList("listXmBranchFiveDayTaskCnt",xmBranchStateHis);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java
index 44569b14..24adb34c 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java
@@ -1,16 +1,32 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmBranchTaskTypeState;
+import com.xm.core.mapper.XmBranchTaskTypeStateMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmBranchTaskTypeState 表 XM.xm_branch_task_type_state 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmBranchTaskTypeStateService")
-public class XmBranchTaskTypeStateService extends BaseService<XmBranchTaskTypeStateMapper,XmBranchTaskTypeState> {
-
+public class XmBranchTaskTypeStateService extends BaseService<XmBranchTaskTypeStateMapper, XmBranchTaskTypeState> {
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	public void loadProjectTaskTypeStateToXmBranchTaskTypeState(String branchId) {
 		this.update("loadProjectTaskTypeStateToXmBranchTaskTypeState", branchId);
 	}
diff --git a/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java b/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java
index 0a279c9e..9bef956e 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java
@@ -1,6 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmBudgetLabor;
+import com.xm.core.mapper.XmBudgetLaborMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -13,9 +17,18 @@ import java.util.Map;
  * 实体 XmBudgetLabor 表 xm_budget_labor 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmBudgetLaborService")
-public class XmBudgetLaborService extends BaseService<XmBudgetLaborMapper,XmBudgetLabor> {
+public class XmBudgetLaborService extends BaseService<XmBudgetLaborMapper, XmBudgetLabor> {
 	static Logger logger =LoggerFactory.getLogger(XmBudgetLaborService.class);
-
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
     public List<Map<String, Object>> listSum(Map<String, Object> xmBudgetLabor) {
         return super.selectList("listSum",xmBudgetLabor);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java b/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java
index 90d9b095..55303e59 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java
@@ -1,6 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmBudgetNlabor;
+import com.xm.core.mapper.XmBudgetNlaborMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -13,9 +17,18 @@ import java.util.Map;
  * 实体 XmBudgetNlabor 表 xm_budget_nlabor 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmBudgetNlaborService")
-public class XmBudgetNlaborService extends BaseService<XmBudgetNlaborMapper,XmBudgetNlabor> {
+public class XmBudgetNlaborService extends BaseService<XmBudgetNlaborMapper, XmBudgetNlabor> {
 	static Logger logger =LoggerFactory.getLogger(XmBudgetNlaborService.class);
-
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
     public List<Map<String, Object>> listSum(Map<String, Object> xmBudgetNlabor) {
 
         return super.selectList("listSum",xmBudgetNlabor);
diff --git a/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java b/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java
index 72795c1e..1dfb3eb8 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java
@@ -1,6 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmCostNlabor;
+import com.xm.core.mapper.XmCostNlaborMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -13,9 +17,18 @@ import java.util.Map;
  * 实体 XmCostNlabor 表 xm_cost_nlabor 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmCostNlaborService")
-public class XmCostNlaborService extends BaseService<XmCostNlaborMapper,XmCostNlabor> {
+public class XmCostNlaborService extends BaseService<XmCostNlaborMapper, XmCostNlabor> {
 	static Logger logger =LoggerFactory.getLogger(XmCostNlaborService.class);
-
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
     public List<Map<String, Object>> listSum(Map<String, Object> xmCostNlabor) {
         return super.selectList("listSum",xmCostNlabor);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java
index 9a3ab002..95d9e01e 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java
@@ -1,10 +1,13 @@
 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.mdp.core.service.BaseService;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmEnvList;
+import com.xm.core.mapper.XmEnvListMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -20,7 +23,16 @@ import java.util.Map;
  ***/
 @Service("xm.core.xmEnvListService")
 public class XmEnvListService extends BaseService<XmEnvListMapper,XmEnvList> {
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
     public void addEnv(XmEnvList xmEnvList) {
         xmEnvList.setId(this.createKey("id"));
         User user = LoginUtils.getCurrentUserInfo();
diff --git a/xm-core/src/main/java/com/xm/core/service/XmFuncService.java b/xm-core/src/main/java/com/xm/core/service/XmFuncService.java
index 681f4d1f..8da81f75 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmFuncService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmFuncService.java
@@ -1,8 +1,11 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmFunc;
+import com.xm.core.mapper.XmFuncMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -20,7 +23,16 @@ import java.util.stream.Collectors;
 public class XmFuncService extends BaseService<XmFuncMapper,XmFunc> {
 	static Logger logger =LoggerFactory.getLogger(XmFuncService.class);
 
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	public List<XmFunc> parentIdPathsCalcBeforeSave(List<XmFunc> nodes) {
 		List<XmFunc> noExistsList = nodes.stream().filter(i -> !nodes.stream().filter(k -> k.getId().equals(i.getPid())).findAny().isPresent()).collect(Collectors.toList());
diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java
index 03f0eb41..b1e4c5d5 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java
@@ -1,17 +1,34 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmIterationStateHis;
+import com.xm.core.mapper.XmIterationStateHisMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmIterationStateHis 表 xm_iteration_state_his 当前主键(包括多主键): iteration_id,biz_date; 
  ***/
 @Service("xm.core.xmIterationStateHisService")
-public class XmIterationStateHisService extends BaseService<XmIterationStateHisMapper,XmIterationStateHis> {
+public class XmIterationStateHisService extends BaseService<XmIterationStateHisMapper, XmIterationStateHis> {
 	static Logger logger =LoggerFactory.getLogger(XmIterationStateHisService.class);
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java
index b7e54706..44abff4f 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java
@@ -1,18 +1,33 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmIterationState;
+import com.xm.core.mapper.XmIterationStateMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmIterationState 表 XM.xm_iteration_state 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmIterationStateService")
-public class XmIterationStateService extends BaseService<XmIterationStateMapper,XmIterationState> {
-	
-	/** 请在此类添加自定义函数 */
-	
+public class XmIterationStateService extends BaseService<XmIterationStateMapper, XmIterationState> {
+
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	/**
 	 * 计算bug、task、测试案例、等数据
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java
index 766b58bc..bb569c40 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java
@@ -1,6 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmMenuComment;
+import com.xm.core.mapper.XmMenuCommentMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -14,9 +18,18 @@ import java.util.Map;
  * 实体 XmMenuComment 表 xm_menu_comment 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmMenuCommentService")
-public class XmMenuCommentService extends BaseService<XmMenuCommentMapper,XmMenuComment> {
+public class XmMenuCommentService extends BaseService<XmMenuCommentMapper, XmMenuComment> {
 	static Logger logger =LoggerFactory.getLogger(XmMenuCommentService.class);
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	public void showComment(String[] ids) {
 		this.update("showComment", ids);
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java
index ea34e705..3144b1be 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java
@@ -1,7 +1,8 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
-import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmProduct;
 import org.springframework.stereotype.Service;
@@ -9,6 +10,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
@@ -16,23 +18,7 @@ import java.util.List;
  * 实体 XmMenu 表 XM.xm_menu 当前主键(包括多主键): menu_id; 
  ***/
 @Service("xm.core.xmProductOperQxService")
-public class XmMenuOperQxService extends BaseService<XmMenuOperQxMapper,XmMenuOperQx> {
-
-
-	@Override
-	public String getNameSpace() {
-		return XmMenu.class.getName();
-	}
-
-	public Tips checkProductStatus(XmProduct xmProductDb) {
-		Tips tips=new Tips("成功");
-		if(xmProductDb==null){
-			tips.setFailureMsg("product-0","产品已不存在");
-		} else if("3".equals(xmProductDb.getPstatus())){
-			tips.setFailureMsg("pstatus-3","产品已经关闭，不能再操作");
-		}
-		return tips;
-	}
+public class XmMenuOperQxService {
 
 	/**
 	 * 检查某个人是否为产品级管理人员
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java
index 8faa46cc..9cebd480 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java
@@ -1,7 +1,8 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
-import com.mdp.core.service.BaseService;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmMenu;
@@ -17,8 +18,17 @@ import java.util.*;
  ***/
 @Service("xm.core.xmMenuPlanService")
 public class XmMenuPlanService extends BaseService<XmMenuPlanMapper,XmMenuPlan> {
-	
-	/** 请在此类添加自定义函数 */
+
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	
 	/**
 	 * 根据前端手动选择的功能列表及项目，批量插入到功能计划表中，如果有重复则忽略
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 a5223177..3ddeaef1 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
@@ -1,8 +1,11 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmMenu;
+import com.xm.core.mapper.XmMenuMapper;
 import com.xm.core.queue.XmMenuSumParentsPushService;
 import com.xm.core.vo.XmIterationMenuVo;
 import com.xm.core.vo.XmMenuVo;
@@ -28,7 +31,16 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
 
 	@Autowired
 	XmMenuSumParentsPushService pushService;
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	/**
 	 * 连同功能关联的项目需求计划数据一起带出
 	 *
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java
index 8fe32f50..a987e6ed 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java
@@ -1,5 +1,7 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.service.BaseService;
 import com.mdp.core.utils.DateUtils;
@@ -7,6 +9,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmMenuState;
+import com.xm.core.mapper.XmMenuStateMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -21,8 +24,17 @@ import java.util.stream.Collectors;
  ***/
 @Service("xm.core.xmMenuStateService")
 public class XmMenuStateService extends BaseService<XmMenuStateMapper,XmMenuState> {
-	
-	/** 请在此类添加自定义函数 */
+
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	
 	/**
 	 * 根据前端手动选择的功能列表及项目，批量插入到功能计划表中，如果有重复则忽略
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java
index 4231556f..2ca520af 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java
@@ -1,8 +1,11 @@
 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.mdp.core.service.BaseService;
 import com.xm.core.entity.XmMyFocus;
+import com.xm.core.mapper.XmMyFocusMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +21,16 @@ import java.util.Map;
 @Service("xm.core.xmMyFocusService")
 public class XmMyFocusService extends BaseService<XmMyFocusMapper,XmMyFocus> {
 
-	
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	@Autowired
 	XmRecordService xmRecordService;
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java b/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java
index 07a048e3..c0a5fe28 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java
@@ -1,12 +1,17 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmProductProjectLink;
+import com.xm.core.mapper.XmProductProjectLinkMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
@@ -15,7 +20,16 @@ import java.util.List;
 @Service("xm.core.xmProductProjectLinkService")
 public class XmProductProjectLinkService extends BaseService<XmProductProjectLinkMapper,XmProductProjectLink> {
 	static Logger logger =LoggerFactory.getLogger(XmProductProjectLinkService.class);
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	List<XmProductProjectLink> selectListByIterationId(String iterationId){
 		List<XmProductProjectLink> data=super.selectList("selectListByIterationId",iterationId);
 		return data;
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java
index ab9b340a..8464040a 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java
@@ -1,9 +1,12 @@
 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.mdp.core.service.BaseService;
 import com.mdp.safe.client.entity.User;
 import com.xm.core.entity.*;
+import com.xm.core.mapper.XmProductMapper;
 import com.xm.core.service.cache.XmProductCacheService;
 import com.xm.core.vo.XmProductAddVo;
 import org.springframework.beans.BeanUtils;
@@ -49,7 +52,16 @@ public class XmProductService extends BaseService<XmProductMapper,XmProduct> {
 
 	@Autowired
 	private XmTaskService xmTaskService;
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	/**
 	 * 产品不直接根项目关联，此函数作废了
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java
index 492ffef3..5dee9a1b 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java
@@ -1,17 +1,34 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmProductStateHis;
+import com.xm.core.mapper.XmProductStateHisMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmProductStateHis 表 xm_product_state_his 当前主键(包括多主键): product_id,biz_date; 
  ***/
 @Service("xm.core.xmProductStateHisService")
-public class XmProductStateHisService extends BaseService<XmProductStateHisMapper,XmProductStateHis> {
+public class XmProductStateHisService extends BaseService<XmProductStateHisMapper, XmProductStateHis> {
 	static Logger logger =LoggerFactory.getLogger(XmProductStateHisService.class);
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java
index be56956f..1462e9da 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java
@@ -1,16 +1,32 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmProductState;
+import com.xm.core.mapper.XmProductStateMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmProductState 表 XM.xm_product_state 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmProductStateService")
-public class XmProductStateService extends BaseService<XmProductStateMapper,XmProductState> {
-	
+public class XmProductStateService extends BaseService<XmProductStateMapper, XmProductState> {
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	/**
 	 * 计算bug、task、测试案例、等数据
 	 * @param productId
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
index 87940e96..5c155ebc 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java
@@ -1,7 +1,10 @@
 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.mdp.core.service.BaseService;
+import com.xm.core.entity.XmProjectContract;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -14,9 +17,18 @@ import java.util.Map;
  * 实体 XmProjectContract 表 XM.xm_project_contract 当前主键(包括多主键): ht_id; 
  ***/
 @Service("xm.core.xmProjectContractService")
-public class XmProjectContractService extends BaseService<XmProjectContractMapper,XmProjectContract> {
-    
-   
+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);
+	}
 	
 
 	/**
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java
index 46474b48..d51bc615 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java
@@ -1,17 +1,32 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmProjectKpiHis;
+import com.xm.core.mapper.XmProjectKpiHisMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
  * 实体 XmProjectKpiHis 表 XM.xm_project_kpi_his 当前主键(包括多主键): kpi_id; 
  ***/
 @Service("xm.core.xmProjectKpiHisService")
-public class XmProjectKpiHisService extends BaseService<XmProjectKpiHisMapper,XmProjectKpiHis> {
-	
-	/** 请在此类添加自定义函数 */
+public class XmProjectKpiHisService extends BaseService<XmProjectKpiHisMapper, XmProjectKpiHis> {
 
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java
index 7eb98dd0..4dfa6f44 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java
@@ -1,20 +1,32 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.xm.core.entity.XmProjectKpi;
+import com.xm.core.mapper.XmProjectKpiMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
  * 实体 XmProjectKpi 表 XM.xm_project_kpi 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmProjectKpiService")
-public class XmProjectKpiService extends BaseService<XmProjectKpiMapper,XmProjectKpi> {
-	
-	/** 请在此类添加自定义函数 */
+public class XmProjectKpiService extends BaseService<XmProjectKpiMapper, XmProjectKpi> {
 
-	@Autowired
-	XmRecordService xmRecordService;
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java
index 6c4a12b8..d120d522 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java
@@ -1,6 +1,8 @@
 package com.xm.core.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.service.BaseService;
@@ -10,6 +12,7 @@ import com.mdp.core.utils.DateUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.*;
+import com.xm.core.mapper.XmProjectMapper;
 import com.xm.core.service.cache.XmProjectCacheService;
 import com.xm.core.vo.XmProjectCopyVo;
 import com.xm.core.vo.XmProjectVo;
@@ -65,7 +68,16 @@ public class XmProjectService extends BaseService<XmProjectMapper,XmProject> {
 
 	@Autowired
 	XmProductService xmProductService;
-    
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
     
     public XmProject getProjectFromCache(String projectId) {
     	XmProject projectCahce=xmProjectCacheService.getProject(projectId);
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java
index 7941edd9..7703a99c 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java
@@ -1,17 +1,32 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmProjectStateHis;
+import com.xm.core.mapper.XmProjectStateHisMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
  * 实体 XmProjectStateHis 表 XM.xm_project_state_his 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmProjectStateHisService")
-public class XmProjectStateHisService extends BaseService<XmProjectStateHisMapper,XmProjectStateHis> {
-	
-	/** 请在此类添加自定义函数 */
+public class XmProjectStateHisService extends BaseService<XmProjectStateHisMapper, XmProjectStateHis> {
 
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java
index 336c5476..678238ff 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java
@@ -1,6 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmProjectState;
+import com.xm.core.mapper.XmProjectStateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,15 +17,23 @@ import java.util.Map;
  * 实体 XmProjectState 表 XM.xm_project_state 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmProjectStateService")
-public class XmProjectStateService extends BaseService<XmProjectStateMapper,XmProjectState> {
-	
-	/** 请在此类添加自定义函数 */
+public class XmProjectStateService extends BaseService<XmProjectStateMapper, XmProjectState> {
 	
 
+
 	@Autowired
 	XmRecordService xmRecordService;
-	
-	   
+
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	public int loadTasksToXmProjectState(String projectId) {
 		return this.update("loadTasksToXmProjectState", projectId);
 	}
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
index 2f721d67..31645ab5 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java
@@ -1,21 +1,35 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+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 class XmProjectTaskTypeStateService extends BaseService<XmProjectTaskTypeStateMapper, XmProjectTaskTypeState> {
 
 	public void loadTasksToXmProjectTaskTypeState(String projectId) {
 		this.update("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);
+	}
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java
index ad83501b..9cb02607 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java
@@ -1,11 +1,15 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmQuestionHandle;
+import com.xm.core.mapper.XmQuestionHandleMapper;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
@@ -20,7 +24,15 @@ public class XmQuestionHandleService extends BaseService<XmQuestionHandleMapper,
         super.batchInsert(handles);
     }
 
-    /** 请在此类添加自定义函数 */
-
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
index 949b4a0d..04ce179a 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
@@ -1,5 +1,7 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.service.BaseService;
@@ -8,6 +10,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmQuestion;
 import com.xm.core.entity.XmQuestionHandle;
+import com.xm.core.mapper.XmQuestionMapper;
 import com.xm.core.vo.XmQuestionVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +39,16 @@ public class XmQuestionService extends BaseService<XmQuestionMapper,XmQuestion>
 	@Autowired
 	XmRecordService xmRecordService;
 
-    
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
     public XmQuestionVo addQuestion( XmQuestionVo xmQuestionVo) {
         Tips tips = new Tips();
         if(StringUtils.isEmpty(xmQuestionVo.getId())) {
diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java
deleted file mode 100644
index 9fef79dd..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmQuestionTag 表 XM.xm_question_tag 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmQuestionTagService")
-public class XmQuestionTagService extends BaseService<XmQuestionTagMapper,XmQuestionTag> {
-	
-	/** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java
index 9a9e1653..f933cb61 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java
@@ -1,5 +1,7 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.safe.client.entity.User;
@@ -7,6 +9,7 @@ import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmRecord;
 import com.xm.core.entity.XmTask;
+import com.xm.core.mapper.XmRecordMapper;
 import org.slf4j.MDC;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -14,6 +17,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
@@ -22,9 +26,17 @@ import java.util.List;
  ***/
 @Service("xm.core.xmRecordService")
 public class XmRecordService extends BaseService<XmRecordMapper,XmRecord> {
-	
-	/** 请在此类添加自定义函数 */
-	
+
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	
 	public XmRecord initXmRecord( ) {
 		User user=LoginUtils.getCurrentUserInfo();
diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java
deleted file mode 100644
index fa75446b..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import com.xm.core.entity.XmRecordVisit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
- * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
- * 实体 XmRecordVisit 表 xm_record_visit 当前主键(包括多主键): id; 
- ***/
-@Service("xm.core.xmRecordVisitService")
-public class XmRecordVisitService extends BaseService<XmRecordVisitMapper,XmRecordVisit> {
-	static Logger logger =LoggerFactory.getLogger(XmRecordVisitService.class);
-
-	public void batchAddAndCalc(List<XmRecordVisit> datas) {
-		Map<String, Integer> timesMap=new HashMap<>();
-		Map<String,Set<String> > usersMap=new HashMap<>();
-		for (XmRecordVisit data : datas) {
-			String key=data.getBizId();
-			Set<String> users=usersMap.get(key);
-			if(users==null){
-				users=new HashSet<>();
-			}
-			users.add(data.getOperUserid());
-			usersMap.put(key,users);
-		}
-		for (XmRecordVisit data : datas) {
-			String key=data.getBizId();
-			Integer times=timesMap.get(key);
-			if(times==null){
-				times=0;
-			}
-			times=times+1;
-			timesMap.put(key,times);
-		}
-		List<Map<String,Object>> datasToUpdate=new ArrayList<>();
-		for (String key : timesMap.keySet()) {
-			Map<String,Object> data=new HashMap<>();
-			data.put("id",key);
-			data.put("browseTimes",timesMap.get(key));
-			data.put("browseUsers",usersMap.get(key).size());
-			datasToUpdate.add(data);
-		}
-		this.batchInsert(datas);
-		if(datasToUpdate.size()>0){
-			this.update("updateTaskBrowseTimesAndBrowseUsers",datasToUpdate);
-		}
-	}
-}
-
diff --git a/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java b/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java
index 2dd05b68..b75e2217 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java
@@ -1,16 +1,16 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmRptConfig;
+import com.xm.core.mapper.XmRptConfigMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Map;
 import org.springframework.stereotype.Service;
-import com.mdp.core.service.BaseService;
-import static com.mdp.core.utils.BaseUtils.*;
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
 
-import com.xm.core.entity.XmRptConfig;
+import java.util.List;
+import java.util.Map;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
@@ -19,6 +19,15 @@ import com.xm.core.entity.XmRptConfig;
 @Service("xm.core.xmRptConfigService")
 public class XmRptConfigService extends BaseService<XmRptConfigMapper,XmRptConfig> {
 	static Logger logger =LoggerFactory.getLogger(XmRptConfigService.class);
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java b/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java
index 993b1350..5d38e847 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java
@@ -1,16 +1,16 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmRptData;
+import com.xm.core.mapper.XmRptDataMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Map;
 import org.springframework.stereotype.Service;
-import com.mdp.core.service.BaseService;
-import static com.mdp.core.utils.BaseUtils.*;
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
 
-import com.xm.core.entity.XmRptData;
+import java.util.List;
+import java.util.Map;
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
@@ -19,6 +19,15 @@ import com.xm.core.entity.XmRptData;
 @Service("xm.core.xmRptDataService")
 public class XmRptDataService extends BaseService<XmRptDataMapper,XmRptData> {
 	static Logger logger =LoggerFactory.getLogger(XmRptDataService.class);
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java
index e5c98471..0b8065be 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java
@@ -1,11 +1,14 @@
 package com.xm.core.service;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.err.BizException;
 import com.mdp.core.service.BaseService;
 import com.mdp.msg.client.PushNotifyMsgService;
 import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskBidOrder;
+import com.xm.core.mapper.XmTaskBidOrderMapper;
 import com.xm.core.service.client.AcClient;
 import com.xm.core.vo.AddXmTaskBidOrderVo;
 import org.slf4j.Logger;
@@ -20,6 +23,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
@@ -49,7 +53,16 @@ public class XmTaskBidOrderService extends BaseService<XmTaskBidOrderMapper,XmTa
 
 	@Autowired
 	AcClient acClient;
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	@Transactional
 	public void orderPaySuccess(String orderId, String payId, String prepayId, String tranId, BigDecimal payAt, String remarks) {
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java
index 4f26e528..cb8b4b54 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java
@@ -1,20 +1,39 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.mdp.safe.client.entity.User;
 import com.xm.core.entity.MyTotalEval;
+import com.xm.core.entity.XmTaskEval;
+import com.xm.core.mapper.XmTaskEvalMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmTaskEval 表 xm_task_eval 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmTaskEvalService")
-public class XmTaskEvalService extends BaseService<XmTaskEvalMapper,XmTaskEval> {
+public class XmTaskEvalService extends BaseService<XmTaskEvalMapper, XmTaskEval> {
 	static Logger logger =LoggerFactory.getLogger(XmTaskEvalService.class);
 
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
+
     public MyTotalEval getServiceProviderEval(User user) {
         return super.selectOne("getServiceProviderEval",user);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
index 632c2305..a7ef966d 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
@@ -1,6 +1,8 @@
 package com.xm.core.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.err.BizException;
 import com.mdp.core.service.BaseService;
 import com.mdp.msg.client.PushNotifyMsgService;
@@ -8,6 +10,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskExecuser;
+import com.xm.core.mapper.XmTaskExecuserMapper;
 import com.xm.core.service.client.MkClient;
 import com.xm.core.service.push.XmPushMsgService;
 import com.xm.core.vo.XmGroupVo;
@@ -48,7 +51,16 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 
 	@Autowired
 	MkClient mkClient;
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	/**
 	 *
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java
index 28acdaa6..00b4d069 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java
@@ -1,10 +1,13 @@
 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.mdp.core.service.BaseService;
 import com.mdp.msg.client.PushNotifyMsgService;
 import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskOrder;
+import com.xm.core.mapper.XmTaskOrderMapper;
 import com.xm.core.service.client.AcClient;
 import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
@@ -19,6 +22,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -44,7 +48,16 @@ public class XmTaskOrderService extends BaseService<XmTaskOrderMapper,XmTaskOrde
 	@Autowired
 	AcClient acClient;
 
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	@Transactional
 	public void orderPaySuccess(String orderId, String payId, String prepayId, String tranId, BigDecimal payAt, String remarks) {
 		//更新订单状态
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java
index a339f587..ccd78ad9 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java
@@ -1,5 +1,7 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmTaskSbillDetail;
 import org.slf4j.Logger;
@@ -29,6 +31,17 @@ public class XmTaskSbillDetailService extends BaseService<XmTaskSbillDetailMappe
     @Autowired
     XmTaskSbillService  xmTaskSbillService;
 
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
+
     public List<XmTaskSbillDetail> selectListByUserTasks(Map<String,Object> userTasks) {
         return super.selectList("selectListByUserTasks",userTasks);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java
index e3cc573c..0bce1e43 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java
@@ -1,10 +1,13 @@
 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.mdp.core.service.BaseService;
 import com.mdp.core.utils.DateUtils;
 import com.xm.core.entity.XmTaskSbill;
 import com.xm.core.entity.XmTaskSbillDetail;
+import com.xm.core.mapper.XmTaskSbillMapper;
 import com.xm.core.service.client.MkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +37,16 @@ public class XmTaskSbillService extends BaseService<XmTaskSbillMapper,XmTaskSbil
 
 	@Autowired
 	MkClient mkClient;
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	@Transactional(rollbackFor = Exception.class)
 	public void deleteByPkAndReturnWorkload(XmTaskSbill xmTaskSbill){
 
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 1de77a35..889f4988 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
@@ -1,6 +1,8 @@
 package com.xm.core.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.service.BaseService;
@@ -11,6 +13,7 @@ import com.mdp.msg.client.PushNotifyMsgService;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.*;
+import com.xm.core.mapper.XmTaskMapper;
 import com.xm.core.queue.XmTaskSumParentsPushService;
 import com.xm.core.service.client.SysClient;
 import com.xm.core.vo.*;
@@ -61,7 +64,16 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
 
 	@Autowired
 	XmGroupService groupService;
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 	@Transactional
 	public   int[] doBatchDelete(List<XmTask> batchValues) {
 		int[] i2= super.batchDelete(batchValues);
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java
index 9e5b2c16..024b754a 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java
@@ -1,12 +1,17 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmTaskSkill;
+import com.xm.core.mapper.XmTaskSkillMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
@@ -18,7 +23,16 @@ public class XmTaskSkillService extends BaseService<XmTaskSkillMapper,XmTaskSkil
 
 	@Autowired
 	XmRecordService xmRecordService;
-	
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
 	/** 请在此类添加自定义函数 */
 	public void addSkill(List<XmTaskSkill> skillList) {
          super.batchInsert(skillList);
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java
index 11243e23..702f0017 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java
@@ -1,6 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmTestCase;
+import com.xm.core.mapper.XmTestCaseMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -12,7 +16,17 @@ import java.util.Map;
  * 实体 XmTestCase 表 XM.xm_test_case 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmTestCaseService")
-public class XmTestCaseService extends BaseService<XmTestCaseMapper,XmTestCase> {
+public class XmTestCaseService extends BaseService<XmTestCaseMapper, XmTestCase> {
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
     public List<Map<String, Object>> getXmTestCaseSort(Map<String, Object> xmTestCase) {
         return super.selectList("getXmTestCaseSort",xmTestCase);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java
index c7b11227..5c43df8e 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java
@@ -1,20 +1,35 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmTestCasedb;
+import com.xm.core.mapper.XmTestCasedbMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmTestCasedb 表 xm_test_casedb 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmTestCasedbService")
-public class XmTestCasedbService extends BaseService<XmTestCasedbMapper,XmTestCasedb> {
+public class XmTestCasedbService extends BaseService<XmTestCasedbMapper, XmTestCasedb> {
 	static Logger logger =LoggerFactory.getLogger(XmTestCasedbService.class);
-
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
     public List<String> getExistsPlanCasedbIds(List<String> casedbIds) {
         return super.selectList("getExistsPlanCasedbIds",casedbIds);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java
index 6e77cc00..dcc422c6 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java
@@ -1,7 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmTestPlanCase;
+import com.xm.core.mapper.XmTestPlanCaseMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -16,7 +19,18 @@ import java.util.Map;
  ***/
 @Service("xm.core.xmTestPlanCaseService")
 public class XmTestPlanCaseService extends BaseService<XmTestPlanCaseMapper,XmTestPlanCase> {
-	static Logger logger =LoggerFactory.getLogger(XmTestPlanCaseService.class);
+    static Logger logger =LoggerFactory.getLogger(XmTestPlanCaseService.class);
+
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
 
     public List<XmTestPlanCase> selectListByCaseIdsAndPlanId(String planId, List<String> caseIds) {
         return super.selectList("selectListByCaseIdsAndPlanId",map("planId",planId,"caseIds",caseIds));
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java b/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java
index b41b6514..11a8759f 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java
@@ -1,18 +1,35 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmTestPlan;
+import com.xm.core.mapper.XmTestPlanMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
  * 实体 XmTestPlan 表 xm_test_plan 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmTestPlanService")
-public class XmTestPlanService extends BaseService<XmTestPlanMapper,XmTestPlan> {
+public class XmTestPlanService extends BaseService<XmTestPlanMapper, XmTestPlan> {
 	static Logger logger =LoggerFactory.getLogger(XmTestPlanService.class);
-
+    /**
+     * 自定义查询，支持多表关联
+     * @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);
+    }
     public void calcXmTestPlan(String id) {
         super.update("calcXmTestPlan",id);
     }
diff --git a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java
index d272236d..e8c1a205 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java
@@ -1,6 +1,10 @@
 package com.xm.core.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmWorkload;
+import com.xm.core.mapper.XmWorkloadMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,13 +20,22 @@ import java.util.Map;
  * 实体 XmWorkload 表 xm_workload 当前主键(包括多主键): id; 
  ***/
 @Service("xm.core.xmWorkloadService")
-public class XmWorkloadService extends BaseService<XmWorkloadMapper,XmWorkload> {
+public class XmWorkloadService extends BaseService<XmWorkloadMapper, XmWorkload> {
 	static Logger logger =LoggerFactory.getLogger(XmWorkloadService.class);
 
 	@Autowired
 	XmTaskSbillService xmTaskSbillService;
 
-
+	/**
+	 * 自定义查询，支持多表关联
+	 * @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);
+	}
 
 	public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmWorkload) {
 		return super.selectList("listProjectWorkloadSetDay",xmWorkload);