|
|
|
@ -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(); |
|
|
|
|