Compare commits

..

No commits in common. "dac80c828857f00c45add7b16823ef89d7800fdd" and "560c982055956c7950e0b555ccb49b603c1dfbcd" have entirely different histories.

29 changed files with 143009 additions and 282171 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,45 +0,0 @@
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");
}
}
}

View File

@ -73834,9 +73834,6 @@ namespace APT.Data.Migrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("APPROVAL_ROLE_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("COUNT_RETRY")
.HasColumnType("int");
@ -73909,8 +73906,6 @@ namespace APT.Data.Migrations.Migrations
b.HasKey("ID");
b.HasIndex("APPROVAL_ROLE_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_SE_SECONFIG");
@ -125873,19 +125868,12 @@ 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");
});

View File

@ -10882,8 +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
#region Coursewearlibrary

View File

@ -1,5 +1,4 @@
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.PF;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -55,12 +54,11 @@ 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>
@ -86,19 +84,5 @@ 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; }
}
}

View File

@ -463,7 +463,7 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -474,6 +474,7 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -809,4 +810,5 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1351,7 +1351,7 @@ namespace APT.HM.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -1362,6 +1362,7 @@ namespace APT.HM.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -15905,4 +15906,5 @@ namespace APT.HM.WebApi.Controllers.Api
}
#endregion
}

View File

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

View File

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

View File

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

View File

@ -130,7 +130,7 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -141,6 +141,7 @@ namespace APT.NW.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -365,4 +366,5 @@ namespace APT.NW.WebApi.Controllers.Api
}
#endregion
}

View File

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

View File

@ -1129,7 +1129,7 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -1140,6 +1140,7 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -2918,4 +2919,5 @@ namespace APT.OP.WebApi.Controllers.Api
}
#endregion
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -11563,7 +11563,7 @@ namespace APT.SK.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -11574,6 +11574,7 @@ namespace APT.SK.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
@ -18569,4 +18570,5 @@ namespace APT.SK.WebApi.Controllers.Api
}
#endregion
}

View File

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