From d23edffffc77a2c12b7f32c6d098de61d552c869 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Tue, 12 Mar 2024 21:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=AE=A2=E5=8D=95=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E9=97=AE=E9=A2=98=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E5=92=8C=E9=97=AE=E9=A2=98=E6=8F=8F=E8=BF=B0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProvideServices/GetPageTrackOrderInput.cs | 33 +++++++++++++++++++
.../ProvideServices/TrackPushPullService.cs | 4 +--
.../Aggregates/OrderAggregate/OrderEntity.cs | 12 +++++++
.../Dtos/Order/GetPageTrackOrderInputVO.cs | 29 ++++++++++++++++
.../Repositories/OrderRepository.cs | 7 +++-
5 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
index 81aa553e..64191392 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
@@ -17,6 +17,16 @@ public class GetPageTrackOrderInput : PageInfoInput
///
public string? OrderNos { get; set; }
+ ///
+ /// tab标签类型 0 全部， 1 异常 2 预警
+ ///
+ public int TabType { get; set; }
+
+ ///
+ /// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4]
+ ///
+ public List? QuestionTypeIds { get; set; }
+
///
/// 创建时间开始
///
@@ -113,5 +123,28 @@ public class TrackOrderDto
///
public string SubSystem { get; set; }
+ ///
+ /// 子系统id
+ ///
public int SubSystemId { get; set; }
+
+ ///
+ /// 问题类型（主数据枚举TrackQuestionType）
+ ///
+ public int QuestionType { get; set; }
+
+ ///
+ /// 问题类型名称
+ ///
+ public string? QuestionTypeName { get; set; }
+
+ ///
+ /// 问题描述（主数据枚举TrackProblemDescription）
+ ///
+ public int ProblemDescription { get; set; }
+
+ ///
+ /// 问题描述名称
+ ///
+ public string? ProblemDescriptionName { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs
index 2e1dd08b..53b71e31 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushPullService.cs
+++ b/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));
}
diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs
index 69d5f706..66f704a3 100644
--- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs
+++ b/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!;
+ ///
+ /// 问题类型（主数据枚举TrackQuestionType）
+ ///
+ [SugarColumn(ColumnName = "QuestionType")]
+ public int QuestionType { get; set; }
+
+ ///
+ /// 问题描述（主数据枚举TrackProblemDescription）
+ ///
+ [SugarColumn(ColumnName = "ProblemDescription")]
+ public int ProblemDescription { get; set; }
+
///
/// 起运港口
///
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index c1b97cc5..99a8d068 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -18,6 +18,15 @@ namespace SJZY.Track.Domain.Dtos.Order
/////
//public List? OrderNos { get; set; }
+ ///
+ /// 当tab选中 0 默认不传 1 直接写死传值 [1,4] 2 传 [2,4]
+ ///
+ public int TabType { get; set; }
+
+ ///
+ /// 当tab选中 1 直接写死传值 [1,4] 2 传 [2,4]
+ ///
+ public List? QuestionTypeIds { get; set; }
///
/// 单号
@@ -124,5 +133,25 @@ namespace SJZY.Track.Domain.Dtos.Order
/// 轨迹模板Id数组
///
public List? TrackTemplateIds { get; set; }
+
+ ///
+ /// 问题类型（主数据枚举TrackQuestionType）
+ ///
+ public int QuestionType { get; set; }
+
+ ///
+ /// 问题类型名称
+ ///
+ public string? QuestionTypeName { get; set; }
+
+ ///
+ /// 问题描述（主数据枚举TrackProblemDescription）
+ ///
+ public int ProblemDescription { get; set; }
+
+ ///
+ /// 问题描述名称
+ ///
+ public string? ProblemDescriptionName { get; set; }
}
}
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index be9cc648..eeeeeb14 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -137,6 +137,7 @@ public class OrderRepository : BasicRepository, 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, 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()
// .LeftJoin((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, 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();
});
}