Browse Source

分页查询bug修改

master
lijiuwei 8 months ago
parent
commit
54b36fda7a
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

+ 5
- 1
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java View File

@ -165,16 +165,20 @@ public class PatrolResultController extends BaseController {
@GetMapping({"/list"})
public TableDataInfo list(PatrolResult patrolResult) {
startPage();
String mainId = patrolResult.getMainId();
List<PatrolResult> list = new ArrayList<>();
if (StringUtils.isNotBlank(mainId)) {
List<Long> lineIds = patrolTaskResultMainService.selectLineIds(Long.parseLong(mainId));
startPage();
if (lineIds != null && lineIds.size() > 0) {
patrolResult.setMainIds(lineIds);
logger.info("----------------------list query params1: " + JSONObject.toJSONString(patrolResult));
list = patrolResultService.selectPatroByAllDevByMainIds(patrolResult);
logger.info("----------------------list query return size1: " + list.size());
} else {
logger.info("----------------------list query params2: " + JSONObject.toJSONString(patrolResult));
list = patrolResultService.selectPatroByAllDev(patrolResult);
logger.info("----------------------list query return size2 : " + list.size());
}
for (PatrolResult result : list) {
PatrolResultAux pra = new PatrolResultAux();


Loading…
Cancel
Save