From f61ce70b82a788a27898e1b9c7cc87a0ac2f1cc8 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 20 Feb 2025 15:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E7=BB=9F=E8=AE=A1=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrialSiteUser/PersonalWorkstation.cs | 2 +- IRaCIS.Core.Domain/FileRecord/FileType.cs | 90 ++++++++++ IRaCIS.Core.Domain/FileRecord/TrialRecord.cs | 165 ++++++++++++++++++ 3 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 IRaCIS.Core.Domain/FileRecord/FileType.cs create mode 100644 IRaCIS.Core.Domain/FileRecord/TrialRecord.cs diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index f8a8ad884..b41adefae 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -1119,7 +1119,7 @@ namespace IRaCIS.Core.Application var isInternal = _userInfo.IsZhiZhun; - var needSignTrialCount = await _trialRepository.Where(t => t.TrialStatusStr != StaticData.TrialState.TrialStopped) + var needSignTrialCount = await _trialRepository.Where(t => t.TrialStatusStr == StaticData.TrialState.TrialOngoing) .Where(t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId))) .Where(c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null)).Count() > 0).CountAsync(); diff --git a/IRaCIS.Core.Domain/FileRecord/FileType.cs b/IRaCIS.Core.Domain/FileRecord/FileType.cs new file mode 100644 index 000000000..29f743b73 --- /dev/null +++ b/IRaCIS.Core.Domain/FileRecord/FileType.cs @@ -0,0 +1,90 @@ +using IRaCIS.Core.Domain.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace IRaCIS.Core.Domain.FileRecord +{ + public enum ArchiveType + { + //报告 + Report = 1, + + //文档 + Doc = 2, + + //记录 + Record = 3 + } + + [Comment("后台 - 系统文件记录表")] + [Table("SysFileRecord")] + public class SysFileRecord : BaseFullAuditEntity + { + [Comment("关联系统文件类型")] + public Guid SysFileTypeId { get; set; } + + + public string FileName { get; set; } + + [StringLength(1000)] + public string FilePath { get; set; } + + public string FileSize { get; set; } + + public string FileFormat { get; set; } + + } + + [Comment("后台 - 系统文件类型表")] + [Table("SysFileType")] + public class SysFileType : BaseFullAuditEntity + { + + [Comment("报告、文档、记录")] + public ArchiveType ArchiveTypeEnum { get; set; } + + public string Name { get; set; } + + public string NameCN { get; set; } + + [Comment("子类标识，是取那个表的数据")] + public int SubIdentification { get; set; } + + } + + [Comment("项目文件 - 文件类型表")] + [Table("TrialFileType")] + public class TrialFileType : BaseFullAuditEntity + { + + public Guid TrialId { get; set; } + + [Comment("报告、文档、记录")] + public ArchiveType ArchiveTypeEnum { get; set; } + + public string Name { get; set; } + + public string NameCN { get; set; } + + [Comment("是否确认收入项")] + public bool IsConfirmRecord { get; set; } + + + [Comment("首次定稿日期")] + public DateOnly FirstFinalDate { get; set; } + + [Comment("是否自定义")] + public bool IsSelfDefine { get; set; } + + + [Comment("子类标识，是取那个表的数据")] + public int SubIdentification { get; set; } + + [Comment("启动会日期")] + public DateOnly? StartupDate { get; set; } + + } +} diff --git a/IRaCIS.Core.Domain/FileRecord/TrialRecord.cs b/IRaCIS.Core.Domain/FileRecord/TrialRecord.cs new file mode 100644 index 000000000..4d4387654 --- /dev/null +++ b/IRaCIS.Core.Domain/FileRecord/TrialRecord.cs @@ -0,0 +1,165 @@ +using IRaCIS.Core.Domain.Models; +using MassTransit.Futures.Contracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace IRaCIS.Core.Domain.FileRecord +{ + [Comment("项目文件 - 定稿记录表")] + [Table("TrialFinalRecord")] + public class TrialFinalRecord : BaseFullAuditEntity + { + public Guid TrialId { get; set; } + + [Comment("关联项目文件类型")] + public Guid TrialFileTypeId { get; set; } + + + public string Name { get; set; } + + public string Version { get; set; } + + + #region 文件控制 + public int State { get; set; } + + [Comment("是否授权查看")] + public bool IsAuthorizedView { get; set; } + #endregion + + + [Comment("定稿PDF")] + public Guid PDFTrialFileRecordId { get; set; } + + [Comment("定稿Word")] + public Guid WordTrialFileRecordId { get; set; } + + [Comment("签名页")] + public Guid SignTrialFileRecordId { get; set; } + + [Comment("历史记录")] + public Guid HistoryTrialFileRecordId { get; set; } + + + #region 废弃 + + [Comment("定稿PDF名字")] + public string PDFName { get; set; } + + public string PDFPath { get; set; } + + [Comment("定稿Word名字")] + public string WordName { get; set; } + + public string WordPath { get; set; } + + [Comment("签名页名字")] + public string SignFileName { get; set; } + + public string SignFilePath { get; set; } + + + + [Comment("历史记录名字")] + public string HistoryRecordFileName { get; set; } + + public string HistoryRecordFilePath { get; set; } + + #endregion + + + } + + + + [Comment("项目文件 - 一般文件记录表")] + [Table("TrialNormalFileRecord")] + public class TrialNormalFileRecord : BaseFullAuditEntity + { + public Guid TrialId { get; set; } + + [Comment("关联项目文件类型")] + public Guid TrialFileTypeId { get; set; } + + #region 文件控制 + public int State { get; set; } + + [Comment("是否授权查看")] + public bool IsAuthorizedView { get; set; } + #endregion + + + [Comment("关联具体的文件记录，记录里面有大小，格式，名称")] + public Guid TrialFileRecordId { get; set; } + + #region 废弃 + + public string FileName { get; set; } + + [StringLength(1000)] + public string FilePath { get; set; } + + public string FileSize { get; set; } + + public string FileFormat { get; set; } + + #endregion + + + } + + + [Comment("项目文件 - 培训记录表")] + [Table("TrialTrianingRecord")] + public class TrialTrianingRecord : BaseFullAuditEntity + { + public Guid TrialId { get; set; } + + [Comment("关联项目文件类型")] + public Guid TrialFileTypeId { get; set; } + + #region 培训记录相关字段 + public DateOnly TrianingDate { get; set; } + + public int TrianingCount { get; set; } + + [Comment("培训效果")] + public int TrianingState { get; set; } + + #endregion + + #region 文件控制 + public int State { get; set; } + + [Comment("是否授权查看")] + public bool IsAuthorizedView { get; set; } + + #endregion + + [Comment("关联具体的文件记录，记录里面有大小，格式，名称")] + public Guid TrialFileRecordId { get; set; } + + public string Note { get; set; } + + } + + [Comment("项目文件 - 文件记录表")] + [Table("TrialFileRecord")] + public class TrialFileRecord : BaseFullAuditEntity + { + public Guid TrialId { get; set; } + + public string FileName { get; set; } + + [StringLength(1000)] + public string FilePath { get; set; } + + public string FileSize { get; set; } + + public string FileFormat { get; set; } + + } +}