Sfoglia il codice sorgente

rename orderpublish

xf 1 anno fa
parent
commit
bed64debc0

+ 16 - 16
src/Hotline.Api/Controllers/OrderController.cs

@@ -124,29 +124,29 @@ public class OrderController : BaseController
             throw UserFriendlyException.SameMessage("未找到工单,无法发布");
 
         //新增发布工单
-        OrderPublished orderPublished = new OrderPublished();
-        orderPublished.No = order.No;
-        orderPublished.PublishState = dto.PublishState;
-        orderPublished.ArrangeTitle = dto.ArrangeTitle;
-        orderPublished.ArrangeContent = dto.ArrangeContent;
-        orderPublished.ArrangeOpinion = dto.ArrangeOpinion;
-        orderPublished.ProPublishState = dto.ProPublishState;
-        orderPublished.FeedBackPhone = dto.FeedBackPhone;
-        orderPublished.NoPubReason = dto.NoPubReason;
-        string id = await _orderPublishedRepository.AddAsync(orderPublished);
+        OrderPublish orderPublish = new OrderPublish();
+        orderPublish.No = order.No;
+        orderPublish.PublishState = dto.PublishState;
+        orderPublish.ArrangeTitle = dto.ArrangeTitle;
+        orderPublish.ArrangeContent = dto.ArrangeContent;
+        orderPublish.ArrangeOpinion = dto.ArrangeOpinion;
+        orderPublish.ProPublishState = dto.ProPublishState;
+        orderPublish.FeedBackPhone = dto.FeedBackPhone;
+        orderPublish.NoPubReason = dto.NoPubReason;
+        string id = await _orderPublishedRepository.AddAsync(orderPublish);
         //新增回访信息
-        var visitedDetail = new List<OrderVisitedDetail>();
+        var visitedDetail = new List<OrderVisitDetail>();
 
