代码修改

IRaCIS.Core.Application/Service/Document/DTO/SysFileTypeViewModel.cs

@@ -50,6 +50,8 @@ public class SysFileTypeQuery : PageInput
 {
     public ArchiveType? ArchiveTypeEnum { get; set; }
 
+    public SysTemplateType? SysTemplateTypeEnum { get; set; }
+
     public bool? IsConfirmRecord { get; set; }
 
     public bool? IsEnable { get; set; }

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -17,6 +17,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string FileType { get; set; } = string.Empty;
 
+        public int AttachmentCount { get; set; }
+
         public List<NeedConfirmedUserTypeView> NeedConfirmedUserTypeList { get; set; } = new List<NeedConfirmedUserTypeView>();
     }
 
@@ -46,6 +48,9 @@ namespace IRaCIS.Core.Application.Contracts
     public class UnionDocumentWithConfirmInfoView : UnionDocumentView
     {
 
+        public DateTime UserCreateTime { get; set; }
+
+
 
         public DateTime? ConfirmTime { get; set; }
 
@@ -58,6 +63,24 @@ namespace IRaCIS.Core.Application.Contracts
         public string RealName { get; set; } = string.Empty;
 
 
+        public int AttachmentCount { get; set; }
+
+        public DateTime? SuggestFinishTime { get {
+
+                if (this.CreateTime > this.UserCreateTime && this.CurrentStaffTrainDays != null)
+                {
+                    return this.CreateTime.AddDays(this.CurrentStaffTrainDays.Value);
+                }
+
+                if (this.CreateTime < this.UserCreateTime && this.NewStaffTrainDays != null)
+                {
+                    return this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value);
+                }
+
+                return null;
+            
+            } }
+
         public string DocTypeCode { get; set; }
 
         public List<string> UserConfirmedUserTypeList => (DocNeedSignUserTypeList != null && IdentityUserTypeList != null) ? IdentityUserTypeList.Intersect(DocNeedSignUserTypeList).ToList() : new List<string>();