田爽 1 year ago
parent
commit
22a029ded2

+ 12 - 7
src/Hotline.Api/Controllers/OrderController.cs

@@ -2102,7 +2102,7 @@ public class OrderController : BaseController
 	/// </summary>
 	/// <param name="dto"></param>
 	/// <returns></returns>
-	[Permission(EPermission.UpdateCitizen)]
+	//[Permission(EPermission.UpdateCitizen)]
 	[HttpPut("special")]
 	public async Task Update([FromBody] AuditOrderSpecialDto dto)
 	{
@@ -2125,7 +2125,7 @@ public class OrderController : BaseController
 	/// </summary>
 	/// <param name="dto"></param>
 	/// <returns></returns>
-	[Permission(EPermission.CitizenList)]
+	//[Permission(EPermission.CitizenList)]
 	[HttpGet("special/list")]
 	public async Task<PagedDto<OrderSpecialDto>> List([FromQuery] OrderSpecialListDto dto)
 	{
@@ -2142,7 +2142,7 @@ public class OrderController : BaseController
 	/// </summary>
 	/// <param name="id"></param>
 	/// <returns></returns>
-	[Permission(EPermission.CitizenEntity)]
+	//[Permission(EPermission.CitizenEntity)]
 	[HttpGet("special/{id}")]
 	public async Task<OrderSpecial> SpecialEntity(string id)
 	{
@@ -2173,10 +2173,15 @@ public class OrderController : BaseController
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-	[HttpGet("special/handle_time/{id}")]
-	public async Task<object> SpecialHandleTime(string id) { 
-    
-    }
+	[HttpGet("special/handle_time")]
+	public async Task<int> SpecialHandleTime([FromQuery] OrderSpecialHandleTime dto) 
+    {
+        var order = await _orderRepository.GetAsync(dto.OrderId);
+        var trace = await _workflowTraceRepository.GetAsync(dto.TraceId);
+        var org = await _organizeRepository.GetAsync(trace.HandlerOrgId);
+        if (org != null && org.IsCenter) return _timeLimitDomainService.GetOrderTimeLimitConfig(string.Empty);
+        return _timeLimitDomainService.GetOrderTimeLimitConfig(order.AcceptTypeCode);
+	}
 	#endregion
 
 	#region  市民信息

+ 17 - 0
src/Hotline.Share/Dtos/Order/OrderSendBackDto.cs

@@ -38,6 +38,11 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public int State { get; set; }
 
+		/// <summary>
+		/// 审核意见
+		/// </summary>
+		public string? AuditOpinion { get; set; }
+
 	}
 	public class OrderSendBackResultDto
 	{
@@ -92,6 +97,13 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public int State { get; set; }
 
+		public string StateText => State == 0 ? "待审核" : State == 1 ? "审核通过" : State == 2 ? "审核不通过" : "-";
+
+		/// <summary>
+		/// 审核意见
+		/// </summary>
+		public string? AuditOpinion { get; set; }
+
 		/// <summary>
 		/// 工单
 		/// </summary>
@@ -140,6 +152,11 @@ namespace Hotline.Share.Dtos.Order
 	{
 		public DateTime? CreationTimeStart { get; set; }
 		public DateTime? CreationTimeEnd { get; set; }
+
+		/// <summary>
+		///  审核结果  0  待审核  1 审核通过  2 审核不通过
+		/// </summary>
+		public int? State { get; set; }
 	}
 	public class PublishOrderSendBackDto
 	{

+ 6 - 0
src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -163,4 +163,10 @@ namespace Hotline.Share.Dtos.Order
 		public DateTime? CreationTimeStart { get; set; }
 		public DateTime? CreationTimeEnd { get; set; }
 	}
+	public class OrderSpecialHandleTime 
+	{
+		public string OrderId { get; set; }
+
+		public string TraceId { get; set; }
+	}
 }

+ 5 - 0
src/Hotline/Orders/OrderSendback.cs

@@ -48,6 +48,11 @@ namespace Hotline.Orders
 		/// </summary>
 		public DateTime? AuditTime { get; set; }
 
+		/// <summary>
+		/// 审核意见
+		/// </summary>
+		public string? AuditOpinion { get; set; }
+
 		/// <summary>
 		///  审核结果  0  待审核  1 审核通过  2 审核不通过
 		/// </summary>