wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:628276a9f2ce1bab7e41474f9c64975e99ae1452
Branches Tags
wyw:master
...
compare: wyw:fa4bc55e008e26b6d75bfcf81ab784e39abbd148
Branches Tags
wyw:master

2 Commits
628276a9f2 ... fa4bc55e00

Author SHA1 Message Date
何美荣
fa4bc55e00 冲突 2025-11-21 19:30:19 +08:00
何美荣
89504bd414 动火作业 2025-11-21 19:28:13 +08:00
24 changed files with 359080 additions and 83234 deletions
Show Stats Expand all files Collapse all files

135985
APT.Data.Migrations/Migrations/20251121051916_hmr2025112102.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

33
APT.Data.Migrations/Migrations/20251121051916_hmr2025112102.cs Normal file
View File

@ -0,0 +1,33 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025112102 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "NUM",
table: "T_FO_FIRE_JOB_WB_DETAIL",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "NUM",
table: "T_FO_FIRE_JOB_DETAIL",
type: "int",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "NUM",
table: "T_FO_FIRE_JOB_WB_DETAIL");
migrationBuilder.DropColumn(
name: "NUM",
table: "T_FO_FIRE_JOB_DETAIL");
}
}
}

136422
APT.Data.Migrations/Migrations/20251121111658_hmr2025112103.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

336
APT.Data.Migrations/Migrations/20251121111658_hmr2025112103.cs Normal file
View File

@ -0,0 +1,336 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025112103 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "SAFE_USER_NAME",
table: "T_OG_RELATED",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<int>(
name: "SAFE_USER_PHONE",
table: "T_OG_RELATED",
type: "int",
maxLength: 11,
nullable: true);
migrationBuilder.CreateTable(
name: "T_FO_FIRE_JOB_WB_FIRE_USER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
FIRE_JOB_WB_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IMG_FILE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_FO_FIRE_JOB_WB_FIRE_USER", x => x.ID);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_FIRE_USER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_FIRE_USER_T_FO_FIRE_JOB_WB_FIRE_JOB_WB_ID",
column: x => x.FIRE_JOB_WB_ID,
principalTable: "T_FO_FIRE_JOB_WB",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_FIRE_USER_T_PF_IMG_FILE_IMG_FILE_ID",
column: x => x.IMG_FILE_ID,
principalTable: "T_PF_IMG_FILE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_FO_FIRE_JOB_WB_SAFE_USER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
FIRE_JOB_WB_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IMG_FILE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_FO_FIRE_JOB_WB_SAFE_USER", x => x.ID);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_SAFE_USER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_SAFE_USER_T_FO_FIRE_JOB_WB_FIRE_JOB_WB_ID",
column: x => x.FIRE_JOB_WB_ID,
principalTable: "T_FO_FIRE_JOB_WB",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_SAFE_USER_T_PF_IMG_FILE_IMG_FILE_ID",
column: x => x.IMG_FILE_ID,
principalTable: "T_PF_IMG_FILE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_FO_FIRE_JOB_WB_USER_SIGN",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
FIRE_JOB_WB_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IMG_FILE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_FO_FIRE_JOB_WB_USER_SIGN", x => x.ID);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_USER_SIGN_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_USER_SIGN_T_FO_FIRE_JOB_WB_USER_FIRE_JOB_WB_USER_ID",
column: x => x.FIRE_JOB_WB_USER_ID,
principalTable: "T_FO_FIRE_JOB_WB_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_FIRE_JOB_WB_USER_SIGN_T_PF_IMG_FILE_IMG_FILE_ID",
column: x => x.IMG_FILE_ID,
principalTable: "T_PF_IMG_FILE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_OG_RELATED_FIRE_USER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RELATED_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IMG_FILE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_OG_RELATED_FIRE_USER", x => x.ID);
table.ForeignKey(
name: "FK_T_OG_RELATED_FIRE_USER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_OG_RELATED_FIRE_USER_T_OG_RELATED_RELATED_ID",
column: x => x.RELATED_ID,
principalTable: "T_OG_RELATED",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_OG_RELATED_FIRE_USER_T_PF_IMG_FILE_IMG_FILE_ID",
column: x => x.IMG_FILE_ID,
principalTable: "T_PF_IMG_FILE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_OG_RELATED_SAFE_USER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RELATED_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IMG_FILE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_OG_RELATED_SAFE_USER", x => x.ID);
table.ForeignKey(
name: "FK_T_OG_RELATED_SAFE_USER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_OG_RELATED_SAFE_USER_T_OG_RELATED_RELATED_ID",
column: x => x.RELATED_ID,
principalTable: "T_OG_RELATED",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_OG_RELATED_SAFE_USER_T_PF_IMG_FILE_IMG_FILE_ID",
column: x => x.IMG_FILE_ID,
principalTable: "T_PF_IMG_FILE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_FIRE_USER_FIRE_JOB_WB_ID",
table: "T_FO_FIRE_JOB_WB_FIRE_USER",
column: "FIRE_JOB_WB_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_FIRE_USER_IMG_FILE_ID",
table: "T_FO_FIRE_JOB_WB_FIRE_USER",
column: "IMG_FILE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_FIRE_USER_ORG_ID",
table: "T_FO_FIRE_JOB_WB_FIRE_USER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_SAFE_USER_FIRE_JOB_WB_ID",
table: "T_FO_FIRE_JOB_WB_SAFE_USER",
column: "FIRE_JOB_WB_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_SAFE_USER_IMG_FILE_ID",
table: "T_FO_FIRE_JOB_WB_SAFE_USER",
column: "IMG_FILE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_SAFE_USER_ORG_ID",
table: "T_FO_FIRE_JOB_WB_SAFE_USER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_USER_SIGN_FIRE_JOB_WB_USER_ID",
table: "T_FO_FIRE_JOB_WB_USER_SIGN",
column: "FIRE_JOB_WB_USER_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_USER_SIGN_IMG_FILE_ID",
table: "T_FO_FIRE_JOB_WB_USER_SIGN",
column: "IMG_FILE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_FIRE_JOB_WB_USER_SIGN_ORG_ID",
table: "T_FO_FIRE_JOB_WB_USER_SIGN",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_OG_RELATED_FIRE_USER_IMG_FILE_ID",
table: "T_OG_RELATED_FIRE_USER",
column: "IMG_FILE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_OG_RELATED_FIRE_USER_ORG_ID",
table: "T_OG_RELATED_FIRE_USER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_OG_RELATED_FIRE_USER_RELATED_ID",
table: "T_OG_RELATED_FIRE_USER",
column: "RELATED_ID");
migrationBuilder.CreateIndex(
name: "IX_T_OG_RELATED_SAFE_USER_IMG_FILE_ID",
table: "T_OG_RELATED_SAFE_USER",
column: "IMG_FILE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_OG_RELATED_SAFE_USER_ORG_ID",
table: "T_OG_RELATED_SAFE_USER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_OG_RELATED_SAFE_USER_RELATED_ID",
table: "T_OG_RELATED_SAFE_USER",
column: "RELATED_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_FO_FIRE_JOB_WB_FIRE_USER");
migrationBuilder.DropTable(
name: "T_FO_FIRE_JOB_WB_SAFE_USER");
migrationBuilder.DropTable(
name: "T_FO_FIRE_JOB_WB_USER_SIGN");
migrationBuilder.DropTable(
name: "T_OG_RELATED_FIRE_USER");
migrationBuilder.DropTable(
name: "T_OG_RELATED_SAFE_USER");
migrationBuilder.DropColumn(
name: "SAFE_USER_NAME",
table: "T_OG_RELATED");
migrationBuilder.DropColumn(
name: "SAFE_USER_PHONE",
table: "T_OG_RELATED");
}
}
}

