洪水任务查询优化
parent
5a4d97234d
commit
30921ea429
|
|
@ -100,6 +100,12 @@ 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());
|
||||||
}
|
}
|
||||||
|
Page<ForecastTask> page = service.page(forecastTask.getPageSo().toPage(), wrapper);
|
||||||
|
if (page.getRecords().size() > 0) {
|
||||||
|
for (ForecastTask task : page.getRecords()) {
|
||||||
|
task.setUserName(task.getUserId().substring(task.getUserId().indexOf("_") + 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
return R.ok(service.page(forecastTask.getPageSo().toPage(), wrapper));
|
return R.ok(service.page(forecastTask.getPageSo().toPage(), wrapper));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ public class ForecastProject extends GenericPageParams implements Serializable {
|
||||||
*/
|
*/
|
||||||
@TableField(value="user_id")
|
@TableField(value="user_id")
|
||||||
@Schema(description="操作人id")
|
@Schema(description="操作人id")
|
||||||
private Long userId;
|
private String userId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 预见期(小时)
|
* 预见期(小时)
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,11 @@ public class ForecastTask extends GenericPageParams implements Serializable {
|
||||||
*/
|
*/
|
||||||
@TableField(value="user_id")
|
@TableField(value="user_id")
|
||||||
@Schema(description="操作人id")
|
@Schema(description="操作人id")
|
||||||
private Integer userId;
|
private String userId;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
@Schema(description="操作人姓名")
|
||||||
|
private String userName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 预见期(小时)
|
* 预见期(小时)
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ public class TaskGroupJob implements Job {
|
||||||
forecastProject.setProjectTm(nowTime);
|
forecastProject.setProjectTm(nowTime);
|
||||||
forecastProject.setStartTm(startTime);
|
forecastProject.setStartTm(startTime);
|
||||||
forecastProject.setEndTm(endTime);
|
forecastProject.setEndTm(endTime);
|
||||||
// forecastProject.setUserId();
|
forecastProject.setUserId("0000000000_系统");
|
||||||
forecastProject.setForecastPeriod(forecastPeriod);
|
forecastProject.setForecastPeriod(forecastPeriod);
|
||||||
forecastProject.setForecastWarm(forecastWarm);
|
forecastProject.setForecastWarm(forecastWarm);
|
||||||
forecastProject.setTimeInterval(forecastTask.getTimeInterval());
|
forecastProject.setTimeInterval(forecastTask.getTimeInterval());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue