|
@@ -327,6 +327,7 @@ public class OrderController : BaseController
|
|
|
var orderVisit = await _orderVisitRepository.Queryable()
|
|
|
.Includes(x => x.Order)
|
|
|
.Includes(x => x.Employee)
|
|
|
+ .Includes(x=>x.VisitDetails)
|
|
|
.FirstAsync(x => x.Id == id, HttpContext.RequestAborted);
|
|
|
|
|
|
if (orderVisit is null)
|
|
@@ -336,11 +337,29 @@ public class OrderController : BaseController
|
|
|
|
|
|
int visitCount = await _orderVisitRepository.CountAsync(x => x.OrderId == orderVisit.OrderId && x.VisitState == Share.Enums.Order.EVisitState.Visited, HttpContext.RequestAborted);
|
|
|
int againCount = await _orderVisitRepository.CountAsync(x => x.OrderId == orderVisit.OrderId && x.AgainState == EAgainState.DoAgain, HttpContext.RequestAborted);
|
|
|
+ var voiceEvaluate = EnumExts.GetDescriptions<EVoiceEvaluate>();
|
|
|
+ var seatEvaluate = EnumExts.GetDescriptions<ESeatEvaluate>();
|
|
|
var visitSatisfaction = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.VisitSatisfaction);
|
|
|
var dissatisfiedReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.DissatisfiedReason);
|
|
|
var visitManner = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.VisitManner);
|
|
|
|
|
|
- return new { OrderVisitModel = orderVisit, VisitCount = visitCount, AgainCount = againCount, VisitSatisfaction = visitSatisfaction, DissatisfiedReason = dissatisfiedReason, VisitManner = visitManner };
|
|
|
+ return new { OrderVisitModel = orderVisit, VisitCount = visitCount, AgainCount = againCount, VisitSatisfaction = visitSatisfaction, DissatisfiedReason = dissatisfiedReason, VisitManner = visitManner,ViceEvaluate= voiceEvaluate, SeatEvaluate = seatEvaluate };
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 回访列表页面基础数据
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ [Permission(EPermission.VisitListPageBase)]
|
|
|
+ [HttpGet("visit-list-pagebase")]
|
|
|
+ public async Task<object> VisitListPageBase()
|
|
|
+ {
|
|
|
+ var resp = new
|
|
|
+ {
|
|
|
+ VisitStateQuery = EnumExts.GetDescriptions<EVisitStateQuery>()
|
|
|
+ };
|
|
|
+
|
|
|
+ return resp;
|
|
|
}
|
|
|
|
|
|
/// <summary>
|