447
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -33156,6 +33156,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<int?>("NUM")
.HasColumnType("int");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -33813,6 +33816,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<int?>("NUM")
.HasColumnType("int");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -33997,6 +34003,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_FO_FIRE_JOB_WB_FIRE_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_FIRE_USER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid>("FIRE_JOB_WB_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("IMG_FILE_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("FIRE_JOB_WB_ID");
b.HasIndex("IMG_FILE_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_FO_FIRE_JOB_WB_FIRE_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_MONITOR_FILE", b =>
{
b.Property<Guid>("ID")
@ -34113,6 +34176,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_FO_FIRE_JOB_WB_RISK");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_SAFE_USER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid>("FIRE_JOB_WB_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("IMG_FILE_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("FIRE_JOB_WB_ID");
b.HasIndex("IMG_FILE_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_FO_FIRE_JOB_WB_SAFE_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER", b =>
{
b.Property<Guid>("ID")
@ -34247,6 +34367,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_FO_FIRE_JOB_WB_USER_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER_SIGN", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid>("FIRE_JOB_WB_USER_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("IMG_FILE_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("FIRE_JOB_WB_USER_ID");
b.HasIndex("IMG_FILE_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_FO_FIRE_JOB_WB_USER_SIGN");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_TYPE", b =>
{
b.Property<Guid>("ID")
@ -52394,6 +52571,14 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<string>("SAFE_USER_NAME")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<int?>("SAFE_USER_PHONE")
.HasMaxLength(11)
.HasColumnType("int");
b.Property<Guid?>("USER_ID")
.HasColumnType("uniqueidentifier");
@ -52711,6 +52896,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_OG_RELATED_ESTIMATE_ITEM");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_FIRE_USER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("IMG_FILE_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RELATED_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("IMG_FILE_ID");
b.HasIndex("ORG_ID");
b.HasIndex("RELATED_ID");
b.ToTable("T_OG_RELATED_FIRE_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_QUALIFICATION", b =>
{
b.Property<Guid>("ID")
@ -53011,6 +53253,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_OG_RELATED_QUALIFICATION_LEVEL");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_SAFE_USER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("IMG_FILE_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RELATED_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("IMG_FILE_ID");
b.HasIndex("ORG_ID");
b.HasIndex("RELATED_ID");
b.ToTable("T_OG_RELATED_SAFE_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_USER", b =>
{
b.Property<Guid>("ID")
@ -108533,6 +108832,33 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_FIRE_USER", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB", "Nav_Job")
.WithMany("Nav_FireUser")
.HasForeignKey("FIRE_JOB_WB_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.T_PF_IMG_FILE", "Nav_ImgFile")
.WithMany()
.HasForeignKey("IMG_FILE_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_ImgFile");
b.Navigation("Nav_Job");
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_MONITOR_FILE", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB", "Nav_Job")
@ -108578,6 +108904,33 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_SAFE_USER", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB", "Nav_Job")
.WithMany("Nav_SafeUser")
.HasForeignKey("FIRE_JOB_WB_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.T_PF_IMG_FILE", "Nav_ImgFile")
.WithMany()
.HasForeignKey("IMG_FILE_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_ImgFile");
b.Navigation("Nav_Job");
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB", "Nav_Job")
@ -108613,7 +108966,7 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER_FILE", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER", "Nav_Job")
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER", "Nav_JobUser")
.WithMany("Nav_UserFiles")
.HasForeignKey("FIRE_JOB_WB_USER_ID")
.OnDelete(DeleteBehavior.Restrict)
@ -108632,7 +108985,33 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_ImgFile");
b.Navigation("Nav_Job");
b.Navigation("Nav_JobUser");
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER_SIGN", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER", "Nav_JobUser")
.WithMany("Nav_Signs")
.HasForeignKey("FIRE_JOB_WB_USER_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.T_PF_IMG_FILE", "Nav_ImgFile")
.WithMany()
.HasForeignKey("IMG_FILE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_ImgFile");
b.Navigation("Nav_JobUser");
b.Navigation("Nav_Org");
});
@ -116072,6 +116451,33 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_FIRE_USER", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.T_PF_IMG_FILE", "Nav_ImgFile")
.WithMany()
.HasForeignKey("IMG_FILE_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.OG.T_OG_RELATED", "Nav_Related")
.WithMany("Nav_FireUser")
.HasForeignKey("RELATED_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_ImgFile");
b.Navigation("Nav_Org");
b.Navigation("Nav_Related");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_QUALIFICATION", b =>
{
b.HasOne("APT.MS.Domain.Entities.OG.T_OG_RELATED_QUALIFICATION_LEVEL", "Nav_Level")
@ -116175,6 +116581,33 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_SAFE_USER", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.T_PF_IMG_FILE", "Nav_ImgFile")
.WithMany()
.HasForeignKey("IMG_FILE_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.OG.T_OG_RELATED", "Nav_Related")
.WithMany("Nav_SafeUser")
.HasForeignKey("RELATED_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_ImgFile");
b.Navigation("Nav_Org");
b.Navigation("Nav_Related");
});
modelBuilder.Entity("APT.MS.Domain.Entities.OG.T_OG_RELATED_USER", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
@ -133838,10 +134271,14 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_FireFiles");
b.Navigation("Nav_FireUser");
b.Navigation("Nav_MonitorFiles");
b.Navigation("Nav_Risks");
b.Navigation("Nav_SafeUser");
b.Navigation("Nav_Users");
});
@ -133852,6 +134289,8 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB_WB_USER", b =>
{
b.Navigation("Nav_Signs");
b.Navigation("Nav_UserFiles");
});
@ -134455,8 +134894,12 @@ namespace APT.Data.Migrations.Migrations
{
b.Navigation("Nav_Agreements");
b.Navigation("Nav_FireUser");
b.Navigation("Nav_Qualifications");
b.Navigation("Nav_SafeUser");
b.Navigation("Nav_Users");
});

