From 16803b849f5b3fac16bcdfa6593841d461060440 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Wed, 28 Feb 2024 11:50:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs | 11 +++++++++--
src/SJZY.Track.Repository/TrackStatusRepository.cs | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs
index bf0f622d..a3863273 100644
--- a/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs
+++ b/src/SJZY.Track.Domain/TrackStatusAggregate/Dtos/GetTrackStatusListVO.cs
@@ -1,4 +1,6 @@
-using System;
+using SJZY.Expand.ABP.Core.PublicMethords;
+using SJZY.Track.Domain.Eunms;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -18,10 +20,15 @@ namespace SJZY.Track.Domain.TrackStatusAggregate.Dtos
///
public string SubSystem { get; set; }
+ ///
+ /// 节点id
+ ///
+ public int NodeId { get; set; }
+
///
/// 所属节点
///
- public string Node { get; set; }
+ public string Node => NodeId.GetDescription();
///
/// 所属轨迹状态
diff --git a/src/SJZY.Track.Repository/TrackStatusRepository.cs b/src/SJZY.Track.Repository/TrackStatusRepository.cs
index 17bc0a33..54adf695 100644
--- a/src/SJZY.Track.Repository/TrackStatusRepository.cs
+++ b/src/SJZY.Track.Repository/TrackStatusRepository.cs
@@ -53,8 +53,8 @@ public class TrackStatusRepository : BasicRepository, ITrackS
Id = a.Id,
Code = a.Code,
EntrackStatus = a.EnStatus,
+ NodeId=a.Node,
TrackStatus=a.Status,
- Node="",
CreateTime = a.CreateTime,
CreateUser = c.Name,
UpdateTime = a.UpdateTime,