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-03-13 16:16:30 +08:00
parent b9bc1f6da0
commit ba9d3abc52
7 changed files with 19241 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1457,7 +1457,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.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},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>
@ -1494,6 +1494,20 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TrialFileTypeService.UploadTrialFileTypeFile(IRaCIS.Core.Application.ViewModel.UploadTrialFileTypeFileInDto)">
<summary>
上传同意入项记录
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TrialFileTypeService.GetTrialFileTypeFile(IRaCIS.Core.Application.ViewModel.GetTrialFileTypeFileInDto)">
<summary>
获取入项记录
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Core.Application.Service.TrialFinalRecordService">
<summary>
项目定稿记录
@ -14286,6 +14300,11 @@
<member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit">
<summary> TrialEmailNoticeConfigAddOrEdit 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.UploadTrialFileTypeFileInDto.FileRecord">
<summary>
文件
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.GetTrialFileTypeDataInDto.IsEnable">
<summary>
是否启用

4
IRaCIS.Core.Application/Service/Document/DTO/TrialTrianingRecordViewModel.cs
View File

@ -46,7 +46,7 @@ public class TrialTrianingRecordAddOrEdit
public DateOnly? TrianingDate { get; set; }
public int? TrianingState { get; set; }
public string? TrianingState { get; set; }
}
public class TrialTrianingRecordQuery : PageInput
@ -69,7 +69,7 @@ public class TrialTrianingRecordQuery : PageInput
public DateTime? UpdateEndTime { get; set; }
public int? TrianingState { get; set; }
public string? TrianingState { get; set; }
}

10
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -1395,20 +1395,20 @@ namespace IRaCIS.Core.Application
{
var studyNameList = await _trialRepository.Where(x=> x.Id == inDto.TrialId).Select(x=>x.StudyNameList).FirstOrDefaultAsync();
var trial = await _trialRepository.FirstOrDefaultAsync(x => x.Id == inDto.TrialId);
studyNameList = studyNameList.Where(x => x.IsChoose).ToList();
trial.StudyNameList = trial.StudyNameList.Where(x => x.IsChoose).ToList();
inDto.StudyNameList.ForEach(x =>
{
if (studyNameList.Any(y => y.Name == x.Name && y.EnName == x.EnName))
if (trial.StudyNameList.Any(y => y.Name == x.Name && y.EnName == x.EnName))
{
x.IsChoose = true;
}
});
await _trialRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.TrialId, x => new Trial() { StudyNameList = inDto.StudyNameList });
trial.StudyNameList = inDto.StudyNameList;
await _trialRepository.SaveChangesAsync();
return ResponseOutput.Ok();
}
}

2
IRaCIS.Core.Domain/FileRecord/TrialRecord.cs
View File

@ -156,7 +156,7 @@ public class TrialTrianingRecord : BaseFullAuditEntity
public int? TrianingCount { get; set; }
[Comment("培训效果")]
public int? TrianingState { get; set; }
public string? TrianingState { get; set; }
#endregion

19152
IRaCIS.Core.Infra.EFCore/Migrations/20250313075149_TrianingState.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

54
IRaCIS.Core.Infra.EFCore/Migrations/20250313075149_TrianingState.cs Normal file
View File

@ -0,0 +1,54 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class TrianingState : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "TrianingState",
table: "TrialTrianingRecord",
type: "nvarchar(400)",
maxLength: 400,
nullable: true,
comment: "培训效果",
oldClrType: typeof(int),
oldType: "int",
oldNullable: true,
oldComment: "培训效果");
migrationBuilder.AddColumn<Guid>(
name: "FileRecordId",
table: "TrialFileType",
type: "uniqueidentifier",
nullable: true,
comment: "文件Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "FileRecordId",
table: "TrialFileType");
migrationBuilder.AlterColumn<int>(
name: "TrianingState",
table: "TrialTrianingRecord",
type: "int",
nullable: true,
comment: "培训效果",
oldClrType: typeof(string),
oldType: "nvarchar(400)",
oldMaxLength: 400,
oldNullable: true,
oldComment: "培训效果");
}
}
}

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

@ -11958,6 +11958,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("CreateUserId")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FileRecordId")
.HasColumnType("uniqueidentifier")
.HasComment("文件Id");
b.Property<DateOnly?>("FirstFinalDate")
.HasColumnType("date")
.HasComment("首次定稿日期");
@ -13178,8 +13182,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<DateOnly?>("TrianingDate")
.HasColumnType("date");
b.Property<int?>("TrianingState")
.HasColumnType("int")
b.Property<string>("TrianingState")
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("培训效果");
b.Property<DateTime>("UpdateTime")