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

Compare commits

base: wyw:560c982055956c7950e0b555ccb49b603c1dfbcd
Branches Tags
wyw:master
...
compare: wyw:dac80c828857f00c45add7b16823ef89d7800fdd
Branches Tags
wyw:master

2 Commits
560c982055 ... dac80c8288

Author SHA1 Message Date
wyw
dac80c8288 Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2026-04-09 16:46:19 +08:00
wyw
1dd22b98ca T4修改 
添加培训计划接收人的审批角色
 2026-04-09 16:45:49 +08:00
29 changed files with 282171 additions and 143009 deletions
Show Stats Expand all files Collapse all files

139011
APT.Data.Migrations/Migrations/20260409084254_wyw2026040901.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

45
APT.Data.Migrations/Migrations/20260409084254_wyw2026040901.cs Normal file
View File

@ -0,0 +1,45 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2026040901 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "APPROVAL_ROLE_ID",
table: "T_SE_SECONFIG",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_SE_SECONFIG_APPROVAL_ROLE_ID",
table: "T_SE_SECONFIG",
column: "APPROVAL_ROLE_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_SE_SECONFIG_T_PF_APPROVAL_ROLE_APPROVAL_ROLE_ID",
table: "T_SE_SECONFIG",
column: "APPROVAL_ROLE_ID",
principalTable: "T_PF_APPROVAL_ROLE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SE_SECONFIG_T_PF_APPROVAL_ROLE_APPROVAL_ROLE_ID",
table: "T_SE_SECONFIG");
migrationBuilder.DropIndex(
name: "IX_T_SE_SECONFIG_APPROVAL_ROLE_ID",
table: "T_SE_SECONFIG");
migrationBuilder.DropColumn(
name: "APPROVAL_ROLE_ID",
table: "T_SE_SECONFIG");
}
}
}

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

@ -73834,6 +73834,9 @@ namespace APT.Data.Migrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("APPROVAL_ROLE_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("COUNT_RETRY")
.HasColumnType("int");
@ -73906,6 +73909,8 @@ namespace APT.Data.Migrations.Migrations
b.HasKey("ID");
b.HasIndex("APPROVAL_ROLE_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_SE_SECONFIG");
@ -125868,12 +125873,19 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.SE.T_SE_SECONFIG", b =>
{
b.HasOne("APT.MS.Domain.Entities.PF.T_PF_APPROVAL_ROLE", "Nav_ApproveRole")
.WithMany()
.HasForeignKey("APPROVAL_ROLE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_ApproveRole");
b.Navigation("Nav_Org");
});

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

@ -10882,6 +10882,7 @@ builder.HasIndex("NAME").IsUnique();
public override void Configure(EntityTypeBuilder<T_SE_SECONFIG> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_ApproveRole).WithMany().HasForeignKey(t => t.APPROVAL_ROLE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion

20
APT.MS.Domain/Entities/SC/SE/T_SE_CONFIG.cs
View File

@ -1,4 +1,5 @@
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.PF;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -54,11 +55,12 @@ namespace APT.MS.Domain.Entities.SE
[FormFieldEdit]
public int C_TEST_SCORE { get; set; }
/// <summary>
/// 部门培训计划发起时间
/// 公司培训计划触发时间
/// </summary>
[Description("部门培训计划发起时间")]
[Description("公司培训计划触发时间")]
[FormFieldEdit]
public DateTime? DEP_TRAIN_PLAN_START_TIME { get; set; }
/// <summary>
/// 部门培训计划截至时间
/// </summary>
@ -84,5 +86,19 @@ namespace APT.MS.Domain.Entities.SE
[Description("重考次数")]
[FormFieldEdit]
public int COUNT_RETRY { get; set; } = 1;
/// <summary>
/// 公司培训计划接收角色
/// DEP_TRAIN_PLAN_START_TIME 相匹配 默认安环部安全员
/// </summary>
[Description("公司培训计划接收角色")]
[DataFieldForeignKey("Nav_ApproveRole")]
public Guid? APPROVAL_ROLE_ID { get; set; }
/// <summary>
/// 审批角色
/// </summary>
[Description("审批角色")]
public T_PF_APPROVAL_ROLE Nav_ApproveRole { get; set; }
}
}

2
APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -474,7 +474,6 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -810,5 +809,4 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.BD.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.BD.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

2
APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -1794,7 +1794,6 @@ namespace APT.BS.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -6804,5 +6803,4 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.BS.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -251,6 +258,7 @@ namespace APT.BS.WebApi.Controllers.Api
}
#>
}
#endregion
<#}

1
APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -6017,5 +6017,4 @@ using APT.BaseData.Domain.Entities;
}
#endregion
}

8
APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.FM.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.FM.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

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

@ -12787,5 +12787,4 @@ namespace APT.FO.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.FO.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.FO.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

2
APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -1362,7 +1362,6 @@ namespace APT.HM.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -15906,5 +15905,4 @@ namespace APT.HM.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.HM.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.HM.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

1
APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -133,5 +133,4 @@ namespace APT.LG.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.LG.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.LG.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

2
APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -141,7 +141,6 @@ namespace APT.NW.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -366,5 +365,4 @@ namespace APT.NW.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.NW.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.NW.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

2
APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -1140,7 +1140,6 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -2919,5 +2918,4 @@ namespace APT.OP.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.OP.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.OP.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

1
APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -4021,5 +4021,4 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
}

8
APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.PF.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.PF.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

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

@ -21,5 +21,4 @@ using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF;
namespace APT.PP.WebApi.Controllers.Api
{
}

8
APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.PP.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>

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

@ -3571,7 +3571,6 @@ using APT.MS.Domain.Entities.HM;
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -23377,7 +23376,6 @@ using APT.MS.Domain.Entities.HM;
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -36977,7 +36975,6 @@ using APT.MS.Domain.Entities.HM;
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -74656,6 +74653,5 @@ using APT.MS.Domain.Entities.HM;
}
#endregion
}

10
APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,9 +134,11 @@ using APT.BaseData.Domain.ApiModel.PF;
}
}
}
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +242,7 @@ using APT.BaseData.Domain.ApiModel.PF;
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>
/// <summary>
@ -250,6 +259,7 @@ using APT.BaseData.Domain.ApiModel.PF;
}
#>
}
#endregion
<#}

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

@ -11574,7 +11574,6 @@ namespace APT.SK.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -18570,5 +18569,4 @@ namespace APT.SK.WebApi.Controllers.Api
}
#endregion
}

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.tt
View File

@ -8,6 +8,12 @@
<#@ import namespace="System.Reflection" #>
<#@ import namespace="System.ComponentModel" #>
<#@ output extension=".cs" #>
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -128,6 +134,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
#>
#region <#= t4.FixName#>-<#= tableDesc#>
/// <summary>
/// <#= tableDesc#>
@ -234,6 +241,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
<#
if(t4.BaseApiName=="AuthorizeTreeApiController"){
#>