|
|
@@ -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,
|