From 276db1df74848994ecc488b24d78f8361c9da987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 23 Oct 2023 23:37:59 +0800
Subject: [PATCH] 2.0

---
 .../com/xm/core/ctrl/XmProductController.java |  6 +++--
 .../com/xm/core/mapper/XmIterationMapper.xml  |  1 -
 .../com/xm/core/mapper/XmProductMapper.java   |  2 +-
 .../com/xm/core/mapper/XmProductMapper.xml    | 22 +++++++++----------
 .../com/xm/core/mapper/XmWorkloadMapper.xml   |  3 ---
 .../com/xm/core/service/XmProductService.java |  5 ++---
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
index 315ddf5b..727a7c62 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
@@ -176,8 +176,10 @@ public class XmProductController {
 		}
 		params.put("platformBranchId",platformBranchId);
 		params.put("linkBranchId",user.getBranchId());
-		List<Map<String,Object>>	datas = xmProductService.selectListMapByWhereWithState(params);	//列出XmProduct列表
-		return Result.ok().setData(datas).setTotal(page.getTotal());
+
+		QueryWrapper<XmProduct> qw = QueryTools.initQueryWrapper(XmProduct.class , params);
+		List<Map<String,Object>> datas = xmProductService.selectListMapByWhereWithState(page,qw,params);
+ 		return Result.ok().setData(datas).setTotal(page.getTotal());
 	}
 
 	/***/
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml
index b3224525..43a43405 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml
@@ -20,7 +20,6 @@
         <if test=" createTimeEnd !=null "> and res.ctime &lt; #{createTimeEnd} </if>
         <if test=" onlineTimeStart !=null "> and res.online_time &gt; #{onlineTimeStart} </if>
         <if test=" onlineTimeEnd !=null "> and res.online_time &lt; #{onlineTimeEnd} </if>
