20220321修改分页查询任务接口

src/main/java/com/ccsens/ptccsens/persist/dao/ProTaskDetailDao.java

@@ -105,7 +105,7 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
      * @param roleId 角色id
      * @return 返回任务列表
      */
-    List<TallTaskVo.QueryTask> pageQueryRegularTask(@Param("roleId")Long roleId, @Param("timeNode")Long timeNode, @Param("timeUnit")int timeUnit, @Param("queryType")int queryType, @Param("taskId")Long taskId);
+    List<TallTaskVo.QueryTask> pageQueryRegularTask(@Param("roleId")Long roleId, @Param("timeNode")Long timeNode, @Param("timeUnit")int timeUnit, @Param("queryType")int queryType, @Param("taskId")Long taskId, @Param("triggerType")int triggerType);
 
     /**
      * 通过分解任务id查找任务关联的交付物插件id

src/main/java/com/ccsens/ptccsens/service/TallService.java

@@ -694,9 +694,8 @@ public class TallService implements ITallService {
         }
 
         //获取任务列表
-        Long taskId = param.getTriggerType() == 0 ? param.getTaskId() : null;
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
-        List<TallTaskVo.QueryTask> regularTask = taskDetailDao.pageQueryRegularTask(param.getRoleId(),queryTime,param.getTimeUnit(),param.getQueryType(),taskId);
+        List<TallTaskVo.QueryTask> regularTask = taskDetailDao.pageQueryRegularTask(param.getRoleId(),queryTime,param.getTimeUnit(),param.getQueryType(),param.getTaskId(),param.getTriggerType());
         PageInfo<TallTaskVo.QueryTask> queryTaskPageInfo = new PageInfo<>(regularTask);
         if(CollectionUtil.isNotEmpty(queryTaskPageInfo.getList())){
             if(param.getQueryType() == 0){

src/main/resources/mapper_dao/ProTaskDetailDao.xml

@@ -513,7 +513,8 @@
         tpi.width AS width,
         tpi.height AS height,
         tpi.`row` AS `row`,
-        tpi.col AS col
+        tpi.col AS col,
+        if(ts.id = #{taskId},0,1) as sort
         FROM
         t_pro_task_detail AS td
         LEFT JOIN t_pro_task_sub AS ts ON ts.task_detail_id = td.id
@@ -543,7 +544,7 @@
         <if test="queryType == 1">
             AND plan_start_time >= #{timeNode}
         </if>
-        <if test="taskId != null">
+        <if test="triggerType == 0">
             and ts.id != #{taskId}
         </if>
         ) AS alltask
@@ -558,10 +559,10 @@
         AND llbb.business_type = 0
         AND ll.`level` >= #{timeUnit}
         <if test="queryType == 0">
-            ORDER BY alltask.planStart DESC,id DESC
+            ORDER BY sort,alltask.planStart DESC,id DESC
         </if>
         <if test="queryType == 1">
-            ORDER BY alltask.planStart,id
+            ORDER BY sort,alltask.planStart,id
         </if>
     </select>
     <select id="getDeliverPluginIdBySubTaskId" resultType="java.lang.Long">