督办DTO 实体修改

src/Hotline.Api/Controllers/OrderController.cs

@@ -663,6 +663,7 @@ public class OrderController : BaseController
 
         var model = _mapper.Map<OrderSupervise>(dto);
         model.CreatorOrgName = _sessionContext.OrgName;
+        model.CrUser = _sessionContext.UserName;
         model.State = 0;
         var id = await _orderSuperviseRepository.AddAsync(model, HttpContext.RequestAborted);
         if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, id, HttpContext.RequestAborted);
@@ -690,7 +691,8 @@ public class OrderController : BaseController
             throw UserFriendlyException.SameMessage("督办已回复,请勿重复回复");
         _mapper.Map(dto, supervise);
 		supervise.ReplyId = _sessionContext.UserId;
-        supervise.ReplyTime = DateTime.Now;
+		supervise.ReUser = _sessionContext.UserName;
+		supervise.ReplyTime = DateTime.Now;
         supervise.State = 1;
         if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, supervise.Id, HttpContext.RequestAborted);
         await _orderSuperviseRepository.UpdateAsync(supervise, HttpContext.RequestAborted);
@@ -773,7 +775,8 @@ public class OrderController : BaseController
 
         var model = _mapper.Map<OrderUrge>(dto);
         model.CreatorOrgName = _sessionContext.OrgName;
-        model.State = 0;
+        model.CrUser = _sessionContext.UserName;
+		model.State = 0;
 		var id = await _orderUrgeRepository.AddAsync(model, HttpContext.RequestAborted);
 		if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, id, HttpContext.RequestAborted);
 		if (dto.AcceptSms)
@@ -801,7 +804,8 @@ public class OrderController : BaseController
 
         _mapper.Map(dto, urge);
 		urge.ReplyId = _sessionContext.UserId;
-        urge.ReplyContent = dto.ReplyContent;
+		urge.ReUser = _sessionContext.UserName;
+		urge.ReplyContent = dto.ReplyContent;
 		urge.ReplyTime = DateTime.Now;
         urge.State = 1;
         if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, urge.Id, HttpContext.RequestAborted);

src/Hotline.Api/config/appsettings.Development.json

@@ -54,7 +54,7 @@
     }
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": false,
+    "ApplyDbMigrations": true,
     "ApplySeed": false
   },
   "MqConfiguration": {

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

@@ -759,8 +759,8 @@ namespace Hotline.Share.Dtos.Order
 		/// 工单对象
 		/// </summary>
 		public OrderDto Order { get; set; }
-        public RestDto ReUser { get; set; }
-        public RestDto CrUser { get; set; }
+        public string ReUser { get; set; }
+        public string CrUser { get; set; }
     }
 
 
@@ -845,8 +845,8 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public OrderDto Order { get; set; }
 
-		public RestDto ReUser { get; set; }
+		public string ReUser { get; set; }
 
-		public RestDto CrUser { get; set; }
+		public string CrUser { get; set; }
 	}
 }

src/Hotline/Orders/OrderSupervise.cs

@@ -79,11 +79,10 @@ namespace Hotline.Orders {
 		[Navigate(NavigateType.OneToOne, nameof(OrderId))]
 		public Order Order { get; set; }
 
+		[SugarColumn(ColumnDescription = "回复人")]
+		public string ReUser { get; set; }
 
-		[Navigate(NavigateType.OneToOne, nameof(ReplyId))]
-		public User ReUser { get; set; }
-
-		[Navigate(NavigateType.OneToOne, nameof(CreatorId))]
-		public User CrUser { get; set; }
+		[SugarColumn(ColumnDescription = "申请人")]
+		public string CrUser { get; set; }
 	}
 }

src/Hotline/Orders/OrderUrge.cs

@@ -79,11 +79,11 @@ namespace Hotline.Orders {
 		[Navigate(NavigateType.OneToOne, nameof(OrderId))]
 		public Order Order { get; set; }
 
-		[Navigate(NavigateType.OneToOne, nameof(ReplyId))]
-		public User ReUser { get; set; }
+		[SugarColumn(ColumnDescription = "回复人")]
+		public string ReUser { get; set; }
 
-		[Navigate(NavigateType.OneToOne, nameof(CreatorId))]
-		public User CrUser { get; set; }
+		[SugarColumn(ColumnDescription = "申请人")]
+		public string CrUser { get; set; }
 
 	}
 }