|
@@ -1527,10 +1527,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
var visitData = dto.VisitDetails.Where(x => x.VisitTarget == EVisitTarget.Seat).FirstOrDefault();
|
|
|
if (visitData != null)
|
|
|
{
|
|
|
- if ((visitData.VoiceEvaluate == EVoiceEvaluate.VerySatisfied ||
|
|
|
- visitData.VoiceEvaluate == EVoiceEvaluate.Satisfied) &&
|
|
|
- (visitData.SeatEvaluate == ESeatEvaluate.VerySatisfied ||
|
|
|
- visitData.SeatEvaluate == ESeatEvaluate.Satisfied))
|
|
|
+ if (visitData.VoiceEvaluate != EVoiceEvaluate.NoSatisfied &&
|
|
|
+ visitData.VoiceEvaluate != EVoiceEvaluate.VeryNoSatisfied &&
|
|
|
+ visitData.SeatEvaluate != ESeatEvaluate.NoSatisfied &&
|
|
|
+ visitData.SeatEvaluate != ESeatEvaluate.VeryNoSatisfied)
|
|
|
{
|
|
|
await _orderScreenRepository.RemoveAsync(x => x.VisitId == visitData.VisitId);
|
|
|
}
|
|
@@ -1547,8 +1547,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
{
|
|
|
if (visitData.OrgProcessingResults != null)
|
|
|
{
|
|
|
- if (visitData.OrgProcessingResults.Value == "非常满意" ||
|
|
|
- visitData.OrgProcessingResults.Value == "满意")
|
|
|
+ if (visitData.OrgProcessingResults.Value != "非常不满意" &&
|
|
|
+ visitData.OrgProcessingResults.Value != "不满意")
|
|
|
{
|
|
|
await _orderScreenRepository.RemoveAsync(x => x.VisitId == visitData.VisitId);
|
|
|
}
|
|
@@ -3903,7 +3903,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
.Where((s, p) => p.DicDataValue == dto.OrderTagCode && d.OrderId == s.OrderId).Any()) //工单标签
|
|
|
.WhereIF(dto.IsUpdate.HasValue && dto.IsUpdate == true, d => d.IsUpdate == true)
|
|
|
.WhereIF(dto.IsUpdate.HasValue && dto.IsUpdate == false, d => d.IsUpdate == false || d.IsUpdate == null)
|
|
|
-
|
|
|
+
|
|
|
.OrderByIF(_appOptions.Value.IsYiBin && dto.VisitStateQuery != EVisitStateQuery.Visited, d => d.Order.IsUrgent, OrderByType.Desc)
|
|
|
.OrderByIF(_appOptions.Value.IsZiGong == false, d => d.PublishTime, OrderByType.Desc)
|
|
|
.OrderByIF(dto is { SortField: "publishTime", SortRule: 0 }, x => x.PublishTime, OrderByType.Asc) // 发布时间升序
|