瀏覽代碼

ordervisit

Dun.Jason 1 年之前
父節點
當前提交
c97e8c2ce0
共有 2 個文件被更改,包括 10 次插入2 次删除
  1. 8 1
      src/Hotline.Api/Controllers/ArticleController.cs
  2. 2 1
      src/Hotline.Api/Controllers/OrderController.cs

+ 8 - 1
src/Hotline.Api/Controllers/ArticleController.cs

@@ -141,7 +141,14 @@ namespace Hotline.Api.Controllers
         [HttpGet("circular/examine")]
         public async Task ExamineCircular([FromBody]ExamineCircularDto dto)
         {
-
+            if (dto.IsPass)
+            {
+                //TODO 通过
+            }
+            else
+            {
+                //TODO 驳回
+            }
         }
 
         /// <summary>

+ 2 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -632,7 +632,7 @@ public class OrderController : BaseController
     public async Task<PagedDto<OrderCanVisitAgainDto>> OrderVisitAgainList([FromQuery] OrderVisitAgainListDto dto)
     {
         var (total, items) = await _orderVisitedDetailRepository.Queryable()
-            .Includes(x => x.OrderVisit, x => x.Order)
+            .Includes(x => x.OrderVisit,x=>x.Order)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.OrderVisit.Order.No.Contains(dto.Keyword))
             .Where(x => x.OrderVisit.VisitState == EVisitState.Visited &&
                         (x.OrderVisit.VisitType == EVisitType.SmsVisit ||
@@ -783,6 +783,7 @@ public class OrderController : BaseController
     {
         var (total, items) = await _orderVisitApplyRepository.Queryable()
             .Includes(d => d.Order)
+            .Includes(d=>d.OrderVisit)
             .Includes(d => d.Employee)
             .WhereIF(dto.VisitApplyState != null, x => x.VisitApplyState == dto.VisitApplyState)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.OrderNo.Contains(dto.Keyword))