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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
ccy 2025-10-24 11:16:36 +08:00
commit 37f7d5fad2
37 changed files with 392790 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
APT.BaseData.Domain/ApiModel/Platform/RedisCacheKey.cs
View File

@ -305,5 +305,10 @@
/// 所有数据库链接
/// </summary>
public const string ConnAll = "OPConn";
/// <summary>
/// 所有Tenant
/// </summary>
public const string TenantAll = "OPTenant";
}
}

9
APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT.cs
View File

@ -86,8 +86,13 @@ namespace APT.BaseData.Domain.Entities.FM
public int DEPARTMENT_STATUS { get; set; }
[Description("生产单元")]
public virtual ICollection<T_FM_DEPARTMENT_PRODUCTION_UNIT> Nav_ProdutionUnit { get; set; }
public virtual ICollection<T_FM_DEPARTMENT_PRODUCTION_UNIT> Nav_ProdutionUnit { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_Unit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_Unit { get; set; }
/// <summary>
/// 生产单元类型
/// </summary>

8
APT.BaseData.Domain/IServices/OP/IOPTenantDBConnService.cs
View File

@ -22,5 +22,13 @@ namespace APT.BaseData.Domain.IServices.OP
/// <param name="ORG_ID">过滤值</param>
/// <returns></returns>
string GetConnByORGID(Guid ORG_ID);
/// <summary>
/// 根据ORGID 获取 Tenant
/// </summary>
/// <param name="ORG_ID"></param>
/// <returns></returns>
string GetTenantByORGID(Guid ORG_ID);
}
}

51
APT.BaseData.Services/Services/OP/OPTenantDBConnService.cs
View File

@ -164,5 +164,56 @@ namespace APT.BaseData.Services.Services.OP
}
return "";
}
/// <summary>
/// 根据ORGID 获取 Tenant
/// </summary>
/// <param name="ORG_ID"></param>
/// <returns></returns>
public string GetTenantByORGID(Guid ORG_ID)
{
Dictionary<Guid, string> dicORGCONN = new Dictionary<Guid, string>();
//从Redis中获取所有数据库链接值
bool isRedisConfig = true;
var redisConfig = APT.Infrastructure.Api.ConfigurationManager.AppSettings["RedisFormConfig"];
if (!string.IsNullOrEmpty(redisConfig))
isRedisConfig = bool.Parse(redisConfig);
if (isRedisConfig)
{
if (CsRedisManager.KeyExists(RedisCacheKey.TenantAll))
dicORGCONN = CsRedisManager.StringGet<Dictionary<Guid, string>>(RedisCacheKey.TenantAll);
}
#region Redis没找到 去数据库查找
if (dicORGCONN == null || dicORGCONN.Count < 1)
{
string conn = string.Empty;
IEnumerable<T_OP_TENANT> listTent = null;
using (var context = new MigrationContext())
{
Expression<Func<T_OP_TENANT, bool>> expression = e => e.DB_CONN_ID.HasValue;
listTent = context.GetEntities(expression, null, null);
if (listTent != null && listTent.Count() > 0)
{
foreach (var item in listTent)
{
if (!dicORGCONN.ContainsKey(item.ID))
{
dicORGCONN.Add(item.ID, item.CODE);
}
}
}
}
}
#endregion
if (dicORGCONN != null && dicORGCONN.Count > 0 && dicORGCONN.ContainsKey(ORG_ID))
{
return dicORGCONN[ORG_ID];
}
return "";
}
}
}

129873
APT.Data.Migrations/Migrations/20251023072119_hmr2025102303.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

55
APT.Data.Migrations/Migrations/20251023072119_hmr2025102303.cs Normal file
View File

@ -0,0 +1,55 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102303 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "Nav_UnitID",
table: "T_FM_DEPARTMENT",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "PRODUCTION_UNIT_ID",
table: "T_FM_DEPARTMENT",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_FM_DEPARTMENT_Nav_UnitID",
table: "T_FM_DEPARTMENT",
column: "Nav_UnitID");
migrationBuilder.AddForeignKey(
name: "FK_T_FM_DEPARTMENT_T_FM_USER_PRODUCTION_UNIT_SET_Nav_UnitID",
table: "T_FM_DEPARTMENT",
column: "Nav_UnitID",
principalTable: "T_FM_USER_PRODUCTION_UNIT_SET",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_FM_DEPARTMENT_T_FM_USER_PRODUCTION_UNIT_SET_Nav_UnitID",
table: "T_FM_DEPARTMENT");
migrationBuilder.DropIndex(
name: "IX_T_FM_DEPARTMENT_Nav_UnitID",
table: "T_FM_DEPARTMENT");
migrationBuilder.DropColumn(
name: "Nav_UnitID",
table: "T_FM_DEPARTMENT");
migrationBuilder.DropColumn(
name: "PRODUCTION_UNIT_ID",
table: "T_FM_DEPARTMENT");
}
}
}

129897
APT.Data.Migrations/Migrations/20251023121339_hmr2025102304.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

79
APT.Data.Migrations/Migrations/20251023121339_hmr2025102304.cs Normal file
View File

@ -0,0 +1,79 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102304 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_CONFIRM",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_CONFIRM");
}
}
}

130473
APT.Data.Migrations/Migrations/20251024022928_hmr2025102401.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

412
APT.Data.Migrations/Migrations/20251024022928_hmr2025102401.cs Normal file
View File

