cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 修正分页获取任务列表所有任务时参数异常问题
This commit is contained in:
HuangXin 2020-10-12 11:07:30 +08:00
parent 6ea13baa86
commit 37393c35ca
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java
View File

@ -4,7 +4,6 @@ import com.dispose.common.DisposeCapacityType;
import com.dispose.common.DisposeTaskStatus; import com.dispose.common.DisposeTaskStatus;
import com.dispose.common.ErrorCode; import com.dispose.common.ErrorCode;
import com.dispose.manager.DisposeTaskManager; import com.dispose.manager.DisposeTaskManager;
import com.dispose.mapper.DeviceTaskMapper;
import com.dispose.mapper.DisposeTaskMapper; import com.dispose.mapper.DisposeTaskMapper;
import com.dispose.pojo.entity.DisposeTask; import com.dispose.pojo.entity.DisposeTask;
import com.dispose.pojo.po.MulReturnType; import com.dispose.pojo.po.MulReturnType;
@ -31,12 +30,6 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
@Resource @Resource
private DisposeTaskMapper disposeTaskMapper; private DisposeTaskMapper disposeTaskMapper;
/**
* The Device task mapper.
*/
@Resource
private DeviceTaskMapper deviceTaskMapper;
/** /**
* Gets dispose task. * Gets dispose task.
* *
@ -130,6 +123,7 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
public MulReturnType<PageInfo<DisposeTask>, List<DisposeTask>> getPagesOfTask(List<Long> taskId, public MulReturnType<PageInfo<DisposeTask>, List<DisposeTask>> getPagesOfTask(List<Long> taskId,
Integer startPage, Integer startPage,
Integer pageSize) { Integer pageSize) {
PageInfo<DisposeTask> pageInfo;
List<DisposeTask> taskList = new ArrayList<>(); List<DisposeTask> taskList = new ArrayList<>();
// 设置分页信息 // 设置分页信息
@ -137,13 +131,15 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager {
if(taskId.size() > 0) { if(taskId.size() > 0) {
taskList.addAll(disposeTaskMapper.selectByIdSet(taskId)); taskList.addAll(disposeTaskMapper.selectByIdSet(taskId));
pageInfo = new PageInfo<>(taskList);
} else { } else {
taskList.addAll(disposeTaskMapper.selectPageAll()); List<DisposeTask> preList = disposeTaskMapper.selectPageAll();
pageInfo = new PageInfo<>(preList);
preList.forEach(k -> taskId.add(k.getId()));
taskList.addAll(disposeTaskMapper.selectByIdSet(taskId));
} }
PageInfo<DisposeTask> pageInfo = new PageInfo<>(taskList);
return new MulReturnType<>(pageInfo, taskList); return new MulReturnType<>(pageInfo, taskList);
} }
} }

2
src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java
View File

@ -46,7 +46,7 @@ public class P2TaskList {
Assert.assertEquals((long) v.getCode(), e.getHttpCode()); Assert.assertEquals((long) v.getCode(), e.getHttpCode());
//Assert.assertEquals((long) v.getMsgContent().getStatus(), e.getCode()); //Assert.assertEquals((long) v.getMsgContent().getStatus(), e.getCode());
Assert.assertEquals((long) v.getMsgContent().getCurPageNumber(), 1); Assert.assertEquals((long) v.getMsgContent().getCurPageNumber(), 2);
Assert.assertEquals((long)v.getMsgContent().getPageSize(), 20); Assert.assertEquals((long)v.getMsgContent().getPageSize(), 20);
Assert.assertNotNull(v.getMsgContent().getItems()); Assert.assertNotNull(v.getMsgContent().getItems());