Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/CommonPController.cs

@@ -26,6 +26,8 @@ using System.Runtime.InteropServices;
 using Lucene.Net.Util;
 using NPOI.Util;
 using XF.Domain.Entities;
+using Hotline.SeedData;
+using Hotline.Authentications;
 
 namespace Hotline.Api.Controllers
 {
@@ -590,5 +592,35 @@ namespace Hotline.Api.Controllers
 			}
 		}
 
+
+		/// <summary>
+		/// 省件退回中心弹窗提示  type  0  工单坐席待办 1 工单待办
+		/// </summary>
+		/// <returns></returns>
+		[HttpGet("home_province_sendback")]
+		public async Task<object> GetProvinceSendBack() {
+
+			if (_sessionContext.RequiredOrgId == OrgSeedData.CenterId)
+			{
+				var msg = "工单编码为{0}的工单，已被退回，请及时处理！";
+				var orders = await _orderSendBackAuditRepository.Queryable().Includes(x => x.Order)
+					.Where(x => x.Order.IsProvince)
+					.Where(x => x.ApplyOrgId.Length == 6 && x.SendBackOrgId == OrgSeedData.CenterId && x.State == ESendBackAuditState.End)
+					.Where(x => SqlFunc.Subqueryable<WorkflowStep>()
+					.Where(step => step.ExternalId == x.OrderId && (
+								   (step.FlowAssignType == EFlowAssignType.User && step.HandlerId == _sessionContext.RequiredUserId)
+								   || (step.FlowAssignType == EFlowAssignType.Role && _sessionContext.Roles.Contains(step.RoleId))
+								   )).Any()
+					).OrderByDescending(x=>x.AuditTime).ToListAsync();
+				if (orders != null && orders.Any())
+				{
+					var order = orders.FirstOrDefault();
+					msg = string.Format(msg, order.Order.No);
+					var type = order.Order.Status < EOrderStatus.Handling ? 0 : 1;
+					return new { count = orders.Count, msg = msg, type = type };
+				}
+			}
+			return new { count = 0, msg = string.Empty, type = -1 };
+		}
 	}
 }

src/Hotline.Api/Controllers/OrderController.cs

@@ -34,6 +34,7 @@ using Hotline.Settings.TimeLimitDomain;
 using Hotline.Settings.TimeLimits;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.CallCenter;
+using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Dtos.Order;
@@ -3692,6 +3693,33 @@ public class OrderController : BaseController
         return _sessionContext.OrgIsCenter ? dto : dto.DataMask();
     }
 
+
+	/// <summary>
+	/// 上传附件
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <returns></returns>
+	//[HttpPost]
+	//[LogFilterAlpha("上传附件")]
+	//public async Task UploadFiles(OrderUploadFiles dto) { 
+    
+ //       var fileJson = await _fileRepository.AddFileAsync(dto.Files, dto.Id, "", HttpContext.RequestAborted);
+
+ //       if (fileJson.Any())
+ //       {
+	//		var order = await _orderRepository.GetAsync(dto.Id);
+ //           if (order.FileJson != null && order.FileJson.Any())
+ //           {
+ //               order.FileJson.AddRange(fileJson);
+ //           }
+ //           else {
+ //               order.FileJson = fileJson;
+	//		}
+ //           await _orderRepository.Updateable().SetColumns(x => new Order { FileJson = order.FileJson }).Where(x => x.Id == dto.Id).ExecuteCommandAsync();
+	//	}
+	//}
+
+
     /// <summary>
     /// 新增工单
     /// </summary>

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

@@ -225,8 +225,8 @@ namespace Hotline.Repository.SqlSugar.Extensions
                 ////获取原生SQL推荐 5.1.4.63  性能OK
                 //Log.Information(UtilMethods.GetNativeSql(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/OrderDto.cs

@@ -1049,7 +1049,20 @@ namespace Hotline.Share.Dtos.Order
         public bool IsEdit { get; set; }
     }
 
-    public class AddOrderDto : Position
+    public class OrderUploadFiles {
+
+		public string Id { get; set; }
+
+		/// <summary>
+		/// 附件列表
+		/// </summary>
+		public List<FileDto> Files { get; set; } = new();
+
+
+	}
+
+
+	public class AddOrderDto : Position
     {
         #region 来电信息