Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -566,6 +566,31 @@ public class OrderController : BaseController
         }
     }
 
+	/// <summary>
+	/// 批量分配回访人员
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <returns></returns>
+	//[HttpPost("visit/distribution")]
+	//public async Task DistributionVisit([FromBody]DistributionVisitDto dto)
+	//{
+	//	foreach (var id in dto.Ids)
+	//	{
+ //           var visit = await _orderVisitRepository.Queryable().FirstAsync(d => d.Id == dto.Id, HttpContext.RequestAborted);
+ //           if (visit !=null && visit.VisitState != EVisitState.WaitForVisit)
+	//		{
+
+	//		}
+	//		else
+	//		{
+
+	//		}
+ //       }
+		
+
+	//}
+
+
     #endregion
 
     #region 工单重办
@@ -576,15 +601,15 @@ public class OrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [Permission(EPermission.QueryOrderRedoRecord)]
-    [HttpGet("redo")]
-    public async Task<PagedDto<OrderRedo>> QueryOrderRedo([FromQuery] QueryOrderRedoRecordDto dto)
-    {
-        var (total, items) = await _orderRedoRepository.Queryable()
-            .Includes(x => x.Order)
-            .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
-                d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
-            .OrderByDescending(x => x.CreationTime)
-            .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+	[HttpGet("redo")]
+	public async Task<PagedDto<OrderRedo>> QueryOrderRedo([FromQuery] QueryOrderRedoRecordDto dto)
+	{
+		var (total, items) = await _orderRedoRepository.Queryable()
+			.Includes(x => x.Order)
+			.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
+				d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
+			.OrderByDescending(x => x.CreationTime)
+			.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
         return new PagedDto<OrderRedo>(total, items);
     }

src/Hotline.Repository.SqlSugar/Extensions/SqlSugarStartupExtensions.cs

@@ -207,8 +207,8 @@ namespace Hotline.Repository.SqlSugar.Extensions
             /***写AOP等方法***/
             db.Aop.OnLogExecuting = (sql, pars) =>
             {
-                //Log.Information("Sql: {0}", sql);
-                //Log.Information("SqlParameters: {0}", string.Join(',', pars.Select(d => d.Value)));
+                Log.Information("Sql: {0}", sql);
+                Log.Information("SqlParameters: {0}", string.Join(',', pars.Select(d => d.Value)));
             };
             db.Aop.OnError = (exp) =>//SQL报错
             {

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -138,6 +138,14 @@ namespace Hotline.Share.Dtos.Order
         public EVisitStateQuery VisitState { get; set; }
     }
 
+    public record DistributionVisitDto
+    {
+        public List<string> Ids { get; set; }
+
+        public string EmployeeId { get; set; }
+    }
+
+
     public record VisitDto
     {
         /// <summary>

src/Hotline/Settings/SysDicTypeConsts.cs

@@ -179,4 +179,18 @@ public class SysDicTypeConsts
 	/// 通知类型
 	/// </summary>
 	public const string CircularType = "CircularType";
+
+    /// <summary>
+    /// 工单词性分类
+    /// </summary>
+    public const string OrderWordClassify = "OrderWordClassify";
+    /// <summary>
+    /// 知识库词性分类
+    /// </summary>
+    public const string KnowledgeWordClassify = "KnowledgeWordClassify";
+
+    /// <summary>
+    /// 小休原因
+    /// </summary>
+    public const string RestReason = "RestReason";
 }