diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java index b7ac21e..813bfc0 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java @@ -126,6 +126,8 @@ public class TerminalExtController extends BaseController { if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { Weathers last = weatherService.getLast(terminal.getId()); + last.setCmdid(terminal.getCmdid()); + last.setPhase(terminal.getPhase()); terminal.setLastWeathers(last); } } @@ -143,6 +145,8 @@ public class TerminalExtController extends BaseController { if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { LeadPulls last = leadPullsService.getLast(terminal.getId()); + last.setCmdid(terminal.getCmdid()); + last.setPhase(terminal.getPhase()); terminal.setLastLeadPulls(last); } }