-        var seatDetail = new OrderVisitedDetail();
-        seatDetail.VisitedId = id;
-        seatDetail.VisitedType = EVisitedType.Seat;
+        var seatDetail = new OrderVisitDetail();
+        seatDetail.VisitId = id;
+        seatDetail.VisitTarget = EVisitTarget.Seat;
 
         visitedDetail.Add(seatDetail);
 
         foreach (var item in dto.IdNames)
         {
-            var orgDetail = new OrderVisitedDetail();
-            orgDetail.VisitedId = id;
+            var orgDetail = new OrderVisitDetail();
+            orgDetail.VisitId = id;
             orgDetail.VisitOrgCode = item.Id;
             orgDetail.VisitOrgName = item.Name;
             visitedDetail.Add(orgDetail);

+ 1 - 1
src/Hotline.Repository.SqlSugar/Orders/OrderPublishedRepository.cs

@@ -5,7 +5,7 @@ using XF.Domain.Dependency;
 
 namespace Hotline.Repository.SqlSugar.Orders
 {
-    public class OrderPublishedRepository : BaseRepository<OrderPublished>, IOrderPublishedRepository, IScopeDependency
+    public class OrderPublishedRepository : BaseRepository<OrderPublish>, IOrderPublishedRepository, IScopeDependency
     {
         public OrderPublishedRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
         {

+ 1 - 1
src/Hotline.Repository.SqlSugar/Orders/OrderVisitedDetailRepository.cs

@@ -5,7 +5,7 @@ using XF.Domain.Dependency;
 
 namespace Hotline.Repository.SqlSugar.Orders
 {
-    public class OrderVisitedDetailRepository : BaseRepository<OrderVisitedDetail>, IOrderVisitedDetailRepository, IScopeDependency
+    public class OrderVisitedDetailRepository : BaseRepository<OrderVisitDetail>, IOrderVisitedDetailRepository, IScopeDependency
     {
         public OrderVisitedDetailRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
         {

+ 1 - 1
src/Hotline.Repository.SqlSugar/Orders/OrderVisitedRepository.cs

@@ -10,7 +10,7 @@ using XF.Domain.Dependency;
 
 namespace Hotline.Repository.SqlSugar.Orders
 {
-    public class OrderVisitedRepository : BaseRepository<OrderVisited>, IOrderVisitedRepository, IScopeDependency
+    public class OrderVisitedRepository : BaseRepository<OrderVisit>, IOrderVisitedRepository, IScopeDependency
     {
         public OrderVisitedRepository(ISugarUnitOfWork<HotlineDbContext> uow, IDataPermissionFilterBuilder dataPermissionFilterBuilder) : base(uow, dataPermissionFilterBuilder)
         {

+ 1 - 1
src/Hotline.Share/Enums/Order/EVisitedState.cs → src/Hotline.Share/Enums/Order/EVisitState.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Hotline.Share.Enums.Order
 {
-    public enum EVisitedState
+    public enum EVisitState
     {
         /// <summary>
         /// 待回访

+ 1 - 1
src/Hotline.Share/Enums/Order/EVisitedType.cs → src/Hotline.Share/Enums/Order/EVisitTarget.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Hotline.Share.Enums.Order
 {
-    public enum EVisitedType
+    public enum EVisitTarget
     {
         /// <summary>
         /// 话务员

+ 1 - 1
src/Hotline/Orders/IOrderPublishedRepository.cs

@@ -2,7 +2,7 @@
 
 namespace Hotline.Orders
 {
-    public interface IOrderPublishedRepository: IRepository<OrderPublished>
+    public interface IOrderPublishedRepository: IRepository<OrderPublish>
     {
     }
 }

+ 1 - 1
src/Hotline/Orders/IOrderVisitedDetailRepository.cs

@@ -7,7 +7,7 @@ using XF.Domain.Repository;
 
 namespace Hotline.Orders
 {
-    public interface IOrderVisitedDetailRepository: IRepository<OrderVisitedDetail>
+    public interface IOrderVisitedDetailRepository: IRepository<OrderVisitDetail>
     {
     }
 }

+ 1 - 1
src/Hotline/Orders/IOrderVisitedRepository.cs

@@ -2,7 +2,7 @@
 
 namespace Hotline.Orders
 {
-    public interface IOrderVisitedRepository: IRepository<OrderVisited>
+    public interface IOrderVisitedRepository: IRepository<OrderVisit>
     {
     }
 }

+ 2 - 2
src/Hotline/Orders/Notifications/AddVisitNotify.cs

@@ -5,12 +5,12 @@ namespace Hotline.Orders.Notifications
 {
     public class AddVisitNotify:INotification
     {
-        public AddVisitNotify(List<OrderVisitedDetail> orderVisitedDetails)
+        public AddVisitNotify(List<OrderVisitDetail> orderVisitedDetails)
         {
             OrderVisitedDetails = orderVisitedDetails;
         }
 
 
-        public List<OrderVisitedDetail> OrderVisitedDetails { get; set; }
+        public List<OrderVisitDetail> OrderVisitedDetails { get; set; }
     }
 }

+ 2 - 2
src/Hotline/Orders/Order.cs

@@ -426,13 +426,13 @@ namespace Hotline.Orders
         /// 已发布工单
         /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(Id))]
-        public OrderPublished? OrderPublished { get; set; }
+        public OrderPublish? OrderPublished { get; set; }
 
         /// <summary>
         /// 已回访工单
         /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(Id))]
-        public OrderVisited? OrderVisited { get; set; }
+        public OrderVisit? OrderVisited { get; set; }
 
         #region Method
 

+ 1 - 1
src/Hotline/Orders/OrderPublished.cs → src/Hotline/Orders/OrderPublish.cs

@@ -7,7 +7,7 @@ namespace Hotline.Orders;
 /// <summary>
 /// 已发布工单
 /// </summary>
-public class OrderPublished : CreationEntity
+public class OrderPublish : CreationEntity
 {
     /// <summary>
     /// 工单编码(冗余)

+ 3 - 3
src/Hotline/Orders/OrderVisited.cs → src/Hotline/Orders/OrderVisit.cs

@@ -8,7 +8,7 @@ namespace Hotline.Orders;
 /// <summary>
 /// 已回访工单
 /// </summary>
-public class OrderVisited : CreationEntity
+public class OrderVisit : CreationEntity
 {
     /// <summary>
     /// 工单编码(冗余)
@@ -29,7 +29,7 @@ public class OrderVisited : CreationEntity
     /// <summary>
     /// 回访状态
     /// </summary>
-    public EVisitedState VisitedState { get; set; }
+    public EVisitState VisitState { get; set; }
 
     /// <summary>
     /// 回访方式
@@ -71,6 +71,6 @@ public class OrderVisited : CreationEntity
     /// <summary>
     /// 回访明细
     /// </summary>
-    public List<OrderVisitedDetail>? VisitedDetail { get; set; }
+    public List<OrderVisitDetail>? VisitDetails { get; set; }
 
 }

+ 3 - 3
src/Hotline/Orders/OrderVisitedDetail.cs → src/Hotline/Orders/OrderVisitDetail.cs

@@ -4,13 +4,13 @@ using XF.Domain.Repository;
 
 namespace Hotline.Orders
 {
-    public class OrderVisitedDetail: CreationEntity
+    public class OrderVisitDetail: CreationEntity
     {
 
         /// <summary>
         /// 回访主表ID
         /// </summary>
-        public string VisitedId { get; set; }
+        public string VisitId { get; set; }
 
         /// <summary>
         /// 语音评价(话务评价)
@@ -61,6 +61,6 @@ namespace Hotline.Orders
         /// <summary>
         /// 回访对象类型 10:话务员 20:部门
         /// </summary>
-        public EVisitedType VisitedType { get; set; }
+        public EVisitTarget VisitTarget { get; set; }
     }
 }