diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java index 7b5ed1c..b52fdef 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastTaskController.java @@ -100,6 +100,12 @@ public class ForecastTaskController { if(StringUtils.isNotBlank(forecastTask.getOrderField())){ wrapper.orderBy(true, ObjectUtils.isEmpty(forecastTask.getIsAsc()) ? false : forecastTask.getIsAsc(), forecastTask.getOrderField()); } + Page 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)); } diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java b/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java index 94c9749..03e3c9c 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java +++ b/src/main/java/com/gunshi/project/xyt/model/ForecastProject.java @@ -97,7 +97,7 @@ public class ForecastProject extends GenericPageParams implements Serializable { */ @TableField(value="user_id") @Schema(description="操作人id") - private Long userId; + private String userId; /** * 预见期(小时) diff --git a/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java b/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java index a462fe3..1eca9a2 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java +++ b/src/main/java/com/gunshi/project/xyt/model/ForecastTask.java @@ -56,7 +56,11 @@ public class ForecastTask extends GenericPageParams implements Serializable { */ @TableField(value="user_id") @Schema(description="操作人id") - private Integer userId; + private String userId; + + @TableField(exist = false) + @Schema(description="操作人姓名") + private String userName; /** * 预见期(小时) diff --git a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java index b0eb0ae..fa4cf35 100644 --- a/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java +++ b/src/main/java/com/gunshi/project/xyt/schedule/TaskGroupJob.java @@ -112,7 +112,7 @@ public class TaskGroupJob implements Job { forecastProject.setProjectTm(nowTime); forecastProject.setStartTm(startTime); forecastProject.setEndTm(endTime); -// forecastProject.setUserId(); + forecastProject.setUserId("0000000000_系统"); forecastProject.setForecastPeriod(forecastPeriod); forecastProject.setForecastWarm(forecastWarm); forecastProject.setTimeInterval(forecastTask.getTimeInterval());