|
@@ -1031,14 +1031,14 @@ public class OrderController : BaseController
|
|
|
IsAgain = false,
|
|
|
VisitDetails = new List<VisitDetailDto>
|
|
|
{
|
|
|
- new()
|
|
|
- {
|
|
|
- Id = seatDetail.Id,
|
|
|
- VisitId = visit.VisitId,
|
|
|
- VisitContent = dto.SeatVisitContent,
|
|
|
- SeatEvaluate = dto.SeatEvaluate,
|
|
|
- VisitTarget = EVisitTarget.Seat,
|
|
|
- }
|
|
|
+ new()
|
|
|
+ {
|
|
|
+ Id = seatDetail.Id,
|
|
|
+ VisitId = visit.VisitId,
|
|
|
+ VisitContent = dto.SeatVisitContent,
|
|
|
+ SeatEvaluate = dto.SeatEvaluate,
|
|
|
+ VisitTarget = EVisitTarget.Seat,
|
|
|
+ }
|
|
|
}
|
|
|
};
|
|
|
|
|
@@ -1046,18 +1046,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;
|
|
@@ -2684,8 +2684,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);
|
|
|
}
|
|
|
|