59
APT.MS.Data/Mapping/T4/T4Map.cs
View File

@ -1414,6 +1414,17 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Job).WithMany(t=>t.Nav_FireFiles).HasForeignKey(t => t.FIRE_JOB_WB_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region FireJobWbFireUser
public partial class FOFireJobWbFireUserMap :APTEntityBaseMap<T_FO_FIRE_JOB_WB_FIRE_USER>
{
public override void Configure(EntityTypeBuilder<T_FO_FIRE_JOB_WB_FIRE_USER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Job).WithMany(t=>t.Nav_FireUser).HasForeignKey(t => t.FIRE_JOB_WB_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
@ -1438,6 +1449,17 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
builder.HasOne(t => t.Nav_Job).WithMany(t=>t.Nav_Risks).HasForeignKey(t => t.FIRE_JOB_WB_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.RISK_NAME).HasMaxLength(20);
}
}
#endregion
#region FireJobWbSafeUser
public partial class FOFireJobWbSafeUserMap :APTEntityBaseMap<T_FO_FIRE_JOB_WB_SAFE_USER>
{
public override void Configure(EntityTypeBuilder<T_FO_FIRE_JOB_WB_SAFE_USER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Job).WithMany(t=>t.Nav_SafeUser).HasForeignKey(t => t.FIRE_JOB_WB_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region FireJobWbUser
@ -1461,7 +1483,18 @@ builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelet
public override void Configure(EntityTypeBuilder<T_FO_FIRE_JOB_WB_USER_FILE> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Job).WithMany(t=>t.Nav_UserFiles).HasForeignKey(t => t.FIRE_JOB_WB_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_JobUser).WithMany(t=>t.Nav_UserFiles).HasForeignKey(t => t.FIRE_JOB_WB_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region FireJobWbUserSign
public partial class FOFireJobWbUserSignMap :APTEntityBaseMap<T_FO_FIRE_JOB_WB_USER_SIGN>
{
public override void Configure(EntityTypeBuilder<T_FO_FIRE_JOB_WB_USER_SIGN> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_JobUser).WithMany(t=>t.Nav_Signs).HasForeignKey(t => t.FIRE_JOB_WB_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
@ -7097,6 +7130,8 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
builder.Property(t => t.CONTACT).HasMaxLength(50);
builder.Property(t => t.CONTACT_INFO).HasMaxLength(50);
builder.Property(t => t.ADDRESS).HasMaxLength(50);
builder.Property(t => t.SAFE_USER_NAME).HasMaxLength(50);
builder.Property(t => t.SAFE_USER_PHONE).HasMaxLength(11);
builder.HasOne(t => t.Nav_Department).WithMany().HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.CONTENT).HasMaxLength(50);
@ -7617,6 +7652,28 @@ builder.HasIndex("NAME").IsUnique();
builder.Property(t => t.NAME).HasMaxLength(50);
builder.HasIndex("NAME").IsUnique();
}
}
#endregion
#region RelatedFireUser
public partial class OGRelatedFireUserMap :APTEntityBaseMap<T_OG_RELATED_FIRE_USER>
{
public override void Configure(EntityTypeBuilder<T_OG_RELATED_FIRE_USER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Related).WithMany(t=>t.Nav_FireUser).HasForeignKey(t => t.RELATED_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RelatedSafeUser
public partial class OGRelatedSafeUserMap :APTEntityBaseMap<T_OG_RELATED_SAFE_USER>
{
public override void Configure(EntityTypeBuilder<T_OG_RELATED_SAFE_USER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Related).WithMany(t=>t.Nav_SafeUser).HasForeignKey(t => t.RELATED_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region ExamNoticeOccHazard

6
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_DETAIL.cs
View File

@ -22,7 +22,7 @@ namespace APT.MS.Domain.Entities.FO
[FormFieldEdit]
public FOJobStepEnum? JOB_STEP { get; set; }
[Description("作业阶段")]
[Description("作业流程及安全措施")]
[FormFieldEdit]
[DataFieldLength(500)]
public string CONTENT { get; set; }
@ -31,6 +31,10 @@ namespace APT.MS.Domain.Entities.FO
[EnumName("FOYesOrNoEnum")]
public FOYesOrNoEnum? IS_CONFIRM { get; set; }
[Description("顺序")]
public int? NUM { get; set; }
[Description("附件")]
[FormFieldEdit]
public virtual ICollection<T_FO_FIRE_JOB_DETAIL_FILE> Nav_DetailFiles { get; set; }

10
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB.cs
View File

@ -99,12 +99,16 @@ namespace APT.MS.Domain.Entities.FO
[FormFieldEdit]
[DataFieldLength(50)]
public string USER_NAME { get; set; }
[Description("负责人电话号码")]
[FormFieldEdit]
[DataFieldLength(11)]
public int? USER_PHONE { get; set; }
[Description("负责人签名")]
[FormFieldEdit]
public ICollection<T_FO_FIRE_JOB_WB_FIRE_USER> Nav_FireUser { get; set; }
[Description("安全生产管理人员")]
[FormFieldEdit]
[DataFieldLength(50)]
@ -113,6 +117,10 @@ namespace APT.MS.Domain.Entities.FO
[FormFieldEdit]
[DataFieldLength(11)]
public int? SAFE_USER_PHONE { get; set; }
[Description("负责人签名")]
[FormFieldEdit]
public ICollection<T_FO_FIRE_JOB_WB_SAFE_USER> Nav_SafeUser { get; set; }
[Description("动火区域")]
[DataFieldForeignKey("Nav_Area")]
[FormFieldTable]

5
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB_DETAIL.cs
View File

@ -22,7 +22,7 @@ namespace APT.MS.Domain.Entities.FO
[FormFieldEdit]
public FOJobStepEnum? JOB_STEP { get; set; }
[Description("作业阶段")]
[Description("作业流程及安全措施")]
[FormFieldEdit]
[DataFieldLength(500)]
public string CONTENT { get; set; }
@ -31,6 +31,9 @@ namespace APT.MS.Domain.Entities.FO
[EnumName("FOYesOrNoEnum")]
public FOYesOrNoEnum? IS_CONFIRM { get; set; }
[Description("顺序")]
public int? NUM { get; set; }
[Description("附件")]
[FormFieldEdit]
public virtual ICollection<T_FO_FIRE_JOB_WB_DETAIL_FILE> Nav_DetailFiles { get; set; }

29
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB_FIRE_USER.cs Normal file
View File

@ -0,0 +1,29 @@
using APT.BaseData.Domain.Entities;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("负责人签名")]
public class T_FO_FIRE_JOB_WB_FIRE_USER: MesEntityBase
{
[Description("动火作业")]
[DataFieldForeignKey("Nav_Job", "Nav_FireUser")]
public Guid FIRE_JOB_WB_ID { get; set; }
[Description("导航属性：动火作业")]
public virtual T_FO_FIRE_JOB_WB Nav_Job { get; set; }
[Description("文件")]
[DataFieldForeignKey("Nav_ImgFile")]
public Guid IMG_FILE_ID { get; set; }
/// <summary>
/// 导航属性：文件
/// </summary>
[Description("导航属性：文件")]
public T_PF_IMG_FILE Nav_ImgFile { get; set; }
}
}

29
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB_SAFE_USER.cs Normal file
View File

@ -0,0 +1,29 @@
using APT.BaseData.Domain.Entities;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("安全员签名")]
public class T_FO_FIRE_JOB_WB_SAFE_USER : MesEntityBase
{
[Description("动火作业")]
[DataFieldForeignKey("Nav_Job", "Nav_SafeUser")]
public Guid FIRE_JOB_WB_ID { get; set; }
[Description("导航属性：动火作业")]
public virtual T_FO_FIRE_JOB_WB Nav_Job { get; set; }
[Description("文件")]
[DataFieldForeignKey("Nav_ImgFile")]
public Guid IMG_FILE_ID { get; set; }
/// <summary>
/// 导航属性：文件
/// </summary>
[Description("导航属性：文件")]
public T_PF_IMG_FILE Nav_ImgFile { get; set; }
}
}

2
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB_USER.cs
View File

@ -54,5 +54,7 @@ namespace APT.MS.Domain.Entities.FO
[Description("附件")]
[FormFieldEdit]
public virtual ICollection<T_FO_FIRE_JOB_WB_USER_FILE> Nav_UserFiles { get; set; }
[Description("导航属性：签名")]
public ICollection<T_FO_FIRE_JOB_WB_USER_SIGN> Nav_Signs { get; set; }
}
}

4
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB_USER_FILE.cs
View File

@ -11,11 +11,11 @@ namespace APT.MS.Domain.Entities.FO
public class T_FO_FIRE_JOB_WB_USER_FILE : MesEntityBase
{
[Description("动火作业")]
[DataFieldForeignKey("Nav_Job", "Nav_UserFiles")]
[DataFieldForeignKey("Nav_JobUser", "Nav_UserFiles")]
public Guid FIRE_JOB_WB_USER_ID { get; set; }
[Description("导航属性：动火作业")]
public virtual T_FO_FIRE_JOB_WB_USER Nav_Job { get; set; }
public virtual T_FO_FIRE_JOB_WB_USER Nav_JobUser { get; set; }
[Description("文件ID")]
[DataFieldForeignKey("Nav_ImgFile")]

28
APT.MS.Domain/Entities/FO/T_FO_FIRE_JOB_WB_USER_SIGN.cs Normal file
View File

@ -0,0 +1,28 @@
using APT.BaseData.Domain.Entities;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("签名表")]
public class T_FO_FIRE_JOB_WB_USER_SIGN : MesEntityBase
{
[Description("动火作业")]
[DataFieldForeignKey("Nav_JobUser", "Nav_Signs")]
public Guid FIRE_JOB_WB_USER_ID { get; set; }
[Description("导航属性：动火作业")]
public virtual T_FO_FIRE_JOB_WB_USER Nav_JobUser { get; set; }
[Description("文件ID")]
[DataFieldForeignKey("Nav_ImgFile")]
public Guid? IMG_FILE_ID { get; set; }
[Description("导航属性：文件")]
public virtual T_PF_IMG_FILE Nav_ImgFile { get; set; }
}
}

