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

src/Hotline.Api/Controllers/OrderController.cs

@@ -531,8 +531,6 @@ public class OrderController : BaseController
     {
         var (total, items) = await _orderSuperviseRepository.Queryable()
             .Includes(x => x.Order)
-            .Includes(x => x.Organize)
-            .Includes(x => x.CrOrganize)
 			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .WhereIF(dto.SuperviseState > 0, x => x.State == dto.SuperviseState)
             .OrderByDescending(x => x.CreationTime)
@@ -556,6 +554,7 @@ public class OrderController : BaseController
             throw UserFriendlyException.SameMessage("无效工单");
 
         var model = _mapper.Map<OrderSupervise>(dto);
+        model.CreatorOrgName = _sessionContext.OrgName;
         model.State = 0;
         await _orderSuperviseRepository.AddAsync(model, HttpContext.RequestAborted);
     }
@@ -616,7 +615,6 @@ public class OrderController : BaseController
     {
         return await _orderSuperviseRepository.Queryable()
             .Includes(x => x.Order)
-            .Includes(x => x.Organize)
             .FirstAsync(x => x.Id == id);
     }
 
@@ -635,8 +633,6 @@ public class OrderController : BaseController
     {
         var (total, items) = await _orderUrgeRepository.Queryable()
             .Includes(x => x.Order)
-            .Includes(x => x.Organize)
-            .Includes(x => x.CrOrganize)
 			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .WhereIF(dto.SuperviseState > 0, x => x.State == dto.SuperviseState)
             .OrderByDescending(x => x.CreationTime)
@@ -719,7 +715,6 @@ public class OrderController : BaseController
     {
         return await _orderUrgeRepository.Queryable()
             .Includes(x => x.Order)
-            .Includes(x => x.Organize)
             .FirstAsync(x => x.Id == id);
     }
 

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

@@ -692,9 +692,20 @@ namespace Hotline.Share.Dtos.Order
         public string OrgId { get; set; }
 
         /// <summary>
-        /// 督办状态
+        /// 被督办部门名称
         /// </summary>
-        public int State { get; set; }
+        public string OrgName { get; set; }
+
+
+        /// <summary>
+        /// 创建部门名称
+        /// </summary>
+        public string? CreatorOrgName { get; set; }
+
+		/// <summary>
+		/// 督办状态
+		/// </summary>
+		public int State { get; set; }
 
         /// <summary>
         /// 督办签收时间
@@ -738,16 +749,6 @@ namespace Hotline.Share.Dtos.Order
 		/// 工单对象
 		/// </summary>
 		public OrderDto Order { get; set; }
-
-		/// <summary>
-		/// 机构对象
-		/// </summary>
-		public OrgDto Organize { get; set; }
-
-		/// <summary>
-		/// 机构对象
-		/// </summary>
-		public OrgDto CrOrganize { get; set; }
 	}
 
 
@@ -774,10 +775,20 @@ namespace Hotline.Share.Dtos.Order
 	    /// </summary>
 	    public string OrgId { get; set; }
 
-	    /// <summary>
-	    /// 催办状态
-	    /// </summary>
-	    public int State { get; set; }
+		/// <summary>
+		/// 被催办部门名称
+		/// </summary>
+		public string OrgName { get; set; }
+
+		/// <summary>
+		/// 创建部门名称
+		/// </summary>
+		public string? CreatorOrgName { get; set; }
+
+		/// <summary>
+		/// 催办状态
+		/// </summary>
+		public int State { get; set; }
 
 	    /// <summary>
 	    /// 催办签收时间
@@ -821,15 +832,5 @@ namespace Hotline.Share.Dtos.Order
 	    /// 工单对象
 	    /// </summary>
 	    public OrderDto Order { get; set; }
-
-	    /// <summary>
-	    /// 机构对象
-	    /// </summary>
-	    public OrgDto  Organize { get; set; }
-
-	    /// <summary>
-	    /// 机构对象
-	    /// </summary>
-	    public OrgDto CrOrganize { get; set; }
 	}
 }

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

@@ -33,6 +33,11 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public string OrgId { get; set; }
 
