Compare commits
No commits in common. "fecbc276c877f6b22fa202996d3690531cf155d7" and "6b9f108fe1ad51624658a2c1cffc9260cccb9e5c" have entirely different histories.
fecbc276c8
...
6b9f108fe1
|
|
@ -40,7 +40,7 @@ public class SegmentAddOrEdit
|
||||||
|
|
||||||
public decimal? Peak { get; set; }
|
public decimal? Peak { get; set; }
|
||||||
|
|
||||||
public int SegmentNumber { get; set; }
|
public int SegmentMumber { get; set; }
|
||||||
|
|
||||||
public string SegmentName { get; set; }
|
public string SegmentName { get; set; }
|
||||||
|
|
||||||
|
|
@ -80,7 +80,7 @@ public class SegmentQuery:PageInput
|
||||||
|
|
||||||
public decimal? Peak { get; set; }
|
public decimal? Peak { get; set; }
|
||||||
|
|
||||||
public int? SegmentNumber { get; set; }
|
public int? SegmentMumber { get; set; }
|
||||||
|
|
||||||
public string? SegmentName { get; set; }
|
public string? SegmentName { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
|
||||||
.WhereIf(inQuery.Id != null, x => x.Id == inQuery.Id)
|
.WhereIf(inQuery.Id != null, x => x.Id == inQuery.Id)
|
||||||
.ProjectTo<SegmentView>(_mapper.ConfigurationProvider);
|
.ProjectTo<SegmentView>(_mapper.ConfigurationProvider);
|
||||||
|
|
||||||
var pageList = await segmentQueryable.ToPagedListAsync(inQuery,nameof(SegmentView.SegmentNumber));
|
var pageList = await segmentQueryable.ToPagedListAsync(inQuery,nameof(SegmentView.SegmentMumber));
|
||||||
|
|
||||||
return pageList;
|
return pageList;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 分割的序号
|
/// 分割的序号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int SegmentNumber { get; set; }
|
public int SegmentMumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 分割的Json
|
/// 分割的Json
|
||||||
|
|
|
||||||
|
|
@ -3734,7 +3734,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
segmentation.SegmentationName,
|
segmentation.SegmentationName,
|
||||||
segmentation.SEGUrl,
|
segmentation.SEGUrl,
|
||||||
segment.SegmentName,
|
segment.SegmentName,
|
||||||
segment.SegmentNumber,
|
segment.SegmentMumber,
|
||||||
segment.ColorRgb,
|
segment.ColorRgb,
|
||||||
|
|
||||||
QuestionName = questionName,
|
QuestionName = questionName,
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,28 +0,0 @@
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class SegmentNumber : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.RenameColumn(
|
|
||||||
name: "SegmentMumber",
|
|
||||||
table: "Segment",
|
|
||||||
newName: "SegmentNumber");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.RenameColumn(
|
|
||||||
name: "SegmentNumber",
|
|
||||||
table: "Segment",
|
|
||||||
newName: "SegmentMumber");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -9274,14 +9274,14 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("nvarchar(max)");
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
|
b.Property<int>("SegmentMumber")
|
||||||
|
.HasColumnType("int");
|
||||||
|
|
||||||
b.Property<string>("SegmentName")
|
b.Property<string>("SegmentName")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasMaxLength(400)
|
.HasMaxLength(400)
|
||||||
.HasColumnType("nvarchar(400)");
|
.HasColumnType("nvarchar(400)");
|
||||||
|
|
||||||
b.Property<int>("SegmentNumber")
|
|
||||||
.HasColumnType("int");
|
|
||||||
|
|
||||||
b.Property<Guid>("SegmentationId")
|
b.Property<Guid>("SegmentationId")
|
||||||
.HasColumnType("uniqueidentifier");
|
.HasColumnType("uniqueidentifier");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue