处理冲突

src/Hotline.Api/Controllers/OrderController.cs

@@ -1048,18 +1048,18 @@ public class OrderController : BaseController
                 foreach (var orgDetail in orgDetails)
                 {
                     visitDto.VisitDetails.Add(
-			    new()
-			    {
-				Id = orgDetail.Id,
-				VisitId = visit.VisitId,
-				VisitContent = dto.OrgVisitContent,
-				VisitTarget = EVisitTarget.Org,
-				OrgNoSatisfiedReason = dto.OrgNoSatisfiedReason,
-				OrgProcessingResults = dto.OrgProcessingResults,
-				OrgHandledAttitude = dto.OrgHandledAttitude, 
-                                VisitOrgName = orgDetail.VisitOrgName,
-                                VisitOrgCode = orgDetail.VisitOrgCode,
-                            });
+                new()
+                {
+                    Id = orgDetail.Id,
+                    VisitId = visit.VisitId,
+                    VisitContent = dto.OrgVisitContent,
+                    VisitTarget = EVisitTarget.Org,
+                    OrgNoSatisfiedReason = dto.OrgNoSatisfiedReason,
+                    OrgProcessingResults = dto.OrgProcessingResults,
+                    OrgHandledAttitude = dto.OrgHandledAttitude,
+                    VisitOrgName = orgDetail.VisitOrgName,
+                    VisitOrgCode = orgDetail.VisitOrgCode,
+                });
                 }
                 await _orderApplication.SaveOrderVisit(visitDto, HttpContext.RequestAborted);
                 outDto.CompleteCount += 1;
@@ -2686,8 +2686,10 @@ public class OrderController : BaseController
     [HttpGet("fixed")]
     public async Task<IReadOnlyList<OrderDto>> QueryFixed([FromQuery] QueryOrderFixedDto dto)
     {
+        var hasSetting = Int32.TryParse(
+             _systemSettingCacheManager.GetSetting(SettingConstants.FixedQueryCount)?.SettingValue[0], out var queryCount);
         var query = _orderApplication.QueryOrders(dto);
-        var orders = await query.ToFixedListAsync(dto.QueryIndex, cancellationToken: HttpContext.RequestAborted);
+        var orders = await query.ToFixedListAsync(dto.QueryIndex, hasSetting ? queryCount : null, HttpContext.RequestAborted);
         return _mapper.Map<IReadOnlyList<OrderDto>>(orders);
     }
 

src/Hotline/Settings/SettingConstants.cs

@@ -501,6 +501,11 @@ namespace Hotline.Settings
         /// </summary>
         public const string OrderVisitRole = "OrderVisitRole";
 
+        /// <summary>
+        /// 定量查询返回数据条数上限
+        /// </summary>
+        public const string FixedQueryCount = "FixedQueryCount";
+
         /// <summary>
         /// 短信回访和电话回访用户回复的内容和系统中各个枚举的对应信息
         /// </summary>