+		/// <summary>
+		/// 被督办部门名称
+		/// </summary>
+		public string OrgName { get; set; }
+
 		/// <summary>
 		/// 督办回复时限
 		/// </summary>

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

@@ -10,7 +10,7 @@ namespace Hotline.Share.Dtos.Order
 	public class OrderUrgeDto
 	{
 		/// <summary> 
-		/// 督办状态
+		/// 催办状态
 		/// </summary>
 		public int? State { get; set; }
 
@@ -28,16 +28,22 @@ namespace Hotline.Share.Dtos.Order
 		public string OrderId { get; set; }
 
 		/// <summary>
-		/// 被督办部门ID
+		/// 被催办部门ID
 		/// </summary>
 		public string OrgId { get; set; }
+
+		/// <summary>
+		/// 被催办部门名称
+		/// </summary>
+		public string OrgName { get; set; }
+
 		/// <summary>
-		/// 督办回复时限
+		/// 催办回复时限
 		/// </summary>
 		public DateTime ReplyLimitTime { get; set; }
 
 		/// <summary>
-		/// 督办申请内容
+		/// 催办申请内容
 		/// </summary>
 		public string ApplyContent { get; set; }
 	}
@@ -47,7 +53,7 @@ namespace Hotline.Share.Dtos.Order
 		public string Id { get; set; }
 
 		/// <summary>
-		/// 督办回复内容
+		/// 催办回复内容
 		/// </summary>
 		public string ReplyContent { get; set; }
 

src/Hotline/Orders/OrderSupervise.cs

@@ -26,6 +26,18 @@ namespace Hotline.Orders {
 		[SugarColumn(ColumnDescription = "被督办部门ID")]
 		public string OrgId { get; set; }
 
+		/// <summary>
+		/// 被督办部门名称
+		/// </summary>
+		[SugarColumn(ColumnDescription = "被督办部门名称")]
+		public string OrgName { get; set; }
+
+		/// <summary>
+		/// 创建部门名称
+		/// </summary>
+		[SugarColumn(ColumnDescription = "创建部门名称")]
+		public string? CreatorOrgName { get; set; }
+
 		/// <summary>
 		/// 督办状态
 		/// </summary>
@@ -73,18 +85,7 @@ namespace Hotline.Orders {
 		/// 
 		/// </summary>
 		[Navigate(NavigateType.OneToOne, nameof(OrderId))]
-		public Order? Order { get; set; }
+		public Order Order { get; set; }
 
-		/// <summary>
-		/// 
-		/// </summary>
-		[Navigate(NavigateType.OneToOne, nameof(OrgId))]
-		public SystemOrganize? Organize { get; set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		[Navigate(NavigateType.OneToOne, nameof(CreatorOrgId))]
-		public SystemOrganize? CrOrganize { get; set; }
 	}
 }

src/Hotline/Orders/OrderUrge.cs

@@ -20,6 +20,18 @@ namespace Hotline.Orders {
 		[SugarColumn(ColumnDescription = "被催办部门ID")]
 		public string OrgId { get; set; }
 
+		/// <summary>
+		/// 被催办部门名称
+		/// </summary>
+		[SugarColumn(ColumnDescription = "被催办部门名称")]
+		public string OrgName { get; set; }
+
+		/// <summary>
+		/// 创建部门名称
+		/// </summary>
+		[SugarColumn(ColumnDescription = "创建部门名称")]
+		public string? CreatorOrgName { get; set; }
+
 		/// <summary>
 		/// 催办状态
 		/// </summary>
@@ -69,18 +81,6 @@ namespace Hotline.Orders {
 		[Navigate(NavigateType.OneToOne, nameof(OrderId))]
 		public Order? Order { get; set; }
 
-		/// <summary>
-		/// 
-		/// </summary>
-		[Navigate(NavigateType.OneToOne, nameof(OrgId))]
-		public SystemOrganize? Organize { get; set; }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		[Navigate(NavigateType.OneToOne, nameof(CreatorOrgId))]
-		public SystemOrganize? CrOrganize { get; set; }
-
 	}
 }