优化我的任务查询

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/controller/ItdmTaskController.java

@@ -84,6 +84,9 @@ public class ItdmTaskController extends JeecgController<ItdmTask, IItdmTaskServi
 												 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 												 HttpServletRequest req) {
+		long startTime = System.currentTimeMillis();
+		// 在这里执行查询操作
+
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String realName = loginUser.getRealname(); // 登录人姓名
 
@@ -105,14 +108,26 @@ public class ItdmTaskController extends JeecgController<ItdmTask, IItdmTaskServi
 			}
 		}
 
-		QueryWrapper<ItdmTask> queryWrapper = QueryGenerator.initQueryWrapper(itdmTask, req.getParameterMap());
-		List<ItdmTask> pageList = itdmTaskService.list(queryWrapper);
-		List<ItdmTaskListVO> list = pageList.stream().map(i->{
-			ItdmWeituoInfo weituoInfo = weituoInfoService.getById(i.getWeituoId());
-			String weituoNo = weituoInfo.getWeituoNo();
-			String weituoClient = weituoInfo.getWeituoClient();
-			return ItdmTaskConvert.INSTANCE.convert(i,weituoNo,weituoClient);
-		}).collect(Collectors.toList());
+		List<ItdmTaskListVO> list = itdmTaskService.queryTaskList(itdmTask);
+
+//		QueryWrapper<ItdmTask> queryWrapper = QueryGenerator.initQueryWrapper(itdmTask, req.getParameterMap());
+//		List<ItdmTask> pageList = itdmTaskService.list(queryWrapper);
+//		List<ItdmTaskListVO> list = pageList.stream().map(i->{
+//			ItdmWeituoInfo weituoInfo = weituoInfoService.getById(i.getWeituoId());
+//			if(weituoInfo!=null){
+//				String weituoNo = weituoInfo.getWeituoNo();
+//				String weituoClient = weituoInfo.getWeituoClient();
+//				return ItdmTaskConvert.INSTANCE.convert(i,weituoNo,weituoClient);
+//			}else {
+//				return ItdmTaskConvert.INSTANCE.convert(i,"","");
+//			}
+//		}).collect(Collectors.toList());
+
+		long endTime = System.currentTimeMillis();
+		long timeElapsed = endTime - startTime;
+
+		System.out.println(itdmTask.getTaskStatus()+"=============================该查询get方法用时为：" + timeElapsed + " 毫秒=============================");
+
 		return Result.OK(list);
 	}
 //	public Result<IPage<ItdmTask>> queryPageList(ItdmTask itdmTask,

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/mapper/ItdmTaskMapper.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.itdmFirstPage.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
+import org.jeecg.modules.itdmFirstPage.vo.ItdmTaskListVO;
+
+import java.util.List;
 
 /**
  * @Description: 任务表
@@ -16,4 +19,7 @@ public interface ItdmTaskMapper extends BaseMapper<ItdmTask> {
     @Select("update itdm_task set task_status = 2 where weituo_id = #{weituoId}")
     public void updateByWeituoId(String weituoId);
 
+    /**查询对应的任务列表*/
+    public List<ItdmTaskListVO> queryTaskList(ItdmTask task);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/mapper/xml/ItdmTaskMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper">
 
-</mapper>
+    <select id="queryTaskList" parameterType="org.jeecg.modules.itdmFirstPage.entity.ItdmTask" resultType="org.jeecg.modules.itdmFirstPage.vo.ItdmTaskListVO">
+        select t.id ,t.task_content,t.task_status,t.task_role ,t.task_user,t.weituo_id,t.remark,
+        w.weituo_client, w.weituo_no
+        from itdm_task t
+        left join itdm_weituo_info w on t.weituo_id = w.id
+        <where>
+            <if test="taskUser != null and taskUser != ''"> task_user = #{taskUser}</if>
+            <if test="taskRole != null and taskRole != ''"> and task_role = #{taskRole}</if>
+            <if test="taskStatus != null and taskStatus != ''"> and task_status = #{taskStatus}</if>
+        </where>
+    </select>
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/service/IItdmTaskService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.itdmFirstPage.service;
 
 import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.itdmFirstPage.vo.ItdmTaskListVO;
+
+import java.util.List;
 
 /**
  * @Description: 任务表
@@ -17,4 +20,7 @@ public interface IItdmTaskService extends IService<ItdmTask> {
     /**先根据待办人员、角色、任务判断是否已存在该任务，不存在再新增*/
     public boolean insertTaskAfterJudge(ItdmTask task);
 
+    /**查询对应的任务列表*/
+    public List<ItdmTaskListVO> queryTaskList(ItdmTask task);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmFirstPage/service/impl/ItdmTaskServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import org.jeecg.modules.itdmFirstPage.entity.ItdmTask;
 import org.jeecg.modules.itdmFirstPage.mapper.ItdmTaskMapper;
 import org.jeecg.modules.itdmFirstPage.service.IItdmTaskService;
+import org.jeecg.modules.itdmFirstPage.vo.ItdmTaskListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,4 +46,10 @@ public class ItdmTaskServiceImpl extends ServiceImpl<ItdmTaskMapper, ItdmTask> i
             }else return false;
         }else return true;
     }
+
+    /**查询对应的任务列表*/
+    public List<ItdmTaskListVO> queryTaskList(ItdmTask task){
+        return taskMapper.queryTaskList(task);
+    }
+
 }