Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-04-14 14:23:49 +08:00
commit c37b6c4c84
1 changed files with 9 additions and 5 deletions

View File

@ -108,21 +108,25 @@ namespace IRaCIS.Core.Application.Contracts
public int AttachmentCount { get; set; }
public DateTime? SuggestFinishTime { get {
public DateTime? SuggestFinishTime
{
get
{
if (this.CreateTime > this.UserCreateTime && this.CurrentStaffTrainDays != null)
{
return this.CreateTime.AddDays(this.CurrentStaffTrainDays.Value);
return DateTime.Parse(this.CreateTime.AddDays(this.CurrentStaffTrainDays.Value).ToString("yyyy-MM-dd")+" 22:00:00");
}
if (this.CreateTime < this.UserCreateTime && this.NewStaffTrainDays != null)
{
return this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value);
return DateTime.Parse(this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value).ToString("yyyy-MM-dd") + " 22:00:00");
}
return null;
} }
}
}
public string DocTypeCode { get; set; }