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

src/Hotline.Api/Controllers/OrderController.cs

@@ -1666,7 +1666,7 @@ public class OrderController : BaseController
                 try
                 {
                     //查询部门所有账号
-                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId).ToListAsync();
+                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo)).ToListAsync();
                     //发送短信
                     foreach (var user in userlist)
                     {
@@ -1909,7 +1909,7 @@ public class OrderController : BaseController
                 try
                 {
                     //查询部门所有账号
-                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId).ToListAsync();
+                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo)).ToListAsync();
                     foreach (var user in userlist)
                     {
                         //发送短信
@@ -2032,7 +2032,6 @@ public class OrderController : BaseController
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    [Permission(EPermission.OrderQuery)]
     [HttpGet]
     public async Task<PagedDto<OrderDto>> Query([FromQuery] QueryOrderDto dto)
     {
@@ -2725,8 +2724,10 @@ public class OrderController : BaseController
                 d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
-            .WhereIF(dto.State.HasValue, d => d.State == dto.State)
-            .Where(x=>x.SendBackOrgId == _sessionContext.OrgId)
+            .WhereIF(dto.AuditState == 1, d => d.State == ESendBackAuditState.Apply)
+            .WhereIF(dto.AuditState == 2 && !dto.State.HasValue, d => d.State > ESendBackAuditState.Apply)
+            .WhereIF(dto.AuditState == 2 && dto.State.HasValue, d => d.State == dto.State)
+			.Where(x=>x.SendBackOrgId == _sessionContext.OrgId)
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
@@ -2978,8 +2979,8 @@ public class OrderController : BaseController
                 NextHandlers = dto.NextHandlers,
                 Opinion = dto.Cause
             };
-            if (dto.AlterTime)
-                recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
+            //if (dto.AlterTime)
+            //    recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
             //if (dto.Files.Any()) recall.Files = dto.Files;
             await _workflowApplication.RecallAsync(recall, HttpContext.RequestAborted);
             var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
@@ -3057,8 +3058,8 @@ public class OrderController : BaseController
                 NextHandlers = dto.NextHandlers,
                 Opinion = dto.Opinion
             };
-            if (dto.AlterTime)
-                recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
+            //if (dto.AlterTime)
+            //    recall.External = new External { TimeLimit = dto.TimeLimit, TimeLimitUnit = dto.TimeLimitUnit };
             //if (dto.Files.Any()) recall.Files = dto.Files;
             await _workflowApplication.RecallAsync(recall, HttpContext.RequestAborted);
             var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == special.OrderId);

src/Hotline.Application/Handlers/FlowEngine/WorkflowPreviousHandler.cs

@@ -104,21 +104,23 @@ namespace Hotline.Application.Handlers.FlowEngine
                     try
                     {
                         var user = await _userRepository.GetAsync(notification.TargetStep.HandlerId);
-
-                        var messageDto = new MessageDto()
+                        if (!string.IsNullOrEmpty(user.PhoneNo))
                         {
-                            PushBusiness = EPushBusiness.OrderCallback,
-                            ExternalId = order.Id,
-                            OrderId = order.Id,
-                            PushPlatform = EPushPlatform.Sms,
-                            Remark = order.Title,
-                            Name = user.PhoneNo,
-                            TemplateCode = "1004",
-                            Params = new List<string>() { order.No },
-                            TelNumber = user.PhoneNo,
+                            var messageDto = new MessageDto()
+                            {
+                                PushBusiness = EPushBusiness.OrderCallback,
+                                ExternalId = order.Id,
+                                OrderId = order.Id,
+                                PushPlatform = EPushPlatform.Sms,
+                                Remark = order.Title,
+                                Name = user.PhoneNo,
+                                TemplateCode = "1004",
+                                Params = new List<string>() { order.No },
+                                TelNumber = user.PhoneNo,
 
-                        };
-                        await _mediator.Publish(new PushMessageNotify(messageDto), cancellationToken);
+                            };
+                            await _mediator.Publish(new PushMessageNotify(messageDto), cancellationToken);
+                        }
                     }
                     catch { }
                     break;

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

@@ -25,6 +25,12 @@ namespace Hotline.Share.Dtos.Order
 		public string NextStepCode { get; set; } = string.Empty;
 		public string NextStepName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 申请节点code(defineStep.code)
+		/// </summary>
+		public string? StepCode { get; set; }
+		public string? StepName { get; set; }
+
 		/// <summary>
 		/// 根据办理者类型不同，此字段为不同内容
 		/// <example>
@@ -136,6 +142,12 @@ namespace Hotline.Share.Dtos.Order
 		public string NextStepCode { get; set; } = string.Empty;
 		public string NextStepName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 申请节点code(defineStep.code)
+		/// </summary>
+		public string? StepCode { get; set; }
+		public string? StepName { get; set; }
+
 		public List<Kv> NextHandlers { get; set; }
 
 		/// <summary>

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

@@ -131,5 +131,10 @@ namespace Hotline.Share.Dtos.Order
 		/// <summary>
 		/// </summary>
 		public ESendBackAuditState? State { get; set; }
+
+		/// <summary>
+		/// 1 待办  2 已办
+		/// </summary>
+		public int AuditState { get; set; }
 	}
 }