15
APT.MS.Domain/Entities/SC/OG/121T_OG_RELATED.cs
View File

@ -54,6 +54,21 @@ namespace APT.MS.Domain.Entities.OG
[FormFieldEdit]
[DataFieldLength(50)]
public string ADDRESS { get; set; }
[Description("负责人签名")]
[FormFieldEdit]
public ICollection<T_OG_RELATED_FIRE_USER> Nav_FireUser { get; set; }
[Description("安全生产管理人员")]
[FormFieldEdit]
[DataFieldLength(50)]
public string SAFE_USER_NAME { get; set; }
[Description("安全员电话号码")]
[FormFieldEdit]
[DataFieldLength(11)]
public int? SAFE_USER_PHONE { get; set; }
[Description("安全员签名")]
[FormFieldEdit]
public ICollection<T_OG_RELATED_SAFE_USER> Nav_SafeUser { get; set; }
/// <summary>
/// 对口部门ID
/// </summary>

37
APT.MS.Domain/Entities/SC/OG/T_OG_RELATED_FIRE_USER.cs Normal file
View File

@ -0,0 +1,37 @@
using APT.BaseData.Domain.Entities;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.OG;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.OG
{
[Description("负责人签名")]
public class T_OG_RELATED_FIRE_USER : MesEntityBase
{
/// <summary>
/// 相关方基本信息表ID
/// </summary>
[Description("相关方基本信息表")]
[DataFieldForeignKey("Nav_Related", "Nav_FireUser")]
public Guid RELATED_ID { get; set; }
/// <summary>
/// 导航：相关方基本信息表
/// </summary>
[Description("导航：相关方基本信息表")]
public T_OG_RELATED Nav_Related { get; set; }
[Description("文件")]
[DataFieldForeignKey("Nav_ImgFile")]
public Guid IMG_FILE_ID { get; set; }
/// <summary>
/// 导航属性：文件
/// </summary>
[Description("导航属性：文件")]
public T_PF_IMG_FILE Nav_ImgFile { get; set; }
}
}

