2 Ревизии 9c547c9cc5 ... 9d4a83a3c5

Автор SHA1 Съобщение Дата
  yuanrf 9d4a83a3c5 Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop преди 1 месец
  yuanrf 369a46dd3c 备注添加 преди 1 месец
променени са 2 файла, в които са добавени 9 реда и са изтрити 3 реда
  1. 7 3
      OASystem/OASystem.Api/Controllers/TaskController.cs
  2. 2 0
      OASystem/OASystem.Domain/Dtos/Task/GetTaskDefaultDto.cs

+ 7 - 3
OASystem/OASystem.Api/Controllers/TaskController.cs

@@ -328,7 +328,8 @@ namespace OASystem.API.Controllers
                         EndTime = endTime,
                         DurationHours = item.DurationHours,
                         IsExtraTask = false,
-                        Sort = i
+                        Sort = i,
+                        Remark = item.Remark
                     });
                     i++;
                     thisTime = endTime;
@@ -467,7 +468,8 @@ namespace OASystem.API.Controllers
                         EndTime = x.EndTime,
                         IsExtraTask = x.IsExtraTask,
                         Name = x.Name,
-                        Sort = x.Sort
+                        Sort = x.Sort,
+                        Remark = x.Remark
                     }).ToList();
                     _sqlsugar.Insertable(workTasks).ExecuteCommand();
                     _sqlsugar.CommitTran();
@@ -505,7 +507,9 @@ namespace OASystem.API.Controllers
                         EndTime = x.EndTime,
                         IsExtraTask = x.IsExtraTask,
                         Name = x.Name,
-                        Sort = x.Sort
+                        Sort = x.Sort,
+                        Remark = x.Remark
+
                     }).ToList();
 
                     var insertArr = workTasks.Where(x => x.Id == 0).ToList();

+ 2 - 0
OASystem/OASystem.Domain/Dtos/Task/GetTaskDefaultDto.cs

@@ -131,6 +131,8 @@ namespace OASystem.Domain.Dtos.Task
         public int WorkOrderId { get; set; }
 
         public int Sort { get; set; }
+
+        public string Remark { get; set; }
     }
 
     public class WorkOrdeView