轨迹订单添加问题类型字段和问题描述返参

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs

@@ -17,6 +17,16 @@ public class GetPageTrackOrderInput : PageInfoInput
     /// </summary>
     public string? OrderNos { get; set; }
 
+    /// <summary>
+    /// tab标签类型 0 全部， 1 异常   2  预警
+    /// </summary>
+    public int TabType { get; set; }
+
+    /// <summary>
+    /// 当tab选中  0 默认不传  1 直接写死传值  [1,4]  2  传  [2,4]
+    /// </summary>
+    public List<int>? QuestionTypeIds {  get; set; }
+
     /// <summary>
     /// 创建时间开始
     /// </summary>
@@ -113,5 +123,28 @@ public class TrackOrderDto
     /// </summary>
     public string SubSystem { get; set; }
 
+    /// <summary>
+    /// 子系统id
+    /// </summary>
     public int SubSystemId { get; set; }
+
+    /// <summary>
+    /// 问题类型（主数据枚举TrackQuestionType）
+    /// </summary>
+    public int QuestionType { get; set; }
+
+    /// <summary>
+    /// 问题类型名称
+    /// </summary>
+    public string? QuestionTypeName { get; set; }
+
+    /// <summary>
+    /// 问题描述（主数据枚举TrackProblemDescription）
+    /// </summary>
+    public int ProblemDescription { get; set; }
+
+    /// <summary>
+    /// 问题描述名称
+    /// </summary>
+    public string? ProblemDescriptionName { get; set; }
 }

src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs

@@ -49,9 +49,9 @@ public class TrackPushPullService : ApplicationService
                 x.OrderNo
             }).ToList();
 
-            // 批量获取轨迹
+            // 批量获取轨迹     这里报错了，我先随便给个 写死的主体值
             await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync(
-                "A012", group.Key.ServiceProviderCode, data,
+                "A012", group.Key.ServiceProviderCode, 42, data,
                 GlobalConst.TrackRefreshSubscribe, JsonConvert.SerializeObject(group.Key));
         }
 

src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs

@@ -108,6 +108,18 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot
     [SugarColumn(ColumnName = "LeaveCountry")]
     public string LeaveCountry { get; set; } = null!;
 
+    /// <summary>
+    /// 问题类型（主数据枚举TrackQuestionType）
+    /// </summary>
+    [SugarColumn(ColumnName = "QuestionType")]
+    public int QuestionType {  get; set; }
+
+    /// <summary>
+    /// 问题描述（主数据枚举TrackProblemDescription）
+    /// </summary>
+    [SugarColumn(ColumnName = "ProblemDescription")]
+    public int ProblemDescription { get; set; }
+
     /// <summary>
     /// 起运港口
     /// </summary>

src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs

@@ -18,6 +18,15 @@ namespace SJZY.Track.Domain.Dtos.Order
         ///// </summary>
         //public List<string>? OrderNos { get; set; }
 
+        /// <summary>
+        /// 当tab选中  0 默认不传  1 直接写死传值  [1,4]  2  传  [2,4]
+        /// </summary>
+        public int TabType { get; set; }
+
+        /// <summary>
+        /// 当tab选中  1 直接写死传值  [1,4]  2  传  [2,4]
+        /// </summary>
+        public List<int>? QuestionTypeIds { get; set; }
 
         /// <summary>
         /// 单号
@@ -124,5 +133,25 @@ namespace SJZY.Track.Domain.Dtos.Order
         /// 轨迹模板Id数组
         /// </summary>
         public List<int>? TrackTemplateIds { get; set; }
+
+        /// <summary>
+        /// 问题类型（主数据枚举TrackQuestionType）
+        /// </summary>
+        public int QuestionType { get; set; }
+
+        /// <summary>
+        /// 问题类型名称
+        /// </summary>
+        public string? QuestionTypeName { get; set; }
+
+        /// <summary>
+        /// 问题描述（主数据枚举TrackProblemDescription）
+        /// </summary>
+        public int ProblemDescription { get; set; }
+
+        /// <summary>
+        /// 问题描述名称
+        /// </summary>
+        public string? ProblemDescriptionName { get; set; }
     }
 }

src/SJZY.Track.Repository/Repositories/OrderRepository.cs

@@ -137,6 +137,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
                 (a, b, c) => a.CreateTime >= input.CreateTimeStart)
             .WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue,
                 (a, b, c) => a.CreateTime <= input.CreateTimeEnd)
+            .WhereIF(input.TabType>0 && (!input.QuestionTypeIds.IsNullOrEmpty()), (a, b, c) => input.QuestionTypeIds.Contains(a.QuestionType))
             .OrderByDescending((a, b, c) => a.CreateTime)
             .Select((a, b, c) => new TrackOrderVO
             {
@@ -148,6 +149,10 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
                     .Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""),
                 CustomerShortName = b.Abbreviation,
                 CustomerCode = b.Code,
+                QuestionType = a.QuestionType,
+                QuestionTypeName = SqlFunc.IF(a.QuestionType == 1).Return("异常").ElseIF(a.QuestionType == 2).Return("预警").End(""),
+                ProblemDescription = a.ProblemDescription,
+                ProblemDescriptionName =SqlFunc.IF(a.ProblemDescription == 1).Return("推送异常").ElseIF(a.ProblemDescription == 2).Return("推送预警").End(""),
                 //TrackTemplateNames = SqlFunc.Subqueryable<OrderTemplateEntity>()
                 //    .LeftJoin<TrackTemplateEntity>((aa, bb) => aa.TrackTemplateId == bb.Id)
                 //    .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","),
@@ -206,7 +211,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
 
                 a.TrackTemplateNames = trackTemplateList.Where(b => b.OrderId == a.Id).Select(a => a.Name)
                     .JoinAsString(",");
-                a.TrackTemplateIds = trackTemplateList.Where(b => b.OrderId == a.Id).Select(a => a.TemplateId).ToList();
+                a.TrackTemplateIds = trackTemplateList.Where(b => b.OrderId == a.Id).Where(b => b.TemplateId>0).Select(a => a.TemplateId).ToList();
             });
         }