36
APT.MS.Domain/Entities/SC/OG/T_OG_RELATED_SAFE_USER.cs Normal file
View File

@ -0,0 +1,36 @@
using APT.BaseData.Domain.Entities;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.OG
{
[Description("安全员签名")]
public class T_OG_RELATED_SAFE_USER : MesEntityBase
{
/// <summary>
/// 相关方基本信息表ID
/// </summary>
[Description("相关方基本信息表")]
[DataFieldForeignKey("Nav_Related", "Nav_SafeUser")]
public Guid RELATED_ID { get; set; }
/// <summary>
/// 导航：相关方基本信息表
/// </summary>
[Description("导航：相关方基本信息表")]
public T_OG_RELATED Nav_Related { get; set; }
[Description("文件")]
[DataFieldForeignKey("Nav_ImgFile")]
public Guid IMG_FILE_ID { get; set; }
/// <summary>
/// 导航属性：文件
/// </summary>
[Description("导航属性：文件")]
public T_PF_IMG_FILE Nav_ImgFile { get; set; }
}
}

64
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -7,8 +7,10 @@ using APT.BaseData.Services.DomainServices;
using APT.BaseData.Services.Services.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.FO;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Entities.OG;
using APT.MS.Domain.Enums;
using APT.MS.Domain.Enums.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using System;
@ -570,5 +572,67 @@ namespace APT.FO.WebApi.Controllers
return true;
});
}
/// <summary>
/// 作业名称onchange事件
/// </summary>
/// <param name="filter"></param>
/// <returns></returns>
[HttpPost, Route("GetAnalyzeDetail")]
public JsonActionResult<T_FO_FIRE_JOB> GetAnalyzeDetail([FromBody] KeywordFilter filter)
{
return SafeExecute(() =>
{
T_FO_FIRE_JOB main = new T_FO_FIRE_JOB();
//传入的作业名称ID不为空
if (!string.IsNullOrEmpty(filter.Keyword))
{
var link = GetEntity<T_HM_OPERATION_LINK>(t => t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用, new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" });
if (link != null)
{
main.AUDIT_LEVEL = link.AUDIT_LEVEL;
main.EVALUATE_LEVEL = link.EVALUATE_LEVEL !=null?(SKEvaluateLevelEnum)link.EVALUATE_LEVEL: MS.Domain.Enums.SK.SKEvaluateLevelEnum.低风险;
List<T_FO_FIRE_JOB_DETAIL> details = new List<T_FO_FIRE_JOB_DETAIL>();
if (link.Nav_SafeConfirms != null && link.Nav_SafeConfirms.Any())
{
foreach (var item in link.Nav_SafeConfirms.OrderBy(t=>t.NUM))
{
T_FO_FIRE_JOB_DETAIL de = new T_FO_FIRE_JOB_DETAIL();
de.ORG_ID = item.ORG_ID;
de.NUM = item.NUM;
de.JOB_STEP = FOJobStepEnum.Pre;
de.CONTENT = item.NAME;
details.Add(de);
}
}
if (link.Nav_SafeMeasures != null && link.Nav_SafeMeasures.Any())
{
foreach (var item in link.Nav_SafeMeasures.OrderBy(t => t.NUM))
{
T_FO_FIRE_JOB_DETAIL de = new T_FO_FIRE_JOB_DETAIL();
de.ORG_ID = item.ORG_ID;
de.NUM = item.NUM;
de.JOB_STEP = FOJobStepEnum.Ing;
de.CONTENT = item.NAME;
details.Add(de);
}
}
if (link.Nav_DealMeasures != null && link.Nav_DealMeasures.Any())
{
foreach (var item in link.Nav_DealMeasures.OrderBy(t => t.NUM))
{
T_FO_FIRE_JOB_DETAIL de = new T_FO_FIRE_JOB_DETAIL();
de.ORG_ID = item.ORG_ID;
de.NUM = item.NUM;
de.JOB_STEP = FOJobStepEnum.After;
de.CONTENT = item.NAME;
details.Add(de);
}
}
main.Nav_Details = details.OrderBy(t => t.JOB_STEP).ThenBy(m => m.NUM).ToList();
}
}
return main;
});
}
}
}

