mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api,dal): В группу работ добавлено поле IsGroupByResponsible

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-03-20 15:50:00 +10:00
parent 42ac353198
commit 630b645267
7 changed files with 4295 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4166
PARR.DAL/Migrations/20260320054600_tblJobGroupAddIsGroupByResponsible.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

40
PARR.DAL/Migrations/20260320054600_tblJobGroupAddIsGroupByResponsible.cs Normal file
View File

@@ -0,0 +1,40 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblJobGroupAddIsGroupByResponsible : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsGroupByResponsible",
schema: "job",
table: "Groups",
type: "boolean",
nullable: true);
migrationBuilder.InsertData(
table: "ParrComponents",
columns: new[] { "Id", "Description", "Name" },
values: new object[] { 13, "Генератор шаблонов", "TemplateTaskGenerator" });
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "ParrComponents",
keyColumn: "Id",
keyValue: 13);
migrationBuilder.DropColumn(
name: "IsGroupByResponsible",
schema: "job",
table: "Groups");
}
}
}

69
PARR.DAL/Migrations/DataContextModelSnapshot.cs
View File

@@ -51,7 +51,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TemplateId");
b.ToTable("AgentHistories", (string)null);
b.ToTable("AgentHistories");
});
modelBuilder.Entity("PARR.DAL.Models.AgentHistoryLevel", b =>
@@ -72,7 +72,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("AgentHistoryLevels", (string)null);
b.ToTable("AgentHistoryLevels");
b.HasData(
new
@@ -101,7 +101,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("WorkGroupId");
b.ToTable("AppInWorkInWorkGroups", (string)null);
b.ToTable("AppInWorkInWorkGroups");
});
modelBuilder.Entity("PARR.DAL.Models.Application", b =>
@@ -130,7 +130,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name", "ApplicationTypeId")
.IsUnique();
b.ToTable("Applications", (string)null);
b.ToTable("Applications");
});
modelBuilder.Entity("PARR.DAL.Models.ApplicationInHost", b =>
@@ -157,7 +157,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("HostId");
b.ToTable("ApplicationsInHost", (string)null);
b.ToTable("ApplicationsInHost");
});
modelBuilder.Entity("PARR.DAL.Models.ApplicationType", b =>
@@ -181,7 +181,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("ApplicationTypes", (string)null);
b.ToTable("ApplicationTypes");
b.HasData(
new
@@ -294,7 +294,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("WorkId", "ApplicationId")
.IsUnique();
b.ToTable("ApplicationsInWorks", (string)null);
b.ToTable("ApplicationsInWorks");
});
modelBuilder.Entity("PARR.DAL.Models.DistributionPeriod", b =>
@@ -397,7 +397,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("EkStatuses", (string)null);
b.ToTable("EkStatuses");
b.HasData(
new
@@ -1516,7 +1516,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("WorkGroupId");
b.ToTable("Hosts", (string)null);
b.ToTable("Hosts");
});
modelBuilder.Entity("PARR.DAL.Models.Job.Job", b =>
@@ -1678,6 +1678,9 @@ namespace PARR.DAL.Migrations
b.Property<bool>("IsAutoDistributionEnabled")
.HasColumnType("boolean");
b.Property<bool?>("IsGroupByResponsible")
.HasColumnType("boolean");
b.Property<bool>("IsResponseAreaTimezone")
.HasColumnType("boolean");
@@ -1909,7 +1912,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TemplateId");
b.ToTable("Orders", (string)null);
b.ToTable("Orders");
});
modelBuilder.Entity("PARR.DAL.Models.OrderStatus", b =>
@@ -1930,7 +1933,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("OrderStatuses", (string)null);
b.ToTable("OrderStatuses");
b.HasData(
new
@@ -1983,7 +1986,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name")
.IsUnique();
b.ToTable("ParrComponents", (string)null);
b.ToTable("ParrComponents");
b.HasData(
new
@@ -2063,6 +2066,12 @@ namespace PARR.DAL.Migrations
Id = 12,
Description = "Автораспределение РР",
Name = "TemplateDistributor"
},
new
{
Id = 13,
Description = "Генератор шаблонов",
Name = "TemplateTaskGenerator"
});
});
@@ -2090,7 +2099,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("EsppId")
.IsUnique();
b.ToTable("Processes", (string)null);
b.ToTable("Processes");
});
modelBuilder.Entity("PARR.DAL.Models.ResponseArea", b =>
@@ -2107,7 +2116,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("ResponseAreas", (string)null);
b.ToTable("ResponseAreas");
b.HasData(
new
@@ -2233,7 +2242,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name")
.IsUnique();
b.ToTable("Robots", (string)null);
b.ToTable("Robots");
b.HasData(
new
@@ -2292,7 +2301,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TemplateId", "TaskStatusCode");
b.ToTable("RobotConfigurations", (string)null);
b.ToTable("RobotConfigurations");
});
modelBuilder.Entity("PARR.DAL.Models.RobotHistory", b =>
@@ -2330,7 +2339,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TaskStatusCode");
b.ToTable("RobotHistories", (string)null);
b.ToTable("RobotHistories");
});
modelBuilder.Entity("PARR.DAL.Models.RobotHistoryLevel", b =>
@@ -2351,7 +2360,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Level");
b.ToTable("RobotHistoryLevels", (string)null);
b.ToTable("RobotHistoryLevels");
b.HasData(
new
@@ -2398,7 +2407,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("RobotStatuses", (string)null);
b.ToTable("RobotStatuses");
b.HasData(
new
@@ -2446,7 +2455,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("Roles", (string)null);
b.ToTable("Roles");
b.HasData(
new
@@ -2615,7 +2624,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Name");
b.ToTable("Settings", (string)null);
b.ToTable("Settings");
b.HasData(
new
@@ -2739,7 +2748,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ProcessId");
b.ToTable("Subprocesses", (string)null);
b.ToTable("Subprocesses");
});
modelBuilder.Entity("PARR.DAL.Models.TaskStatus", b =>
@@ -2760,7 +2769,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code");
b.ToTable("TaskStatuses", (string)null);
b.ToTable("TaskStatuses");
b.HasData(
new
@@ -2846,7 +2855,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name", "Index")
.IsUnique();
b.ToTable("Templates", (string)null);
b.ToTable("Templates");
});
modelBuilder.Entity("PARR.DAL.Models.TemplateHistory", b =>
@@ -2899,7 +2908,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ParentId");
b.ToTable("TemplateHistories", (string)null);
b.ToTable("TemplateHistories");
});
modelBuilder.Entity("PARR.DAL.Models.TemplateStatusType", b =>
@@ -2917,7 +2926,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("TemplateStatusTypes", null, t =>
b.ToTable("TemplateStatusTypes", t =>
{
t.HasComment("Таблица описания критериев выборки аттрибутов ЭК");
});
@@ -2978,7 +2987,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("SubprocessId");
b.ToTable("Tnks", (string)null);
b.ToTable("Tnks");
});
modelBuilder.Entity("PARR.DAL.Models.Unit.Unit", b =>
@@ -3244,7 +3253,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Ip")
.IsUnique();
b.ToTable("Users", (string)null);
b.ToTable("Users");
});
modelBuilder.Entity("PARR.DAL.Models.UsersInRole", b =>
@@ -3259,7 +3268,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("UserId");
b.ToTable("UsersInRoles", (string)null);
b.ToTable("UsersInRoles");
});
modelBuilder.Entity("PARR.DAL.Models.WeekendDay", b =>
@@ -3299,7 +3308,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ResponseAreaCode");
b.ToTable("WorkGroups", (string)null);
b.ToTable("WorkGroups");
});
modelBuilder.Entity("PARR.DAL.Models.AgentHistory", b =>

8
PARR.DAL/Models/Job/JobGroup.cs
View File

@@ -151,6 +151,14 @@ namespace PARR.DAL.Models.Job
public Guid? GroupingUnitFieldId { get; set; }
/// <summary>
/// Группировать по ответственному за ЭК.
/// Если тип группы - "Сгруппированный", то можно менять значение этого поля, в иных случаях - null
/// TODO: По хорошему вынести это в другую таблицу, так как это касается только групповых работ
/// </summary>
public bool? IsGroupByResponsible { get; set; }
/// <summary>
/// Расписание регламентной работы - Тип исключения
/// </summary>