2.0

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

@@ -117,7 +117,8 @@ public class XmWorkloadController {
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("linkBranchId",user.getBranchId());
-		List<Map<String,Object>>	datas = xmWorkloadService.listProjectWorkloadSetDay(params);	//列出XmWorkload列表
+		QueryWrapper<XmWorkload> qw = QueryTools.initQueryWrapper(XmWorkload.class , params);
+		List<Map<String,Object>>	datas = xmWorkloadService.listProjectWorkloadSetDay(page,qw,params);	//列出XmWorkload列表
 		return Result.ok().setData(datas);
 	}
 
@@ -133,7 +134,8 @@ public class XmWorkloadController {
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("linkBranchId",user.getBranchId());
-		List<Map<String,Object>>	datas = xmWorkloadService.listProjectWorkloadSetMonth(params);	//列出XmWorkload列表
+		QueryWrapper<XmWorkload> qw = QueryTools.initQueryWrapper(XmWorkload.class , params);
+		List<Map<String,Object>>	datas = xmWorkloadService.listProjectWorkloadSetMonth(page,qw,params);	//列出XmWorkload列表
 		return Result.ok().setData(datas);
 	}
 

xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.java

@@ -23,9 +23,9 @@ public interface XmWorkloadMapper extends BaseMapper<XmWorkload> {
      */
     List<Map<String,Object>> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
-    List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmWorkload);
+    List<Map<String, Object>> listProjectWorkloadSetDay(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
-    List<Map<String, Object>> listProjectWorkloadSetMonth(Map<String, Object> xmWorkload);
+    List<Map<String, Object>> listProjectWorkloadSetMonth(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map<String,Object> ext);
 
     List<Map<String, Object>> listTaskWorkloadBySbillIdGroupByUseridAndTaskId(String sbillId);
 

xm-core/src/main/java/com/xm/core/mapper/XmWorkloadMapper.xml

@@ -28,7 +28,7 @@
                 #{item}
             </foreach>
         </if>
-        <if test ="sstatuses != null and ext.sstatuses!=''">
+        <if test ="ext.sstatuses != null and ext.sstatuses!=''">
             AND res.sstatus IN
             <foreach collection="ext.sstatuses" item="item" index="index" open="(" separator="," close=")" >
                 #{item}
@@ -74,6 +74,7 @@
         count(distinct res.userid) as user_num
         from xm_workload res
         <where>
+            ${@com.mdp.Util@trimWhere(ew.customSqlSegment)}
             <include refid="whereForMap"/>
         </where>
         group by res.biz_date
@@ -94,6 +95,7 @@
         count(distinct res.userid) as user_num
         from xm_workload res
         <where>
+            ${@com.mdp.Util@trimWhere(ew.customSqlSegment)}
             <include refid="whereForMap"/>
         </where>
         group by biz_month
@@ -130,17 +132,17 @@
         group by res.project_id,res.task_id,res.userid
         ) as res on res.task_id = task.id
         <where>
-            <if test="projectId!=null and projectId!=''">
-                and task.project_id=#{projectId}
+            <if test="ext.projectId!=null and ext.projectId!=''">
+                and task.project_id=#{ext.projectId}
             </if>
-            <if test="taskId!=null and taskId!=''">
-                and task.id=#{taskId}
+            <if test="ext.taskId!=null and ext.taskId!=''">
+                and task.id=#{ext.taskId}
             </if>
-            <if test="userid!=null and userid!=''">
-                and res.userid=#{userid}
+            <if test="ext.userid!=null and ext.userid!=''">
+                and res.userid=#{ext.userid}
             </if>
-            <if test="branchId!=null and branchId!=''">
-                and task.cbranch_id=#{branchId}
+            <if test="ext.branchId!=null and ext.branchId!=''">
+                and task.cbranch_id=#{ext.branchId}
             </if>
         </where>
 

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

@@ -37,11 +37,11 @@ public class XmWorkloadService extends BaseService<XmWorkloadMapper, XmWorkload>
 		return baseMapper.selectListMapByWhere(page,ew,ext);
 	}
 
-	public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmWorkload) {
-		return baseMapper.listProjectWorkloadSetDay(xmWorkload);
+	public List<Map<String, Object>> listProjectWorkloadSetDay(IPage page, QueryWrapper ew, Map<String,Object> ext) {
+		return baseMapper.listProjectWorkloadSetDay(page,ew,ext);
 	}
-	public List<Map<String, Object>> listProjectWorkloadSetMonth(Map<String, Object> xmWorkload) {
-		return baseMapper.listProjectWorkloadSetMonth(xmWorkload);
+	public List<Map<String, Object>> listProjectWorkloadSetMonth(IPage page, QueryWrapper ew, Map<String,Object> ext) {
+		return baseMapper.listProjectWorkloadSetMonth(page,ew,ext);
 	}