旅游信件

src/Hotline.Api/Controllers/OrderController.cs

@@ -532,7 +532,7 @@ public class OrderController : BaseController
             throw UserFriendlyException.SameMessage("当前状态无法发布");
 
 
-        if(order.SourceChannelCode=="SZMHD" && order.IsProvince && dto.PublishState && dto.IsOpenReview is null)
+        if (order.SourceChannelCode == "SZMHD" && order.IsProvince && dto.PublishState && dto.IsOpenReview is null)
         {
             throw UserFriendlyException.SameMessage("公开信件必须选择开展保密审查");
         }
@@ -821,7 +821,7 @@ public class OrderController : BaseController
             Content = order.Content,
             ActualOpinion = order.FileOpinion,
             IsPublic = order.IsPublic,
-            IsProvincePublic = (order.SourceChannelCode == "SZMHD" && order.IsProvince == true) ? true :false,
+            IsProvincePublic = (order.SourceChannelCode == "SZMHD" && order.IsProvince == true) ? true : false,
             NetizenEvaluateType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.NetizenEvaluateType)
                 .Select(x => new Kv { Key = x.DicDataValue, Value = x.DicDataName }).ToList()
         };
@@ -2921,7 +2921,7 @@ public class OrderController : BaseController
         }
         var rsp = new
         {
-            DelayStatisticalNodes= delayStatisticalNodesList,
+            DelayStatisticalNodes = delayStatisticalNodesList,
             DelayState = EnumExts.GetDescriptions<EDelayState>(),
             QueryDelayState = EnumExts.GetDescriptions<EQueryDelayState>(),
             TimeType = EnumExts.GetDescriptions<ETimeType>(),
@@ -3655,9 +3655,23 @@ public class OrderController : BaseController
     {
         var orders = await _orderApplication.QueryTravel(dto)
             .ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
+
+        orders.ForEach(x =>
+        {
+            if (x.OrderVisits != null && x.OrderVisits.Count > 0)
+            {
+                x.OrgProcessingResults = x.OrderVisits[0].NowEvaluate;
+            }
+            else
+            {
+                x.OrgProcessingResults = null;
+            }
+        });
+
         var list = _mapper.Map<IReadOnlyList<OrderDto>>(orders);
         if (_appOptions.Value.IsLuZhou && !_sessionContext.OrgIsCenter)
             list = list.Select(p => p.DataMask(false)).ToList();
+
         return list;
     }
 
@@ -3687,6 +3701,18 @@ public class OrderController : BaseController
             orders = items;
         }
 
+        orders.ForEach(x =>
+        {
+            if (x.OrderVisits != null && x.OrderVisits.Count > 0)
+            {
+                x.OrgProcessingResults = x.OrderVisits[0].NowEvaluate;
+            }
+            else
+            {
+                x.OrgProcessingResults = null;
+            }
+        });
+
         var orderDtos = _mapper.Map<ICollection<OrderDto>>(orders);
 
         if (_appOptions.Value.IsLuZhou)
@@ -6261,9 +6287,9 @@ public class OrderController : BaseController
             OrderTags = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.OrderTag),
             FocusOnEvents = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.FocusOnEvent),
             PoliticalIdentity = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.PoliticalIdentity),
-			SeatEvaluate = EnumExts.GetDescriptions<ESeatEvaluate>(),
-			VisitSatisfaction = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.VisitSatisfaction),
-		};
+            SeatEvaluate = EnumExts.GetDescriptions<ESeatEvaluate>(),
+            VisitSatisfaction = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.VisitSatisfaction),
+        };
         return rsp;
     }