XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-04-14 11:03:01 +08:00
parent 6ac057a0c7
commit b6b5d3e4c9
10 changed files with 19521 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs
View File

@ -34,6 +34,8 @@ public class ServiceVerifyConfigOption
[Description("修改密码的天数")]
public int ChangePassWordDays { get; set; }
public SysTemplateType TemplateType { get; set; }
public string ThirdPdfUrl { get; set; }
}

17
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1600,7 +1600,7 @@
<param name="_userInfo"></param>
<param name="_localizer"></param>
</member>
<member name="M:IRaCIS.Core.Application.Service.TrialFileTypeService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFileType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SysFileType},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
<member name="M:IRaCIS.Core.Application.Service.TrialFileTypeService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFileType},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SysFileType},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
<summary>
项目文件类型
</summary>
@ -14717,6 +14717,11 @@
<member name="T:IRaCIS.Core.Application.ViewModel.PublishLogAddOrEdit">
<summary> PublishLogAddOrEdit 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.SysFileTypeAddOrEdit.SysTemplateTypeEnum">
<summary>
文档类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.SysFileTypeAddOrEdit.ShowOrder">
<summary>
显示顺序
@ -15866,6 +15871,16 @@
<member name="T:IRaCIS.Core.Application.Contracts.SystemDocumentAddOrEdit">
<summary> SystemDocumentAddOrEdit 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SystemDocumentAddOrEdit.CurrentStaffTrainDays">
<summary>
现有员工培训天数
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SystemDocumentAddOrEdit.NewStaffTrainDays">
<summary>
新员工培训天数
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.TrialDocumentUserConfirmView">
<summary> TrialDocumentUserConfirmView 列表视图模型 </summary>
</member>

5
IRaCIS.Core.Application/Service/Document/DTO/SysFileTypeViewModel.cs
View File

@ -25,6 +25,11 @@ public class SysFileTypeAddOrEdit
public ArchiveType ArchiveTypeEnum { get; set; }
/// <summary>
/// 文档类型
/// </summary>
public SysTemplateType SysTemplateTypeEnum { get; set; }
public bool IsConfirmRecord { get; set; }
public bool IsEnable { get; set; }

11
IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
View File

@ -267,6 +267,17 @@ namespace IRaCIS.Core.Application.Contracts
public DocUserSignType DocUserSignType { get; set; }
/// <summary>
/// 现有员工培训天数
/// </summary>
public int? CurrentStaffTrainDays { get; set; }
/// <summary>
/// 新员工培训天数
/// </summary>
public int? NewStaffTrainDays { get; set; }
}
public class AddOrEditSystemDocument : SystemDocumentAddOrEdit

4
IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs
View File

@ -13,6 +13,7 @@ using System.Threading.Tasks;
using IRaCIS.Core.Infra.EFCore;
using MassTransit;
using IRaCIS.Core.Infrastructure;
using Microsoft.Extensions.Options;
namespace IRaCIS.Core.Application.Service;
/// <summary>
@ -24,7 +25,7 @@ namespace IRaCIS.Core.Application.Service;
/// <param name="_localizer"></param>
[ApiExplorerSettings(GroupName = "FileRecord")]
public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepository,
IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
IRepository<TrialFile> _trialFileRepository,
IRepository<SysFileType> _sysFileTypeRepository,
IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialFileTypeService
@ -116,6 +117,7 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
if (!(await _trialFileTypeRepository.AnyAsync(x => x.TrialId == inDto.TrialId)))
{
var trialFileTypeList = await _sysFileTypeRepository
.Where(x=>x.SysTemplateTypeEnum== _verifyConfig.CurrentValue.TemplateType|| x.SysTemplateTypeEnum==SysTemplateType.Both)
.ProjectTo<TrialFileType>(_mapper.ConfigurationProvider)
.ToListAsync();

49
IRaCIS.Core.Domain/Document/SystemDocument.cs
View File

@ -1,3 +1,5 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统签署文档")]
@ -22,6 +24,53 @@ public class SystemDocument : BaseFullDeleteAuditEntity
public string Path { get; set; } = string.Empty;
public DocUserSignType DocUserSignType { get; set; }
/// <summary>
/// 现有员工培训天数
/// </summary>
public int? CurrentStaffTrainDays { get; set; }
/// <summary>
/// 新员工培训天数
/// </summary>
public int? NewStaffTrainDays { get; set; }
}
[Comment("后台 - 系统签署文档附件")]
[Table("SystemDocumentAttachment")]
public class SystemDocumentAttachment : BaseFullAuditEntity
{
/// <summary>
/// 系统文档Id
/// </summary>
public Guid SystemDocumentId { get; set; }
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 是否下线
/// </summary>
public bool OffLine { get; set; }
/// <summary>
/// 文件路径
/// </summary>
[StringLength(1000)]
public string FilePath { get; set; } = string.Empty;
/// <summary>
/// 文件大小
/// </summary>
public decimal? FileSize { get; set; }
/// <summary>
/// 文件类型
/// </summary>
public string FileFormat { get; set; } = string.Empty;
}
public enum DocUserSignType

28
IRaCIS.Core.Domain/FileRecord/FileType.cs
View File

@ -39,6 +39,29 @@ public enum ArchiveType
}
/// <summary>
/// 文档模板
/// </summary>
public enum SysTemplateType
{
/// <summary>
/// Elevate
/// </summary>
Elevate = 1,
/// <summary>
/// Extensive
/// </summary>
Extensive = 2,
/// <summary>
/// Both
/// </summary>
Both = 3,
}
/// <summary>
/// 文档子类标识
@ -105,6 +128,11 @@ public class SysFileType : BaseFullAuditEntity
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 文档类型
/// </summary>
public SysTemplateType SysTemplateTypeEnum { get; set; } = SysTemplateType.Extensive;
}
[Comment("项目文件 - 文件类型表")]

19349
IRaCIS.Core.Infra.EFCore/Migrations/20250414030028_SystemDocumentAttachment.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

49
IRaCIS.Core.Infra.EFCore/Migrations/20250414030028_SystemDocumentAttachment.cs Normal file
View File

@ -0,0 +1,49 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class SystemDocumentAttachment : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "CurrentStaffTrainDays",
table: "SystemDocument",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "NewStaffTrainDays",
table: "SystemDocument",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "SysTemplateTypeEnum",
table: "SysFileType",
type: "int",
nullable: false,
defaultValue: 0);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CurrentStaffTrainDays",
table: "SystemDocument");
migrationBuilder.DropColumn(
name: "NewStaffTrainDays",
table: "SystemDocument");
migrationBuilder.DropColumn(
name: "SysTemplateTypeEnum",
table: "SysFileType");
}
}
}

9
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -9152,6 +9152,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("int")
.HasComment("子类标识，是取那个表的数据");
b.Property<int>("SysTemplateTypeEnum")
.HasColumnType("int");
b.Property<DateTime>("UpdateTime")
.HasColumnType("datetime2");
@ -9645,6 +9648,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier");
b.Property<int?>("CurrentStaffTrainDays")
.HasColumnType("int");
b.Property<Guid?>("DeleteUserId")
.HasColumnType("uniqueidentifier");
@ -9665,6 +9671,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<int?>("NewStaffTrainDays")
.HasColumnType("int");
b.Property<string>("Path")
.IsRequired()
.HasMaxLength(1000)