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

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 running Details

Uat_IRC_Net8
hang 2026-05-12 11:45:56 +08:00
parent 577f35a3fe 790ac40f4e
commit 030aa36f94
8 changed files with 22285 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17429,17 +17429,17 @@
</member>
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
<summary>
质疑
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
</summary>
</member>
<member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
<summary>
一致性核查
һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
<summary>
复制
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
@ -18242,6 +18242,11 @@
文件大小，单位字节
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.SegmentationVersionView.StartTime">
<summary>
版本开始时间
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.SegmentBindingView.IsLock">
<summary>
是否锁定

2
IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs
View File

@ -103,7 +103,7 @@ namespace IRaCIS.Core.Application.Service
addOrEditUserFeedBack.SubjectVisitId = info.SourceSubjectVisitId;
}
addOrEditUserFeedBack.State = 0;//设置解决后IR 更新反馈自动变为未解决
//addOrEditUserFeedBack.State = 0;//设置解决后IR 更新反馈自动变为未解决
}
else if (addOrEditUserFeedBack.SubjectVisitId != null)

9
IRaCIS.Core.Application/Service/Reading/Dto/SegmentationViewModel.cs
View File

@ -94,11 +94,20 @@ public class SegmentationVersionView
public long FileSize { get; set; }
public DateTime CreateTime { get; set; }
public string CreateUserName { get; set; }
/// <summary>
/// 版本开始时间
/// </summary>
public DateTime? StartTime { get; set; }
}
public class SaveSegmentationVersionAsyncInDto
{
public Guid SegmentationId { get; set; }
public string SEGUrl { get; set; }
public bool IsRestore { get; set; } = false;
}
public class SegmentationVersionQuery : PageInput

11
IRaCIS.Core.Application/Service/Reading/Segment/SegmentationService.cs
View File

@ -78,7 +78,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
if (addOrEditSegmentation.Id != null)
{
await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId = addOrEditSegmentation.Id.Value });
await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId = addOrEditSegmentation.Id.Value,SEGUrl=addOrEditSegmentation.SEGUrl });
}
var entity = await _segmentationRepository.InsertOrUpdateAsync(addOrEditSegmentation, true);
return ResponseOutput.Ok(entity.Id.ToString());
@ -94,16 +94,16 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
var data = await _segmentationRepository.FirstOrDefaultNoTrackingAsync(x => x.Id == inDto.SegmentationId);
var segmentList = await _segmentRepository.Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).ProjectTo<SegmentVersionData>(_mapper.ConfigurationProvider).ToListAsync();
if (data.SEGUrl != string.Empty)
if (data.SEGUrl != string.Empty&&(inDto.SEGUrl!=data.SEGUrl||inDto.IsRestore))
{
// 如果是新增或修改，记录一条版本信息
var maxVersion = await _segmentationVersionRepository
.Where(x => x.SegmentationId == data.Id)
.OrderByDescending(x => x.Version)
.Select(x => x.Version)
.FirstOrDefaultAsync();
var newVersion = maxVersion + 1;
var newVersion = maxVersion == null ? 1 : maxVersion.Version + 1;
var startTime = maxVersion != null ? maxVersion.CreateTime : data.UpdateTime ;
var versionEntity = new SegmentationVersion
{
@ -113,6 +113,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
SEGUrl = data.SEGUrl,
FileSize = data.FileSize,
SegmentList= segmentList,
StartTime= startTime,
};
await _segmentationVersionRepository.AddAsync(versionEntity);
@ -151,7 +152,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
var version = await _segmentationVersionRepository.Where(x => x.Id == inDto.VersionId && x.SegmentationId == inDto.SegmentationId).FirstNotNullAsync();
var segmentation = await _segmentationRepository.Where(x => x.Id == inDto.SegmentationId).FirstNotNullAsync();
await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId=inDto.SegmentationId});
await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId=inDto.SegmentationId,IsRestore=true,});
await _segmentationRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.SegmentationId, t => new Segmentation
{
SegmentationJson = version.SegmentationJson,

5
IRaCIS.Core.Domain/Reading/Segment/SegmentationVersion.cs
View File

@ -39,6 +39,11 @@ public class SegmentationVersion : BaseAddAuditEntity
/// </summary>
public long FileSize { get; set; } = 0;
/// <summary>
/// 版本开始时间
/// </summary>
public DateTime? StartTime { get; set; }
/// <summary>
/// SgenmentList
/// </summary>

22224
IRaCIS.Core.Infra.EFCore/Migrations/20260511073220_maxVersionStartTime.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
IRaCIS.Core.Infra.EFCore/Migrations/20260511073220_maxVersionStartTime.cs Normal file
View File

@ -0,0 +1,29 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class maxVersionStartTime : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "StartTime",
table: "SegmentationVersion",
type: "datetime2",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "StartTime",
table: "SegmentationVersion");
}
}
}

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

@ -9585,6 +9585,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<DateTime?>("StartTime")
.HasColumnType("datetime2");
b.Property<int>("Version")
.HasColumnType("int");