yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

洪水任务查询优化

master
cxw 2024-10-25 14:30:01 +08:00
parent 30921ea429
commit 20372c8fed
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java
View File

@ -88,7 +88,15 @@ public class ForecastTaskController {
if(StringUtils.isNotBlank(forecastTask.getOrderField())){ if(StringUtils.isNotBlank(forecastTask.getOrderField())){
wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getOrderField()); wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getOrderField());
} }
return R.ok(service.list(wrapper)); List<ForecastTask> list = service.list(wrapper);
if (list.size() > 0) {
for (ForecastTask task : list) {
if (StringUtils.isNotEmpty(task.getUserId()) && task.getUserId().contains("_")) {
task.setUserName(task.getUserId().substring(task.getUserId().indexOf("_") + 1));
}
}
}
return R.ok(list);
} }
@Operation(summary = "分页") @Operation(summary = "分页")
@ -103,10 +111,12 @@ public class ForecastTaskController {
Page<ForecastTask> page = service.page(forecastTask.getPageSo().toPage(), wrapper); Page<ForecastTask> page = service.page(forecastTask.getPageSo().toPage(), wrapper);
if (page.getRecords().size() > 0) { if (page.getRecords().size() > 0) {
for (ForecastTask task : page.getRecords()) { for (ForecastTask task : page.getRecords()) {
task.setUserName(task.getUserId().substring(task.getUserId().indexOf("_") + 1)); if (StringUtils.isNotEmpty(task.getUserId()) && task.getUserId().contains("_")) {
task.setUserName(task.getUserId().substring(task.getUserId().indexOf("_") + 1));
}
} }
} }
return R.ok(service.page(forecastTask.getPageSo().toPage(), wrapper)); return R.ok(page);
} }
} }