105
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
View File

@ -46,9 +46,10 @@ namespace APT.FO.WebApi.Controllers
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
this.ThrowError("060010");
var entity = this.GetEntity<T_FO_FIRE_JOB_WB>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_ImgFile.Nav_File", "Nav_FireDepartment",
"Nav_SafeUser.Nav_ImgFile.Nav_File", "Nav_Area", "Nav_Type", "Nav_MonitorUser", "Nav_Risks", "Nav_Files.Nav_ImgFile.Nav_File", "Nav_Users.Nav_UserType", "Nav_Users.Nav_User", "Nav_Users.Nav_UserFiles.Nav_ImgFile.Nav_File",
"Nav_FireFiles.Nav_ImgFile.Nav_File", "Nav_MonitorFiles.Nav_ImgFile.Nav_File", "Nav_DispatchUser");
var entity = this.GetEntity<T_FO_FIRE_JOB_WB>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_OperationStep", "Nav_ProductionUnit", "Nav_FireUser.Nav_ImgFile.Nav_File",
"Nav_SafeUser.Nav_ImgFile.Nav_File", "Nav_Area", "Nav_Type", "Nav_MonitorUser", "Nav_Risks", "Nav_Files.Nav_ImgFile.Nav_File", "Nav_Users.Nav_UserType", "Nav_Users.Nav_UserFiles.Nav_ImgFile.Nav_File",
"Nav_Users.Nav_Signs.Nav_ImgFile.Nav_File",
"Nav_FireFiles.Nav_ImgFile.Nav_File", "Nav_MonitorFiles.Nav_ImgFile.Nav_File");
if (entity != null)
{
var details = this.GetEntities<T_FO_FIRE_JOB_WB_DETAIL>(t => t.FIRE_JOB_WB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList();
@ -79,6 +80,16 @@ namespace APT.FO.WebApi.Controllers
{
entity.PRODUCTION_UNIT_ID = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.PRODUCTION_UNIT_ID;
}
if (entity.RELATED_ID == null)
{
throw new Exception("请选择相关方");
}
var fireUser = new List<T_FO_FIRE_JOB_WB_FIRE_USER>();
var safeUser = new List<T_FO_FIRE_JOB_WB_SAFE_USER>();
var detailUser = new List<T_FO_FIRE_JOB_WB_USER_SIGN>();
var deleteFireUserIds = new List<Guid>();
var deleteSafeUserIds = new List<Guid>();
var deleteUserSignIds = new List<Guid>();
var details = entity.Nav_Details;
if (details != null && details.Any())
{
@ -289,6 +300,32 @@ namespace APT.FO.WebApi.Controllers
//外部施工单位，安全员自动置为已审阅
entity.USER_DEAL_STATUS = FOUserShiftStatusEnum.已处理;
entity.SAFE_DEAL_STATUS = FOUserShiftStatusEnum.已处理;
//签名
var ogRelated = this.GetEntity<T_OG_RELATED>(t => t.ID == entity.RELATED_ID, "Nav_FireUser", "Nav_SafeUser");
if (ogRelated != null && ogRelated.Nav_FireUser != null && ogRelated.Nav_FireUser.Any())
{
foreach (var item in ogRelated.Nav_FireUser)
{
T_FO_FIRE_JOB_WB_FIRE_USER user = new T_FO_FIRE_JOB_WB_FIRE_USER();
user.FIRE_JOB_WB_ID = entity.ID;
user.ORG_ID = entity.ORG_ID;
user.IMG_FILE_ID = item.IMG_FILE_ID;
fireUser.Add(user);
}
deleteFireUserIds = this.GetEntities<T_FO_FIRE_JOB_WB_FIRE_USER>(t => t.FIRE_JOB_WB_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
}
if (ogRelated != null && ogRelated.Nav_SafeUser != null && ogRelated.Nav_SafeUser.Any())
{
foreach (var item in ogRelated.Nav_SafeUser)
{
T_FO_FIRE_JOB_WB_SAFE_USER user = new T_FO_FIRE_JOB_WB_SAFE_USER();
user.FIRE_JOB_WB_ID = entity.ID;
user.ORG_ID = entity.ORG_ID;
user.IMG_FILE_ID = item.IMG_FILE_ID;
safeUser.Add(user);
}
deleteFireUserIds = this.GetEntities<T_FO_FIRE_JOB_WB_FIRE_USER>(t => t.FIRE_JOB_WB_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
}
//触发给监护人员
entity.FIRE_STATUS = FOFireStatus.Monitor;
//触发给监护人填写
@ -306,6 +343,32 @@ namespace APT.FO.WebApi.Controllers
}
else
{
//签名
var ogRelated = this.GetEntity<T_OG_RELATED>(t => t.ID == entity.RELATED_ID, "Nav_Users.Nav_Signs");
if (ogRelated != null && ogRelated.Nav_Users != null && ogRelated.Nav_Users.Any())
{
var userSignIds = new List<Guid>();
if (users != null && users.Any())
{
foreach (var item in users)
{
var first = ogRelated.Nav_Users.FirstOrDefault(t => t.NAME == item.USER_NAME && t.TYPE_ID == item.USER_TYPE_ID);
if (first != null && first.Nav_Signs != null && first.Nav_Signs.Any())
{
foreach (var itemSign in first.Nav_Signs)
{
T_FO_FIRE_JOB_WB_USER_SIGN sign = new T_FO_FIRE_JOB_WB_USER_SIGN();
sign.ORG_ID = itemSign.ORG_ID;
sign.FIRE_JOB_WB_USER_ID = item.ID;
sign.IMG_FILE_ID = itemSign.IMG_FILE_ID;
detailUser.Add(sign);
userSignIds.Add(item.ID);
}
}
}
}
deleteUserSignIds = this.GetEntities<T_FO_FIRE_JOB_WB_USER_SIGN>(t => userSignIds.Contains(t.FIRE_JOB_WB_USER_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
}
//触发审批
entity.STATUS = BaseData.Domain.Enums.PF.PFStandardStatus.Approving;
entity.FIRE_STATUS = FOFireStatus.Approving;
@ -324,6 +387,18 @@ namespace APT.FO.WebApi.Controllers
}
MFlowPermitService.InsertApprove(serialCode[0], "FO045", param, entity.ID, "FO045_SHOWPRINT", entity.TaskID, true, () =>
{
if (deleteUserSignIds != null && deleteUserSignIds.Any())
{
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_USER_SIGN>(deleteUserSignIds);
}
if (deleteFireUserIds != null && deleteFireUserIds.Any())
{
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_FIRE_USER>(deleteFireUserIds);
}
if (deleteSafeUserIds != null && deleteSafeUserIds.Any())
{
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_SAFE_USER>(deleteSafeUserIds);
}
if (detailFileIds != null && detailFileIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_DETAIL_FILE>(detailFileIds);
if (detailIds != null && detailIds.Any())
@ -358,6 +433,12 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(fireFileList);
if (fileList != null && fileList.Any())
this.BantchSaveEntityNoCommit(fileList);
if (safeUser != null && safeUser.Any())
this.BantchSaveEntityNoCommit(safeUser);
if (fireUser != null && fireUser.Any())
this.BantchSaveEntityNoCommit(fireUser);
if (detailUser != null && detailUser.Any())
this.BantchSaveEntityNoCommit(detailUser);
}, null, null, null, null, null, "FO045_SHOWPRINT", null, "动火作业工作票(外包)", FMTASKTYPE.JobSite);
return true;
@ -366,6 +447,18 @@ namespace APT.FO.WebApi.Controllers
}
this.UnifiedCommit(() =>
{
if (deleteUserSignIds != null && deleteUserSignIds.Any())
{
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_USER_SIGN>(deleteUserSignIds);
}
if (deleteFireUserIds != null && deleteFireUserIds.Any())
{
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_FIRE_USER>(deleteFireUserIds);
}
if (deleteSafeUserIds != null && deleteSafeUserIds.Any())
{
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_SAFE_USER>(deleteSafeUserIds);
}
if (detailFileIds != null && detailFileIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_WB_DETAIL_FILE>(detailFileIds);
if (detailIds != null && detailIds.Any())
@ -400,6 +493,12 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(fireFileList);
if (fileList != null && fileList.Any())
this.BantchSaveEntityNoCommit(fileList);
if (safeUser != null && safeUser.Any())
this.BantchSaveEntityNoCommit(safeUser);
if (fireUser != null && fireUser.Any())
this.BantchSaveEntityNoCommit(fireUser);
if (detailUser != null && detailUser.Any())
this.BantchSaveEntityNoCommit(detailUser);
if (notices != null && notices.Any())
this.BantchSaveEntityNoCommit(notices);
});

4
APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs
View File

@ -35,10 +35,10 @@ namespace APT.FO.WebApi.Controllers
if (string.IsNullOrEmpty(id))
this.ThrowError("060010");
var entity = this.GetEntity<T_FO_LEADER_WELL_RECORD>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_ProductionUnit", "Nav_Class", "Nav_Users.Nav_User",
"Nav_Files.Nav_ImgFile.Nav_File");
"Nav_Files.Nav_ImgFile.Nav_File", "Nav_PreUsers.Nav_PreUser", "Nav_AfterUsers.Nav_AfterUser");
if (entity != null)
{
var details = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL>(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File", "Nav_User", "Nav_PreUsers.Nav_PreUser", "Nav_AfterUsers.Nav_AfterUser", "Nav_DetailAreas.Nav_Area").ToList();
var details = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL>(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File", "Nav_User","Nav_DetailAreas.Nav_Area").ToList();
entity.Nav_Details = details.OrderByDescending(t => t.START_DATE).ToList();
}
return entity;

26
APT.MicroApi/APT.FO.WebApi/Controllers/ProfessionalResumeController.cs
View File

@ -4,7 +4,9 @@ using APT.BaseData.Domain.Enums;
using APT.BaseData.Services.Services.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.FO;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums;
using APT.MS.Domain.Enums.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using NPOI.SS.Formula.Functions;
@ -244,5 +246,29 @@ namespace APT.FO.WebApi.Controllers
return true;
});
}
[HttpPost, Route("GetUserAge")]
public JsonActionResult<T_FO_PROFESSIONAL_RESUME> GetUserAge([FromBody] KeywordFilter filter)
{
return SafeExecute(() =>
{
T_FO_PROFESSIONAL_RESUME main = new T_FO_PROFESSIONAL_RESUME();
//传入的作业名称ID不为空
if (!string.IsNullOrEmpty(filter.Keyword))
{
var user = GetEntity<T_FM_USER>(t => t.ID == Guid.Parse(filter.Keyword) && t.ENABLE_STATUS == 0);
if (user != null&& user.BORN_DATE!=null && user.BORN_DATE!=DateTime.MinValue)
{
int age = DateTime.Today.Year - user.BORN_DATE.Value.Year;
// 检查是否还没到生日
if (DateTime.Today.Month < user.BORN_DATE.Value.Month || (DateTime.Today.Month == user.BORN_DATE.Value.Month && DateTime.Today.Day < user.BORN_DATE.Value.Day))
{
age--; // 如果还没到生日，年龄减一
}
main.AGE = age;
}
}
return main;
});
}
}
}

546
APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

50
APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/11OGRelatedController.cs
View File

@ -1,4 +1,5 @@
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.FO;
using APT.MS.Domain.Entities.OG;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
@ -30,6 +31,38 @@ namespace APT.SC.WebApi.Controllers.Api.OG
var del_Nav_Users_Signs = new List<T_OG_RELATED_USER_SIGN>();
var del_Nav_Users = new List<T_OG_RELATED_USER>();
var update_Nav_Users = new List<T_OG_RELATED_USER>();
var fireUser = entity.Nav_FireUser;
entity.Nav_FireUser = null;
if (fireUser != null && fireUser.Any())
{
fireUser = fireUser.Where(t => !t.IS_DELETED).ToList();
}
var fireUserIds = this.GetEntities<T_OG_RELATED_FIRE_USER>(t => t.RELATED_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
if (fireUser != null && fireUser.Any())
{
foreach (var item in fireUser)
{
item.ORG_ID = entity.ORG_ID;
item.RELATED_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
var safeUser = entity.Nav_SafeUser;
entity.Nav_SafeUser = null;
if (safeUser != null && safeUser.Any())
{
safeUser = safeUser.Where(t => !t.IS_DELETED).ToList();
}
var safeUserIds = this.GetEntities<T_OG_RELATED_SAFE_USER>(t => t.RELATED_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
if (safeUser != null && safeUser.Any())
{
foreach (var item in safeUser)
{
item.ORG_ID = entity.ORG_ID;
item.RELATED_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (entity.Nav_Users != null && entity.Nav_Users.Any())
{
entity.Nav_Users = null;
@ -193,6 +226,14 @@ namespace APT.SC.WebApi.Controllers.Api.OG
}
UnifiedCommit(() =>
{
if (fireUserIds != null && fireUserIds.Any())
{
BantchDeleteEntityNoCommit<T_OG_RELATED_FIRE_USER>(fireUserIds);
}
if (safeUserIds != null && safeUserIds.Any())
{
BantchDeleteEntityNoCommit<T_OG_RELATED_SAFE_USER>(safeUserIds);
}
if (del_Nav_Qualifications_Details_Files.Count > 0)
{
BantchSaveEntityNoCommit(del_Nav_Qualifications_Details_Files);
@ -274,6 +315,15 @@ namespace APT.SC.WebApi.Controllers.Api.OG
}
}
}
if (fireUser != null && fireUser.Any())
{
BantchSaveEntityNoCommit(fireUser);
}
if (safeUser != null && safeUser.Any())
{
BantchSaveEntityNoCommit(safeUser);
}
});
return true;
});

1594
APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff