T4修改

添加培训计划接收人的审批角色

APT.Data.Migrations/Migrations/20260409084254_wyw2026040901.cs

@@ -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");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -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");
                 });
 

APT.MS.Data/Mapping/T4/T4Map.cs

@@ -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

APT.MS.Domain/Entities/SC/SE/T_SE_CONFIG.cs

@@ -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; }
     }
 }

APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
-
  }

APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
-
  }

APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 <#}

APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.cs

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

APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
-
  }

APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
-
  }

APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
-
  }

APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.cs

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

APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>

APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
-		
 		 }
  

APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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
 		<#}

APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs

@@ -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
-
  }

APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.tt

@@ -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"){
               #>