@ -0,0 +1,412 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102401 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CODE = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
NAME = table.Column<string>(type: "nvarchar(100)", maxLength: 100, 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_SK_HIDDEN_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_CONFIRM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SK_HIDDEN_DANGER_CONFIRM_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_CONFIRM_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_CONFIRM_REASON_T_SK_HIDDEN_DANGER_CONFIRM_HIDDEN_DANGER_CONFIRM_ID",
column: x => x.HIDDEN_DANGER_CONFIRM_ID,
principalTable: "T_SK_HIDDEN_DANGER_CONFIRM",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_CONFIRM_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL~",
column: x => x.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID,
principalTable: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_RECTIFY_RECORD_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_HIDDEN_DANGER_RECTIFY_RECORD_ID",
column: x => x.HIDDEN_DANGER_RECTIFY_RECORD_ID,
principalTable: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_REPORT_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_T_SK_HIDDEN_DANGER_REPORT_DETAIL_HIDDEN_DANGER_REPORT_DETAIL_ID",
column: x => x.HIDDEN_DANGER_REPORT_DETAIL_ID,
principalTable: "T_SK_HIDDEN_DANGER_REPORT_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SECURITY_INSPECTION_RECORD_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_SECURITY_INSPECTION_RECORD_DETAIL_ID",
column: x => x.SECURITY_INSPECTION_RECORD_DETAIL_ID,
principalTable: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_SECURITY_INSPECTION_REC~",
column: x => x.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID,
principalTable: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_CONFIRM_REASON_HIDDEN_DANGER_CONFIRM_ID",
table: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
column: "HIDDEN_DANGER_CONFIRM_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_CONFIRM_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_CONFIRM_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
column: "HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_HIDDEN_DANGER_RECTIFY_RECORD_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
column: "HIDDEN_DANGER_RECTIFY_RECORD_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_HIDDEN_DANGER_REPORT_DETAIL_ID",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
column: "HIDDEN_DANGER_REPORT_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_REASON_ORG_ID",
table: "T_SK_HIDDEN_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_ORG_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_REASON_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_SECURITY_INSPECTION_RECORD_DETAIL_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
column: "SECURITY_INSPECTION_RECORD_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_ORG_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_REASON_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
column: "SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_CONFIRM_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_REASON");
}
}
}

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