-        <include refid="where"/>
         <if test=" ( menuId != null and menuId !='')">
             and exists ( select 1 from xm_menu im where  im.iteration_id=res.id and  im.menu_id=#{menuId}
             <if test="productId != null and productId !='' ">  and  im.product_id=#{productId}    </if>
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java
index 2378adc2..3dca14d2 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.java
@@ -23,6 +23,6 @@ public interface XmProductMapper extends BaseMapper<XmProduct> {
      */
     List<Map<String,Object>> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
-    List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> iterationMap);
+    List<Map<String, Object>> selectListMapByWhereWithState(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 }
 
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
index b642dd5b..f89500da 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
@@ -5,12 +5,12 @@
     <select id="selectListMapByWhere" resultType="HashMap">
         select * from xm_product res
         <if test="ext.linkProjectId !=null and ext.linkProjectId!=''">
-            inner join xm_product_project_link ppl on res.id=ppl.product_id and ext.ppl.project_id=#{ext.linkProjectId}
+            inner join xm_product_project_link ppl on res.id=ppl.product_id and ppl.project_id=#{ext.linkProjectId}
         </if>
         <where>
             ${@com.mdp.Util@trimWhere(ew.customSqlSegment)}
             <!--下面可以添加更多查询条件，正常的if 条件都是支持的-->
-
+            <include refid="whereForMap"></include>
         </where>
 
         <!--下面双引号内可以添加默认排序，如果前端没有上传排序，将使用引号内的排序规则-->
@@ -22,26 +22,26 @@
         </if>
     </select>
     <sql id="whereForMap"> 
-        <if test="ext.key != null and ext.key !='' ">   and ext.res.product_name like concat('%',#{ext.key} ,'%')   </if>
+        <if test="ext.key != null and ext.key !='' ">   and res.product_name like concat('%',#{ext.key} ,'%')   </if>
         <if test="ext.linkIterationId !=null and ext.linkIterationId!=''">
-            and ext.exists( select 1 from  xm_iteration  ppl where   ppl.product_id=res.id and ext.ppl.id=#{ext.linkIterationId} )
+            and exists( select 1 from  xm_iteration  ppl where   ppl.product_id=res.id and ppl.id=#{ext.linkIterationId} )
         </if>
         <if test="ext.compete !=null and ext.compete!=''">
-            and ext.( exists ( select 1 from xm_group_user gu inner join xm_product_project_link t on (gu.project_id=t.project_id or gu.product_id=t.product_id ) and ext.t.product_id=res.id where gu.userid=#{ext.compete} and ext.t.product_id=res.id )
+            and ( exists ( select 1 from xm_group_user gu inner join xm_product_project_link t on (gu.project_id=t.project_id or gu.product_id=t.product_id ) and t.product_id=res.id where gu.userid=#{ext.compete} and t.product_id=res.id )
             or res.pm_userid=#{ext.compete} or res.adm_userid=#{ext.compete} or res.ass_userid=#{ext.compete}
             )
         </if>
-        <if test="ext.ctimeStart!=null and ext.ctimeEnd!=null ">and ext.ctime between #{ext.ctimeStart} and ext.#{ext.ctimeEnd}</if>
+        <if test="ext.ctimeStart!=null and ext.ctimeEnd!=null ">and ctime between #{ext.ctimeStart} and #{ext.ctimeEnd}</if>
         <if test="ext.isTpl!=null and ext.isTpl=='1'">
-            and ext.(res.branch_id in( #{ext.platformBranchId},#{ext.linkBranchId}) and ext.res.is_tpl='1')
+            and (res.branch_id in( #{ext.platformBranchId},#{ext.linkBranchId}) and res.is_tpl='1')
         </if>
         <if test="ext.del==null or del==''">
-            and ext.res.del!="1"
+            and res.del!="1"
         </if>
         <if test="ext.linkBranchId!=null and ext.linkBranchId!=''">
-            and ext.( res.branch_id = #{ext.linkBranchId}
+            and ( res.branch_id = #{ext.linkBranchId}
             <if test="ext.isTpl!=null and ext.isTpl=='1'">
-                or (res.branch_id in( #{ext.platformBranchId},#{ext.linkBranchId}) and ext.res.is_tpl='1')
+                or (res.branch_id in( #{ext.platformBranchId},#{ext.linkBranchId}) and res.is_tpl='1')
             </if>
             )
 
@@ -51,7 +51,7 @@
     <select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
         select res.*,s.* from xm_product res left join xm_product_state s on res.id=s.product_id
         <if test="ext.linkProjectId !=null and ext.linkProjectId!=''">
-            inner join xm_product_project_link ppl on res.id=ppl.product_id and ext.ppl.project_id=#{ext.linkProjectId}
+            inner join xm_product_project_link ppl on res.id=ppl.product_id and ppl.project_id=#{ext.linkProjectId}
         </if>
         <where>
             <include refid="whereForMap"/> 
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.xml
index 5b1e3cce..69b4d0ad 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.xml
@@ -75,7 +75,6 @@
         from xm_workload res
         <where>
             <include refid="whereForMap"/>
-            <include refid="where"/>
         </where>
         group by res.biz_date
         order by res.biz_date asc
@@ -96,7 +95,6 @@
         from xm_workload res
         <where>
             <include refid="whereForMap"/>
-            <include refid="where"/>
         </where>
         group by biz_month
         order by biz_month asc
@@ -128,7 +126,6 @@
         from xm_workload res
         <where>
             <include refid="whereForMap"/>
-            <include refid="where"/>
         </where>
         group by res.project_id,res.task_id,res.userid
         ) as res on res.task_id = task.id
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 b861bc25..5ef161b8 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
@@ -88,11 +88,10 @@ public class XmProductService extends BaseService<XmProductMapper,XmProduct> {
 
 	/**
 	 * 连同产品关联的状态数据一起带出
-	 * @param iterationMap
 	 * @return
 	 */
-	public List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> iterationMap) {
-		return baseMapper.selectListMapByWhereWithState( iterationMap);
+	public List<Map<String, Object>> selectListMapByWhereWithState(IPage page, QueryWrapper ew, Map<String,Object> ext) {
+		return baseMapper.selectListMapByWhereWithState( page,ew,ext);
 	}
 
 	@Transactional