浏览代码

更改实际时间接口调整 datetime 参数

Lyyyi 1 周之前
父节点
当前提交
b178f3e608

+ 3 - 2
OASystem/OASystem.Domain/Dtos/Groups/VisaProcessDtos.cs

@@ -97,9 +97,10 @@ namespace OASystem.Domain.Dtos.Groups
         /// 实际完成时间
         /// 情况1:正常使用
         /// 情况2:IsAssist == true,设置值
-        /// 情况3:IsFileUp == true,设置值
+        /// 情况3:IsPart == true,设置值
+        /// 情况4:IsFileUp == true,设置值
         /// </summary>
-        public DateTime ActualDone { get; set; }
+        public string ActualDone { get; set; }
 
         /// <summary>
         /// 当前用户Id  

+ 8 - 4
OASystem/OASystem.Infrastructure/Repositories/Groups/ProcessOverviewRepository.cs

@@ -759,14 +759,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
         }
 
         /// <summary>
-        /// 更新签证节点信息及状态
+        /// 更新节点信息及状态
         /// </summary>
         /// <param name="dto">签证节点更新数据传输对象</param>
         /// <returns>操作结果</returns>
         public async Task<Result> SetActualDoneAsync(GroupProcessSetActualDoneDto dto )
         {
             int nodeId = dto.NodeId;
-            DateTime dt = dto.ActualDone;
+            var isDtNul = DateTime.TryParse(dto.ActualDone,out DateTime actualDone);
             int currUserId = dto.CurrUserId;
             bool isAssist = dto.IsAssist;
             bool isFileUp = dto.IsFileUp;
@@ -794,7 +794,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 IsCurrent = node.IsCurrent
             };
 
-            node.ActualDone = dt;
+            if (isDtNul)
+            {
+                node.ActualDone = actualDone;
+            }
+            
             node.IsAssist = isAssist;
             node.IsFileUp = isFileUp;
             node.IsPart = isPart;
@@ -803,7 +807,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             await _sqlSugar.Updateable(node)
                 .UpdateColumns(n => new
                 {
-                    n.ActualDone,
+                    ActualDone = isDtNul ? node.ActualDone : null,
                     n.IsAssist,
                     n.IsFileUp,
                     n.IsPart,