@ -1548,6 +1548,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("NUM")
.HasColumnType("int");
b.Property<Guid?>("Nav_UnitID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -1559,6 +1562,9 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(100)
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("PRODUCTION_UNIT_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("REMARK")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
@ -1574,6 +1580,8 @@ namespace APT.Data.Migrations.Migrations
b.HasIndex("CHARGEUSER_ID");
b.HasIndex("Nav_UnitID");
b.HasIndex("ORG_ID");
b.HasIndex("PARENT_ID");
@ -75676,6 +75684,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("HIDDEN_REASON")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
@ -75913,6 +75925,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_HIDDEN_DANGER_CONFIRM_PHOTO");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_CONFIRM_REASON", 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>("HIDDEN_DANGER_CONFIRM_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?>("REASON_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("HIDDEN_DANGER_CONFIRM_ID");
b.HasIndex("ORG_ID");
b.HasIndex("REASON_ID");
b.ToTable("T_SK_HIDDEN_DANGER_CONFIRM_REASON");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_HAND_REPORT", b =>
{
b.Property<Guid>("ID")
@ -76365,6 +76434,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("HIDDEN_REASON")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("IMPLEMENT_USER_ID")
.HasColumnType("uniqueidentifier");
@ -76532,6 +76605,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON", 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>("HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_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?>("REASON_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID");
b.HasIndex("ORG_ID");
b.HasIndex("REASON_ID");
b.ToTable("T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE", b =>
{
b.Property<Guid>("ID")
@ -76704,6 +76834,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("HIDDEN_REASON")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("IMPLEMENT_USER_ID")
.HasColumnType("uniqueidentifier");
@ -77012,6 +77146,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON", 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>("HIDDEN_DANGER_RECTIFY_RECORD_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?>("REASON_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("HIDDEN_DANGER_RECTIFY_RECORD_ID");
b.HasIndex("ORG_ID");
b.HasIndex("REASON_ID");
b.ToTable("T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT", b =>
{
b.Property<Guid>("ID")
@ -77178,6 +77369,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("HIDDEN_REASON")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<bool>("ISCHECK")
.HasColumnType("bit");
@ -77340,6 +77535,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON", 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>("HIDDEN_DANGER_REPORT_DETAIL_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?>("REASON_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("HIDDEN_DANGER_REPORT_DETAIL_ID");
b.HasIndex("ORG_ID");
b.HasIndex("REASON_ID");
b.ToTable("T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT_FILE", b =>
{
b.Property<Guid>("ID")
@ -77397,6 +77649,61 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_HIDDEN_DANGER_REPORT_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_REASON", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<string>("CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
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<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<string>("NAME")
.HasMaxLength(100)
.HasColumnType("nvarchar(100)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ORG_ID");
b.ToTable("T_SK_HIDDEN_REASON");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", b =>
{
b.Property<Guid>("ID")
@ -82329,6 +82636,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("HIDDEN_REASON")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
@ -82483,6 +82794,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_SECURITY_INSPECTION_RECORD_DETAIL_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON", 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<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?>("REASON_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("SECURITY_INSPECTION_RECORD_DETAIL_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ORG_ID");
b.HasIndex("REASON_ID");
b.HasIndex("SECURITY_INSPECTION_RECORD_DETAIL_ID");
b.ToTable("T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER", b =>
{
b.Property<Guid>("ID")
@ -82768,6 +83136,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("HIDDEN_REASON")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
@ -82922,6 +83294,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON", 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<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?>("REASON_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ORG_ID");
b.HasIndex("REASON_ID");
b.HasIndex("SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID");
b.ToTable("T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER", b =>
{
b.Property<Guid>("ID")
@ -93769,6 +94198,10 @@ namespace APT.Data.Migrations.Migrations
.HasForeignKey("CHARGEUSER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER_PRODUCTION_UNIT_SET", "Nav_Unit")
.WithMany()
.HasForeignKey("Nav_UnitID");
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
@ -93798,6 +94231,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Person");
b.Navigation("Nav_Unit");
b.Navigation("Nav_User");
});
@ -120093,6 +120528,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_CONFIRM_REASON", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_CONFIRM", "Nav_Confirm")
.WithMany("Nav_Reasons")
.HasForeignKey("HIDDEN_DANGER_CONFIRM_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.SK.T_SK_HIDDEN_REASON", "Nav_Reason")
.WithMany()
.HasForeignKey("REASON_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Confirm");
b.Navigation("Nav_Org");
b.Navigation("Nav_Reason");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_HAND_REPORT", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_ApplyDepartment")
@ -120351,6 +120812,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_RectifyDetail");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL", "Nav_RectifyDetail")
.WithMany("Nav_RectifyDetailReasons")
.HasForeignKey("HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_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.SK.T_SK_HIDDEN_REASON", "Nav_Reason")
.WithMany()
.HasForeignKey("REASON_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Org");
b.Navigation("Nav_Reason");
b.Navigation("Nav_RectifyDetail");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_NOTICE", "Nav_Rectify")
@ -120566,6 +121053,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Rectify");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_RECORD", "Nav_Rectify")
.WithMany("Nav_RectifyReasons")
.HasForeignKey("HIDDEN_DANGER_RECTIFY_RECORD_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.SK.T_SK_HIDDEN_REASON", "Nav_Reason")
.WithMany()
.HasForeignKey("REASON_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Org");
b.Navigation("Nav_Reason");
b.Navigation("Nav_Rectify");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_ApplyDepartment")
@ -120705,6 +121218,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_ReportDetail");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT_DETAIL", "Nav_ReportDetail")
.WithMany("Nav_ReportDetailReasons")
.HasForeignKey("HIDDEN_DANGER_REPORT_DETAIL_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.SK.T_SK_HIDDEN_REASON", "Nav_Reason")
.WithMany()
.HasForeignKey("REASON_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Org");
b.Navigation("Nav_Reason");
b.Navigation("Nav_ReportDetail");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT_FILE", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT", "Nav_Report")
@ -120732,6 +121271,17 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Report");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_REASON", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_ApplyDepartment")
@ -122583,6 +123133,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_REASON", "Nav_Reason")
.WithMany()
.HasForeignKey("REASON_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_DETAIL", "Nav_CheckRecordDetail")
.WithMany("Nav_CheckRecordDetailReasons")
.HasForeignKey("SECURITY_INSPECTION_RECORD_DETAIL_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_CheckRecordDetail");
b.Navigation("Nav_Org");
b.Navigation("Nav_Reason");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
@ -122768,6 +123344,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_REASON", "Nav_Reason")
.WithMany()
.HasForeignKey("REASON_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL", "Nav_CheckRecordDetail")
.WithMany("Nav_CheckRecordDetailReasons")
.HasForeignKey("SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_CheckRecordDetail");
b.Navigation("Nav_Org");
b.Navigation("Nav_Reason");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
@ -129282,6 +129884,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Files");
b.Navigation("Nav_Photos");
b.Navigation("Nav_Reasons");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_HAND_REPORT", b =>
@ -129301,6 +129905,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_RectifyDetailBasics");
b.Navigation("Nav_RectifyDetailFiles");
b.Navigation("Nav_RectifyDetailReasons");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_RECTIFY_RECORD", b =>
@ -129312,6 +129918,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_RectifyPhotoas");
b.Navigation("Nav_RectifyPhotobs");
b.Navigation("Nav_RectifyReasons");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_HIDDEN_DANGER_REPORT", b =>
@ -129326,6 +129934,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_ReportDetailBasics");
b.Navigation("Nav_ReportDetailFiles");
b.Navigation("Nav_ReportDetailReasons");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", b =>
@ -129481,6 +130091,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_CheckRecordDetailFiles");
b.Navigation("Nav_CheckRecordDetailReasons");
b.Navigation("Nav_CheckRecordDetailUsers");
});
@ -129497,6 +130109,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_CheckRecordDetailFiles");
b.Navigation("Nav_CheckRecordDetailReasons");
b.Navigation("Nav_CheckRecordDetailUsers");
});

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

@ -12933,6 +12933,7 @@ builder.Ignore(t => t.PUBLISH);
builder.Ignore(t => t.CONTEXT);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
}
}
#endregion
@ -12967,6 +12968,17 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
builder.HasOne(t => t.Nav_Confirm).WithMany(t=>t.Nav_Photos).HasForeignKey(t => t.HIDDEN_DANGER_CONFIRM_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerConfirmReason
public partial class SKHiddenDangerConfirmReasonMap :APTEntityBaseMap<T_SK_HIDDEN_DANGER_CONFIRM_REASON>
{
public override void Configure(EntityTypeBuilder<T_SK_HIDDEN_DANGER_CONFIRM_REASON> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Confirm).WithMany(t=>t.Nav_Reasons).HasForeignKey(t => t.HIDDEN_DANGER_CONFIRM_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Reason).WithMany().HasForeignKey(t => t.REASON_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerHandReport
@ -13064,6 +13076,7 @@ builder.Property(t => t.RECTIFICATION_MEASURES).HasMaxLength(500);
builder.HasOne(t => t.Nav_ImplementUser).WithMany().HasForeignKey(t => t.IMPLEMENT_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_AcceptUser).WithMany().HasForeignKey(t => t.ACCEPT_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
}
}
#endregion
@ -13087,6 +13100,17 @@ builder.HasOne(t => t.Nav_Law).WithMany().HasForeignKey(t => t.LAW_ID).OnDelete(
builder.HasOne(t => t.Nav_RectifyDetail).WithMany(t=>t.Nav_RectifyDetailFiles).HasForeignKey(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerRectifyNoticeDetailReason
public partial class SKHiddenDangerRectifyNoticeDetailReasonMap :APTEntityBaseMap<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>
{
public override void Configure(EntityTypeBuilder<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_RectifyDetail).WithMany(t=>t.Nav_RectifyDetailReasons).HasForeignKey(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Reason).WithMany().HasForeignKey(t => t.REASON_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerRectifyNoticeFile
@ -13133,6 +13157,7 @@ builder.Ignore(t => t.CONTEXT);
builder.Property(t => t.REMARK).HasMaxLength(500);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
}
}
#endregion
@ -13178,6 +13203,17 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
builder.HasOne(t => t.Nav_Rectify).WithMany(t=>t.Nav_RectifyPhotobs).HasForeignKey(t => t.HIDDEN_DANGER_RECTIFY_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerRectifyRecordReason
public partial class SKHiddenDangerRectifyRecordReasonMap :APTEntityBaseMap<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON>
{
public override void Configure(EntityTypeBuilder<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Rectify).WithMany(t=>t.Nav_RectifyReasons).HasForeignKey(t => t.HIDDEN_DANGER_RECTIFY_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Reason).WithMany().HasForeignKey(t => t.REASON_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerReport
@ -13218,6 +13254,7 @@ builder.Property(t => t.CHECK_PERSON).HasMaxLength(500);
builder.HasOne(t => t.Nav_RecitifyUser).WithMany().HasForeignKey(t => t.RECITIFY_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.STATUS);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
}
}
#endregion
@ -13241,6 +13278,17 @@ builder.HasOne(t => t.Nav_Law).WithMany().HasForeignKey(t => t.LAW_ID).OnDelete(
builder.HasOne(t => t.Nav_ReportDetail).WithMany(t=>t.Nav_ReportDetailFiles).HasForeignKey(t => t.HIDDEN_DANGER_REPORT_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerReportDetailReason
public partial class SKHiddenDangerReportDetailReasonMap :APTEntityBaseMap<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>
{
public override void Configure(EntityTypeBuilder<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_ReportDetail).WithMany(t=>t.Nav_ReportDetailReasons).HasForeignKey(t => t.HIDDEN_DANGER_REPORT_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Reason).WithMany().HasForeignKey(t => t.REASON_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenDangerReportFile
@ -13252,6 +13300,17 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
builder.HasOne(t => t.Nav_Report).WithMany(t=>t.Nav_ReportFiles).HasForeignKey(t => t.HIDDEN_DANGER_REPORT_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region HiddenReason
public partial class SKHiddenReasonMap :APTEntityBaseMap<T_SK_HIDDEN_REASON>
{
public override void Configure(EntityTypeBuilder<T_SK_HIDDEN_REASON> builder)
{
base.Configure(builder);
builder.Property(t => t.CODE).HasMaxLength(50);
builder.Property(t => t.NAME).HasMaxLength(100);
}
}
#endregion
#region IdentifyEvaluationPlan
@ -14207,6 +14266,7 @@ builder.HasOne(t => t.Nav_Question).WithMany().HasForeignKey(t => t.CHECK_QUESTI
builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
}
}
#endregion
@ -14230,6 +14290,17 @@ builder.HasOne(t => t.Nav_Law).WithMany().HasForeignKey(t => t.LAW_ID).OnDelete(
builder.HasOne(t => t.Nav_CheckRecordDetail).WithMany(t=>t.Nav_CheckRecordDetailFiles).HasForeignKey(t => t.SECURITY_INSPECTION_RECORD_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region SecurityInspectionRecordDetailReason
public partial class SKSecurityInspectionRecordDetailReasonMap :APTEntityBaseMap<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>
{
public override void Configure(EntityTypeBuilder<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_CheckRecordDetail).WithMany(t=>t.Nav_CheckRecordDetailReasons).HasForeignKey(t => t.SECURITY_INSPECTION_RECORD_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Reason).WithMany().HasForeignKey(t => t.REASON_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region SecurityInspectionRecordDetailUser
@ -14287,6 +14358,7 @@ builder.HasOne(t => t.Nav_Question).WithMany().HasForeignKey(t => t.CHECK_QUESTI
builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
}
}
#endregion
@ -14310,6 +14382,17 @@ builder.HasOne(t => t.Nav_Law).WithMany().HasForeignKey(t => t.LAW_ID).OnDelete(
builder.HasOne(t => t.Nav_CheckRecordDetail).WithMany(t=>t.Nav_CheckRecordDetailFiles).HasForeignKey(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region SecurityInspectionRecordSummaryDetailReason
public partial class SKSecurityInspectionRecordSummaryDetailReasonMap :APTEntityBaseMap<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>
{
public override void Configure(EntityTypeBuilder<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_CheckRecordDetail).WithMany(t=>t.Nav_CheckRecordDetailReasons).HasForeignKey(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Reason).WithMany().HasForeignKey(t => t.REASON_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region SecurityInspectionRecordSummaryDetailUser

12
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs
View File

@ -223,6 +223,16 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
/// <summary>
/// 隐患原因
/// </summary>
[Description("隐患原因")]
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_CONFIRM_REASON> Nav_Reasons { get; set; }
}
}

31
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM_REASON.cs Normal file
View File

@ -0,0 +1,31 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航：隐患原因")]
public class T_SK_HIDDEN_DANGER_CONFIRM_REASON : MesEntityBase
{
/// <summary>
/// 隐患确认表
/// </summary>
[Description("隐患确认表")]
[DataFieldForeignKey("Nav_Confirm", "Nav_Reasons")]
public Guid HIDDEN_DANGER_CONFIRM_ID { get; set; }
/// <summary>
/// 导航：隐患确认表
/// </summary>
[Description("导航：隐患确认表")]
public virtual T_SK_HIDDEN_DANGER_CONFIRM Nav_Confirm { get; set; }
[Description("隐患原因")]
[DataFieldForeignKey("Nav_Reason")]
public Guid? REASON_ID { get; set; }
[Description("导航属性：隐患原因")]
public T_SK_HIDDEN_REASON Nav_Reason { get; set; }
}
}

12
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL.cs
View File

@ -168,6 +168,16 @@ namespace APT.MS.Domain.Entities.SK
/// 导航属性：检查依据
/// </summary>
[Description("导航：检查依据")]
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC> Nav_RectifyDetailBasics { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC> Nav_RectifyDetailBasics { get; set; }
/// <summary>
/// 隐患原因
/// </summary>
[Description("隐患原因")]
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> Nav_RectifyDetailReasons { get; set; }
}
}

32
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON.cs Normal file
View File

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航：隐患原因")]
public class T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON : MesEntityBase
{
/// <summary>
/// 隐患通知明细表
/// </summary>
[Description("隐患通知明细表")]
[DataFieldForeignKey("Nav_RectifyDetail", "Nav_RectifyDetailReasons")]
public Guid HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID { get; set; }
/// <summary>
/// 导航：隐患通知明细表
/// </summary>
[Description("导航：隐患通知明细表")]
public virtual T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL Nav_RectifyDetail { get; set; }
[Description("隐患原因")]
[DataFieldForeignKey("Nav_Reason")]
public Guid? REASON_ID { get; set; }
[Description("导航属性：隐患原因")]
public T_SK_HIDDEN_REASON Nav_Reason { get; set; }
}
}

12
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs
View File

@ -278,6 +278,16 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
/// <summary>
/// 隐患原因
/// </summary>
[Description("隐患原因")]
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> Nav_RectifyReasons { get; set; }
}
}

31
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON.cs Normal file
View File

@ -0,0 +1,31 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航：隐患原因")]
public class T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON : MesEntityBase
{
/// <summary>
/// 隐患整改记录表
/// </summary>
[Description("隐患整改记录表")]
[DataFieldForeignKey("Nav_Rectify", "Nav_RectifyReasons")]
public Guid HIDDEN_DANGER_RECTIFY_RECORD_ID { get; set; }
/// <summary>
/// 导航：隐患整改记录表
/// </summary>
[Description("导航：隐患整改记录表")]
public virtual T_SK_HIDDEN_DANGER_RECTIFY_RECORD Nav_Rectify { get; set; }
[Description("隐患原因")]
[DataFieldForeignKey("Nav_Reason")]
public Guid? REASON_ID { get; set; }
[Description("导航属性：隐患原因")]
public T_SK_HIDDEN_REASON Nav_Reason { get; set; }
}
}

11
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT_DETAIL.cs
View File

@ -163,6 +163,15 @@ namespace APT.MS.Domain.Entities.SK
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL> Nav_DetailContents { get; set; }
[Description("导航：检查依据")]
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> Nav_ReportDetailBasics { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> Nav_ReportDetailBasics { get; set; }
/// <summary>
/// 隐患原因
/// </summary>
[Description("隐患原因")]
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> Nav_ReportDetailReasons { get; set; }
}
}

33
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.LR;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航：隐患原因")]
public class T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON : MesEntityBase
{
/// <summary>
/// 隐患上报明细表
/// </summary>
[Description("隐患上报明细表")]
[DataFieldForeignKey("Nav_ReportDetail", "Nav_ReportDetailReasons")]
public Guid HIDDEN_DANGER_REPORT_DETAIL_ID { get; set; }
/// <summary>
/// 导航：隐患上报明细表
/// </summary>
[Description("导航：隐患上报明细表")]
public virtual T_SK_HIDDEN_DANGER_REPORT_DETAIL Nav_ReportDetail { get; set; }
[Description("隐患原因")]
[DataFieldForeignKey("Nav_Reason")]
public Guid? REASON_ID { get; set; }
[Description("导航属性：隐患原因")]
public T_SK_HIDDEN_REASON Nav_Reason { get; set; }
}
}

20
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_REASON.cs Normal file
View File

@ -0,0 +1,20 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航：隐患原因")]
public class T_SK_HIDDEN_REASON : MesEntityBase
{
[Description("编号")]
[DataFieldLength(50)]
public string CODE { get; set; }
[Description("名称")]
[DataFieldLength(100)]
public string NAME { get; set; }
}
}

15
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_DETAIL.cs
View File

@ -144,6 +144,19 @@ namespace APT.MS.Domain.Entities.SK
/// 顺序
/// </summary>
[Description("顺序")]
public int? NUM { get; set; }
public int? NUM { get; set; }
/// <summary>
/// 隐患原因
/// </summary>
[Description("隐患原因")]
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
/// <summary>
/// 导航属性：隐患原因
/// </summary>
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
}
}

33
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.LR;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航：隐患原因")]
public class T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON : MesEntityBase
{
/// <summary>
/// 检查记录明细表
/// </summary>
[Description("检查记录明细表")]
[DataFieldForeignKey("Nav_CheckRecordDetail", "Nav_CheckRecordDetailReasons")]
public Guid SECURITY_INSPECTION_RECORD_DETAIL_ID { get; set; }
/// <summary>
/// 导航：检查记录明细表
/// </summary>
[Description("导航：检查记录明细表")]
public virtual T_SK_SECURITY_INSPECTION_RECORD_DETAIL Nav_CheckRecordDetail { get; set; }
[Description("隐患原因")]
[DataFieldForeignKey("Nav_Reason")]
public Guid? REASON_ID { get; set; }
[Description("导航属性：隐患原因")]
public T_SK_HIDDEN_REASON Nav_Reason { get; set; }
}
}

12
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL.cs
View File

@ -138,6 +138,16 @@ namespace APT.MS.Domain.Entities.SK
/// 顺序
/// </summary>
[Description("顺序")]
public int? NUM { get; set; }
public int? NUM { get; set; }
/// <summary>
/// 隐患原因
/// </summary>
[Description("隐患原因")]
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
}
}

32
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON.cs Normal file
View File

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("导航：隐患原因")]
public class T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON : MesEntityBase
{
/// <summary>
/// 检查记录明细表
/// </summary>
[Description("检查记录明细表")]
[DataFieldForeignKey("Nav_CheckRecordDetail", "Nav_CheckRecordDetailReasons")]
public Guid SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID { get; set; }
/// <summary>
/// 导航：检查记录明细表
/// </summary>
[Description("导航：检查记录明细表")]
public virtual T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL Nav_CheckRecordDetail { get; set; }
[Description("隐患原因")]
[DataFieldForeignKey("Nav_Reason")]
public Guid? REASON_ID { get; set; }
[Description("导航属性：隐患原因")]
public T_SK_HIDDEN_REASON Nav_Reason { get; set; }
}
}

2
APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs
View File

@ -174,7 +174,7 @@ namespace APT.FM.WebApi.Controllers.Api
appFilter.Order = DbOrder.DESC;
appFilter.Sort = "CREATE_TIME";
//查询指定租户
appFilter.SpecifyTenant = "0003";
appFilter.SpecifyTenant = "003";
appFilter.IsSpecifyDb = true;
appFilter.IgnoreOrgRule = true;
var appVersion = this.GetEntity<T_PF_APP_VERSION>(null, appFilter, "Nav_Files.Nav_ImgFile");

26
APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
View File

@ -355,6 +355,32 @@ namespace APT.FM.WebApi.Controllers.Api.FM
result.Data = null;
}
return result;
}
/// <summary>
/// 除车间级班组级向下查询，其他层级查所有人
/// </summary>
/// <param name="pageFilter"></param>
/// <returns></returns>
[HttpPost, Route("OrderPagedWithLevel")]
public PagedActionResult<T_FM_USER> OrderPagedWithLevel([FromBody] KeywordPageFilter pageFilter)
{
return SafeGetPagedData<T_FM_USER>((ret) =>
{
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentId;
var departIdType = this.GetEntity<T_FM_DEPARTMENT>(departId.ToString())?.DEPARTMENT_TYPE;
Expression<Func<T_FM_USER, bool>> express = t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin");
if (departIdType != null && (departIdType == 15 || departIdType == 20))
{
List<Guid> departmentId = new List<Guid>();
departmentId.Add(Guid.Parse(departId.ToString()));
List<Guid> departmentIds = new List<Guid>() { APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
express = express.And(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID));
}
var result = this.GetOrderPageEntities<T_FM_USER>(express, pageFilter);
ret.TotalCount = result.TotalCount;
ret.Data = result.Data;
});
}
/// <summary>
/// 重写用户查询接口

2
APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs
View File

@ -30,7 +30,7 @@ namespace APT.PF.WebApiControllers.Api.PF
{
BaseFilter filter = new BaseFilter();
filter.IsSpecifyDb = true;
filter.SpecifyTenant = "0003";
filter.SpecifyTenant = "003";
filter.IgnoreOrgRule = true;
filter.Order = DbOrder.DESC;
filter.Sort = "CREATE_TIME";

42
APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs
View File

@ -651,38 +651,34 @@
return SafeExecute(() =>
{
T_PF_APPROVE result = null;
if (!string.IsNullOrEmpty(filter.Parameter1) && filter.OrgId.HasValue && filter.Parameter1 != filter.OrgId.Value.ToString())
if (!string.IsNullOrEmpty(filter.Parameter22) && filter.OrgId.HasValue && filter.Parameter22 != filter.OrgId.Value.ToString())
{
//集团人员 通过 首页点击 获取对应的数据库链接 返回结果
//这边怎么调用 原生的 GetEntity 方法
//集团人员 通过 首页点击 获取对应的数据库链接 返回结果
////后端直接处理
//string tenant = OPTenantDBConnService.GetTenantByORGID(new Guid(filter.Parameter1));
//filter.IgnoreOrgRule = true;
//filter.OrgId = null;
//filter.IsSpecifyDb = true;
//filter.SpecifyTenant = tenant;
//filter.IgnoreDataRule = true;
//result = GetEntity<T_PF_APPROVE>(e => !e.IS_DELETED, filter, null);
//string conn = OPTenantDBConnService.GetConnByORGID(new Guid(filter.Parameter1));
//var service = APT.Infrastructure.Api.ServiceLocator.Instance.GetService<IFMNotificatoinService>();
//前端处理了Tenant
filter.IgnoreOrgRule = true;
filter.OrgId = null;
//filter.SpecifyDbConn = conn;
filter.IsSpecifyDb = true;
filter.SpecifyTenant = "0005";
filter.IgnoreDataRule = true;
//var ccc = service.GetEntities<T_PF_APPROVE>(e => !e.IS_DELETED, filter, null);
var aaa = GetEntities<T_PF_APPROVE>(e => !e.IS_DELETED, filter, null);
}
else
result = GetEntity<T_PF_APPROVE>(null, filter, null);
if (result != null)
{
result = GetEntity<T_PF_APPROVE>(null, filter, null);
if (result != null)
if (result.APPROVE_TEMP_ID != null)
{
if (result.APPROVE_TEMP_ID != null)
{
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.ID == result.APPROVE_TEMP_ID);
if (approveTemp != null)
result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
}
result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList();
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.ID == result.APPROVE_TEMP_ID);
if (approveTemp != null)
result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
}
result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList();
}
return result;
});

1
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -662,6 +662,7 @@ namespace APT.PP.WebApi.Controllers.Api
detail.CHECKPROOF = item2.CHECKPROOF;
detail.CHECKSTANDARD = item2.CHECKSTANDARD;
detail.NUM = i;
detail.CHECK_RESULT = SKCheckResultEnum.None;
recordDetails.Add(detail);
if (item2.Nav_CheckNoticeDetailUsers != null && item2.Nav_CheckNoticeDetailUsers.Any())
{

11
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
View File

@ -108,9 +108,16 @@ namespace APT.SK.WebApi.Controllers.Api
var level = (param == "Major" || param == "重大") ? "重大" : "一般";
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
//level = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
level = ((SKDepartmentTypeEnum)departmentType).GetDescription();
if (departmentType != null)
{
level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
{
level = "公司级";
}
}
}
//触发审批
entity.STATUS = PFStandardStatus.Approving;

11
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -177,9 +177,16 @@ namespace APT.SK.WebApi.Controllers
var level = param == "Major" ? "重大" : "一般";
if (entity.HIDDEN_LEVEL == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
//param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
if (departmentType != null)
{
param = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
{
param = "公司级";
}
}
}
MFlowPermitService.InsertApprove(serialCode[0], "SK022", param, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () =>
{

11
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs
View File

@ -188,9 +188,16 @@ namespace APT.SK.WebApi.Controllers.Api
var level = param == "Major" ? "重大" : "一般";
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
//param = Enum.GetName(typeof(FMDepartmentType), departmentType);
param = ((SKDepartmentTypeEnum)departmentType).GetDescription();
if (departmentType != null)
{
param = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription();
if (departmentType.DEPARTMENT_STATUS != 1)
{
param = "公司级";
}
}
}
MFlowPermitService.InsertApprove(serialCode[0], "SK014", param, entity.ID, "SK014_SHOWPRINT", entity.TaskID, true, () =>
{

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -215,12 +215,16 @@ namespace APT.SK.WebApi.Controllers.Api
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
this.ThrowError("060010");
filter = new KeywordFilter();
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_IDENTIFY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
filter.IgnoreOrgRule = true;
filter.OrgId = null;
var result = this.GetEntity<T_SK_RISK_IDENTIFY>(e => e.ID == new Guid(id), filter, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{

145
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -226,6 +226,10 @@ namespace APT.SK.WebApi.Controllers.Api
if (department != null)
{
param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE);
if (department.DEPARTMENT_STATUS != 1)
{
param = "公司级";
}
}
var date = DateTime.Now.Year + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0');
entity.STATUS = PFStandardStatus.Approving;
@ -496,36 +500,16 @@ namespace APT.SK.WebApi.Controllers.Api
var result = new JsonActionResult<List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>>();
var dataList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3))
if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3) && !string.IsNullOrEmpty(filter.Parameter4))
{
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
if (personId == null)
throw new Exception("用户数据异常，请联系管理员排查");
var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
if (postId == null)
throw new Exception("请先维护登陆人岗位");
var mineType = FMProductionUnit.Mine;
if (filter.Parameter1 == "30")
{
mineType = FMProductionUnit.Mine;
}
else if (filter.Parameter1 == "10")
{
mineType = FMProductionUnit.MineChoose;
}
else if (filter.Parameter1 == "20")
{
mineType = FMProductionUnit.Minelast;
}
else if (filter.Parameter1 == "0")
{
mineType = FMProductionUnit.All;
}
else
{
throw new Exception("生产单元错误");
}
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
//var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
//if (personId == null)
// throw new Exception("用户数据异常，请联系管理员排查");
//var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
//if (postId == null)
// throw new Exception("请先维护登陆人岗位");
var departType = SKDepartmentTypeEnum.部门级;
if (filter.Parameter3 == "0")
{
@ -550,21 +534,51 @@ namespace APT.SK.WebApi.Controllers.Api
else
{
throw new Exception("检查层级错误");
}
var cycle = SKPLANCHECKFREQUENCYEnum.Date;
if (filter.Parameter4 == "20")
{
cycle = SKPLANCHECKFREQUENCYEnum.Week;
}
var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => t.POST_ID == postId, new BaseFilter(filter.OrgId));
var departIds = posts.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).ToList();
var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => departIds.Contains(t.ID) && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType, new BaseFilter(filter.OrgId));
var contentIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => contentIds.Contains(t.ID), new BaseFilter(filter.OrgId), new string[] {"Nav_Contents","Nav_LibraryDetail",
"Nav_LibraryDetail.Nav_Library.Nav_Area"});
else if (filter.Parameter4 == "30")
{
cycle = SKPLANCHECKFREQUENCYEnum.Month;
}
else if (filter.Parameter4 == "40")
{
cycle = SKPLANCHECKFREQUENCYEnum.Quarter;
}
else if (filter.Parameter4 == "50")
{
cycle = SKPLANCHECKFREQUENCYEnum.HalfYear;
}
else if (filter.Parameter4 == "60")
{
cycle = SKPLANCHECKFREQUENCYEnum.Year;
}
else
{
throw new Exception("检查周期错误");
}
var libs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Parameter1), new BaseFilter(filter.OrgId),"Nav_Area").ToList();
var libIds = libs.Select(m=>m.ID).ToList();
var details = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
var detailIds = details.Select(m => m.ID).ToList();
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
var contentIds = contents.Select(m=>m.ID).ToList();
var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID) && t.DEPARTMENT_ID == departId && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType && t.CHECK_CYCLE == cycle, new BaseFilter(filter.OrgId));
var contentDepIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var libraryContents = contents.Where(t => contentDepIds.Contains(t.ID)).ToList();
if (libraryContents != null && libraryContents.Any())
{
foreach (var item in libraryContents)
{
var detailFist = details.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_ID);
var libFirst= libs.FirstOrDefault(t => t.ID == detailFist?.ENTERPRISE_LIBRARY_ID);
T_SK_SECURITY_INSPECTION_NOTICE_DETAIL detail = new T_SK_SECURITY_INSPECTION_NOTICE_DETAIL();
detail.ORG_ID = filter.OrgId;
detail.RISK_AREA_ID = item.Nav_LibraryDetail?.Nav_Library?.AREA_ID;
detail.Nav_RiskArea = item.Nav_LibraryDetail?.Nav_Library?.Nav_Area;
detail.RISK_AREA_ID = libFirst?.AREA_ID;
detail.Nav_RiskArea = libFirst?.Nav_Area;
detail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
detail.Nav_Contents = item.Nav_Contents;
detail.CHECKCONTENT = item.CHECK_CONTENT;
@ -592,15 +606,16 @@ namespace APT.SK.WebApi.Controllers.Api
var result = new JsonActionResult<List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>>();
var dataList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3))
if (!string.IsNullOrEmpty(filter.Parameter1) && !string.IsNullOrEmpty(filter.Parameter2) && !string.IsNullOrEmpty(filter.Parameter3) && !string.IsNullOrEmpty(filter.Parameter4))
{
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
if (personId == null)
throw new Exception("用户数据异常，请联系管理员排查");
var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
if (postId == null)
throw new Exception("请先维护登陆人岗位");
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
//var personId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.PERSON_ID;
//if (personId == null)
// throw new Exception("用户数据异常，请联系管理员排查");
//var postId = this.GetEntity<T_FM_PERSON>(t => t.ID == personId)?.POST_ID;
//if (postId == null)
// throw new Exception("请先维护登陆人岗位");
//var mineType = SKProductionUnit.Mine;
//if (filter.Parameter1 == "30")
//{
@ -658,13 +673,41 @@ namespace APT.SK.WebApi.Controllers.Api
else
{
throw new Exception("检查层级错误");
}
var cycle = SKPLANCHECKFREQUENCYEnum.Date;
if (filter.Parameter4 == "20")
{
cycle = SKPLANCHECKFREQUENCYEnum.Week;
}
var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => t.POST_ID == postId, new BaseFilter(filter.OrgId));
var departIds = posts.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).ToList();
var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => departIds.Contains(t.ID) && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType, new BaseFilter(filter.OrgId));
var contentIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => contentIds.Contains(t.ID), new BaseFilter(filter.OrgId), new string[] {"Nav_Contents","Nav_LibraryDetail",
"Nav_LibraryDetail.Nav_Library.Nav_Area"});
else if (filter.Parameter4 == "30")
{
cycle = SKPLANCHECKFREQUENCYEnum.Month;
}
else if (filter.Parameter4 == "40")
{
cycle = SKPLANCHECKFREQUENCYEnum.Quarter;
}
else if (filter.Parameter4 == "50")
{
cycle = SKPLANCHECKFREQUENCYEnum.HalfYear;
}
else if (filter.Parameter4 == "60")
{
cycle = SKPLANCHECKFREQUENCYEnum.Year;
}
else
{
throw new Exception("检查周期错误");
}
var libs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Parameter1), new BaseFilter(filter.OrgId), "Nav_Area").ToList();
var libIds = libs.Select(m => m.ID).ToList();
var details = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
var detailIds = details.Select(m => m.ID).ToList();
var libContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
var contentIds = libContents.Select(m => m.ID).ToList();
var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID) && t.DEPARTMENT_ID == departId && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType && t.CHECK_CYCLE == cycle, new BaseFilter(filter.OrgId));
var contentDepIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var libraryContents = libContents.Where(t => contentDepIds.Contains(t.ID)).ToList();
if (libraryContents != null && libraryContents.Any())
{
foreach (var item in libraryContents)

777
APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -6125,6 +6125,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region HiddenDangerConfirmReason-导航：隐患原因
/// <summary>
/// 导航：隐患原因
/// </summary>
[Route("api/SK/HiddenDangerConfirmReason")]
public partial class HiddenDangerConfirmReasonController : AuthorizeApiController<T_SK_HIDDEN_DANGER_CONFIRM_REASON>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_CONFIRM_REASON>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_CONFIRM_REASON>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_CONFIRM_REASON> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_CONFIRM_REASON> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_HIDDEN_DANGER_CONFIRM_REASON entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_HIDDEN_DANGER_CONFIRM_REASON> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_HIDDEN_DANGER_CONFIRM_REASON> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -6902,6 +7013,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region HiddenDangerRectifyNoticeDetailReason-导航：隐患原因
/// <summary>
/// 导航：隐患原因
/// </summary>
[Route("api/SK/HiddenDangerRectifyNoticeDetailReason")]
public partial class HiddenDangerRectifyNoticeDetailReasonController : AuthorizeApiController<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -7568,6 +7790,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region HiddenDangerRectifyRecordReason-导航：隐患原因
/// <summary>
/// 导航：隐患原因
/// </summary>
[Route("api/SK/HiddenDangerRectifyRecordReason")]
public partial class HiddenDangerRectifyRecordReasonController : AuthorizeApiController<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -8012,6 +8345,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region HiddenDangerReportDetailReason-导航：隐患原因
/// <summary>
/// 导航：隐患原因
/// </summary>
[Route("api/SK/HiddenDangerReportDetailReason")]
public partial class HiddenDangerReportDetailReasonController : AuthorizeApiController<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -8123,6 +8567,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region HiddenReason-导航：隐患原因
/// <summary>
/// 导航：隐患原因
/// </summary>
[Route("api/SK/HiddenReason")]
public partial class HiddenReasonController : AuthorizeApiController<T_SK_HIDDEN_REASON>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_REASON>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_HIDDEN_REASON>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_HIDDEN_REASON> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_HIDDEN_REASON> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_HIDDEN_REASON entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_HIDDEN_REASON> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_HIDDEN_REASON> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -15682,6 +16237,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region SecurityInspectionRecordDetailReason-导航：隐患原因
/// <summary>
/// 导航：隐患原因
/// </summary>
[Route("api/SK/SecurityInspectionRecordDetailReason")]
public partial class SecurityInspectionRecordDetailReasonController : AuthorizeApiController<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -16348,6 +17014,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region SecurityInspectionRecordSummaryDetailReason-导航：隐患原因
/// <summary>
/// 导航：隐患原因
/// </summary>
[Route("api/SK/SecurityInspectionRecordSummaryDetailReason")]
public partial class SecurityInspectionRecordSummaryDetailReasonController : AuthorizeApiController<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion

2
APT.Utility/HeadHelper.cs
View File

@ -8,7 +8,7 @@ namespace APT.Utility
/// <summary>
/// 地球半径
/// </summary>
public const string HeadtelnetCode = "0003";
public const string HeadtelnetCode = "003";
public static bool GetIsHead(IHeaderDictionary Headers)
{