Compare commits

...

2 Commits

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

File diff suppressed because it is too large Load Diff

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

View File

@ -73834,6 +73834,9 @@ namespace APT.Data.Migrations.Migrations
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("APPROVAL_ROLE_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("COUNT_RETRY") b.Property<int>("COUNT_RETRY")
.HasColumnType("int"); .HasColumnType("int");
@ -73906,6 +73909,8 @@ namespace APT.Data.Migrations.Migrations
b.HasKey("ID"); b.HasKey("ID");
b.HasIndex("APPROVAL_ROLE_ID");
b.HasIndex("ORG_ID"); b.HasIndex("ORG_ID");
b.ToTable("T_SE_SECONFIG"); 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 => 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") b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany() .WithMany()
.HasForeignKey("ORG_ID") .HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict) .OnDelete(DeleteBehavior.Restrict)
.IsRequired(); .IsRequired();
b.Navigation("Nav_ApproveRole");
b.Navigation("Nav_Org"); b.Navigation("Nav_Org");
}); });

View File

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

View File

@ -1,4 +1,5 @@
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.PF;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -54,11 +55,12 @@ namespace APT.MS.Domain.Entities.SE
[FormFieldEdit] [FormFieldEdit]
public int C_TEST_SCORE { get; set; } public int C_TEST_SCORE { get; set; }
/// <summary> /// <summary>
/// 部门培训计划发起时间 /// 公司培训计划触发时间
/// </summary> /// </summary>
[Description("部门培训计划发起时间")] [Description("公司培训计划触发时间")]
[FormFieldEdit] [FormFieldEdit]
public DateTime? DEP_TRAIN_PLAN_START_TIME { get; set; } public DateTime? DEP_TRAIN_PLAN_START_TIME { get; set; }
/// <summary> /// <summary>
/// 部门培训计划截至时间 /// 部门培训计划截至时间
/// </summary> /// </summary>
@ -84,5 +86,19 @@ namespace APT.MS.Domain.Entities.SE
[Description("重考次数")] [Description("重考次数")]
[FormFieldEdit] [FormFieldEdit]
public int COUNT_RETRY { get; set; } = 1; 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; }
} }
} }

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -1,137 +1,136 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic; using System.Collections.Generic;
using APT.Utility; using APT.Utility;
using APT.Infrastructure.Api; using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.ApiModel.PF;
namespace APT.LG.WebApi.Controllers.Api namespace APT.LG.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.LG; using APT.BaseData.Domain.Entities.LG;
#region Oprate- #region Oprate-
/// <summary> /// <summary>
/// 表单操作日志表 /// 表单操作日志表
/// </summary> /// </summary>
[Route("api/LG/Oprate")] [Route("api/LG/Oprate")]
public partial class OprateController : AuthorizeApiController<T_LG_OPRATE> public partial class OprateController : AuthorizeApiController<T_LG_OPRATE>
{ {
/// <summary> /// <summary>
/// 查询所有数据 /// 查询所有数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Entities")] [HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_LG_OPRATE>> Entities([FromBody]KeywordFilter filter) public JsonActionResult<IEnumerable<T_LG_OPRATE>> Entities([FromBody]KeywordFilter filter)
{ {
return WitEntities(null, filter); return WitEntities(null, filter);
} }
/// <summary> /// <summary>
/// 排序查询所有数据 /// 排序查询所有数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderEntities")] [HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_LG_OPRATE>> OrderEntities([FromBody]KeywordFilter filter) public JsonActionResult<IEnumerable<T_LG_OPRATE>> OrderEntities([FromBody]KeywordFilter filter)
{ {
return WitOrderEntities(null, filter); return WitOrderEntities(null, filter);
} }
/// <summary> /// <summary>
/// 分页查询数据 /// 分页查询数据
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Paged")] [HttpPost, Route("Paged")]
public PagedActionResult<T_LG_OPRATE> Paged([FromBody]KeywordPageFilter pageFilter) public PagedActionResult<T_LG_OPRATE> Paged([FromBody]KeywordPageFilter pageFilter)
{ {
return WitPaged(null, pageFilter); return WitPaged(null, pageFilter);
} }
/// <summary> /// <summary>
/// 排序分页查询数据 /// 排序分页查询数据
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderPaged")] [HttpPost, Route("OrderPaged")]
public PagedActionResult<T_LG_OPRATE> OrderPaged([FromBody]KeywordPageFilter pageFilter) public PagedActionResult<T_LG_OPRATE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{ {
return WitOrderPaged(null, pageFilter); return WitOrderPaged(null, pageFilter);
} }
/// <summary> /// <summary>
/// 根据主键删除数据 /// 根据主键删除数据
/// </summary> /// </summary>
/// <param name="id">主键ID</param> /// <param name="id">主键ID</param>
/// <returns></returns> /// <returns></returns>
[HttpGet, Route("Delete")] [HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id) public JsonActionResult<bool> Delete(string id)
{ {
return WitRealDelete(id); return WitRealDelete(id);
} }
/// <summary> /// <summary>
/// 更新或新增数据 /// 更新或新增数据
/// </summary> /// </summary>
/// <param name="entity">对象实体</param> /// <param name="entity">对象实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Update")] [HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_LG_OPRATE entity) public JsonActionResult<bool> Update([FromBody]T_LG_OPRATE entity)
{ {
return WitUpdate(entity); return WitUpdate(entity);
} }
/// <summary> /// <summary>
/// 批量更新 /// 批量更新
/// </summary> /// </summary>
/// <param name="entity">对象实体</param> /// <param name="entity">对象实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("BatchUpdate")] [HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_LG_OPRATE> entity) public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_LG_OPRATE> entity)
{ {
return WitBantchUpdate(entity?.Data); return WitBantchUpdate(entity?.Data);
} }
/// <summary> /// <summary>
/// 批量删除数据 /// 批量删除数据
/// </summary> /// </summary>
/// <param name="ids">id字符串id用逗号分隔</param> /// <param name="ids">id字符串id用逗号分隔</param>
/// <returns></returns> /// <returns></returns>
[HttpGet, Route("BatchDelete")] [HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids) public JsonActionResult<bool> BatchDelete(string ids)
{ {
return WitRealBatchDelete(ids); return WitRealBatchDelete(ids);
} }
/// <summary> /// <summary>
/// 获得单条实体数据 /// 获得单条实体数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Get")] [HttpPost, Route("Get")]
public JsonActionResult<T_LG_OPRATE> Get([FromBody] KeywordFilter filter) public JsonActionResult<T_LG_OPRATE> Get([FromBody] KeywordFilter filter)
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
}
}

View File

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

View File

@ -1,370 +1,368 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic; using System.Collections.Generic;
using APT.Utility; using APT.Utility;
using APT.Infrastructure.Api; using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.ApiModel.PF;
namespace APT.NW.WebApi.Controllers.Api namespace APT.NW.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.NW; using APT.BaseData.Domain.Entities.NW;
#region Enterprise- #region Enterprise-
/// <summary> /// <summary>
/// 子企业表 /// 子企业表
/// </summary> /// </summary>
[Route("api/NW/Enterprise")] [Route("api/NW/Enterprise")]
public partial class EnterpriseController : AuthorizeTreeApiController<T_NW_ENTERPRISE> public partial class EnterpriseController : AuthorizeTreeApiController<T_NW_ENTERPRISE>
{ {
/// <summary> /// <summary>
/// 查询所有数据 /// 查询所有数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Entities")] [HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> Entities([FromBody]KeywordFilter filter) public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> Entities([FromBody]KeywordFilter filter)
{ {
return WitEntities(null, filter); return WitEntities(null, filter);
} }
/// <summary> /// <summary>
/// 排序查询所有数据 /// 排序查询所有数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderEntities")] [HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> OrderEntities([FromBody]KeywordFilter filter) public JsonActionResult<IEnumerable<T_NW_ENTERPRISE>> OrderEntities([FromBody]KeywordFilter filter)
{ {
return WitOrderEntities(null, filter); return WitOrderEntities(null, filter);
} }
/// <summary> /// <summary>
/// 分页查询数据 /// 分页查询数据
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Paged")] [HttpPost, Route("Paged")]
public PagedActionResult<T_NW_ENTERPRISE> Paged([FromBody]KeywordPageFilter pageFilter) public PagedActionResult<T_NW_ENTERPRISE> Paged([FromBody]KeywordPageFilter pageFilter)
{ {
return WitPaged(null, pageFilter); return WitPaged(null, pageFilter);
} }
/// <summary> /// <summary>
/// 排序分页查询数据 /// 排序分页查询数据
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderPaged")] [HttpPost, Route("OrderPaged")]
public PagedActionResult<T_NW_ENTERPRISE> OrderPaged([FromBody]KeywordPageFilter pageFilter) public PagedActionResult<T_NW_ENTERPRISE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{ {
return WitOrderPaged(null, pageFilter); return WitOrderPaged(null, pageFilter);
} }
/// <summary> /// <summary>
/// 根据主键删除数据 /// 根据主键删除数据
/// </summary> /// </summary>
/// <param name="id">主键ID</param> /// <param name="id">主键ID</param>
/// <returns></returns> /// <returns></returns>
[HttpGet, Route("Delete")] [HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id) public JsonActionResult<bool> Delete(string id)
{ {
return WitRealDelete(id); return WitRealDelete(id);
} }
/// <summary> /// <summary>
/// 更新或新增数据 /// 更新或新增数据
/// </summary> /// </summary>
/// <param name="entity">对象实体</param> /// <param name="entity">对象实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Update")] [HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_NW_ENTERPRISE entity) public JsonActionResult<bool> Update([FromBody]T_NW_ENTERPRISE entity)
{ {
return WitUpdate(entity); return WitUpdate(entity);
} }
/// <summary> /// <summary>
/// 批量更新 /// 批量更新
/// </summary> /// </summary>
/// <param name="entity">对象实体</param> /// <param name="entity">对象实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("BatchUpdate")] [HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ENTERPRISE> entity) public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ENTERPRISE> entity)
{ {
return WitBantchUpdate(entity?.Data); return WitBantchUpdate(entity?.Data);
} }
/// <summary> /// <summary>
/// 批量删除数据 /// 批量删除数据
/// </summary> /// </summary>
/// <param name="ids">id字符串id用逗号分隔</param> /// <param name="ids">id字符串id用逗号分隔</param>
/// <returns></returns> /// <returns></returns>
[HttpGet, Route("BatchDelete")] [HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids) public JsonActionResult<bool> BatchDelete(string ids)
{ {
return WitRealBatchDelete(ids); return WitRealBatchDelete(ids);
} }
/// <summary> /// <summary>
/// 获得单条实体数据 /// 获得单条实体数据
/// </summary> /// </summary>
/// <param name="filter">过滤实体</param> /// <param name="filter">过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("Get")] [HttpPost, Route("Get")]
public JsonActionResult<T_NW_ENTERPRISE> Get([FromBody] KeywordFilter filter) public JsonActionResult<T_NW_ENTERPRISE> Get([FromBody] KeywordFilter filter)
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
/// <param name="filter"></param> /// <param name="filter"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("TreeData")] [HttpPost, Route("TreeData")]
public JsonActionResult<IEnumerable<TreeNode<T_NW_ENTERPRISE>>> TreeData([FromBody] KeywordFilter filter) public JsonActionResult<IEnumerable<TreeNode<T_NW_ENTERPRISE>>> TreeData([FromBody] KeywordFilter filter)
{ {
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
}
} #endregion
#endregion
#region RoleDataPerm-
#region RoleDataPerm- /// <summary>
/// <summary> /// 子企业数据权限表
/// 子企业数据权限表 /// </summary>
/// </summary> [Route("api/NW/RoleDataPerm")]
[Route("api/NW/RoleDataPerm")] public partial class RoleDataPermController : AuthorizeApiController<T_NW_ROLE_DATA_PERM>
public partial class RoleDataPermController : AuthorizeApiController<T_NW_ROLE_DATA_PERM> {
{ /// <summary>
/// <summary> /// 查询所有数据
/// 查询所有数据 /// </summary>
/// </summary> /// <param name="filter">过滤实体</param>
/// <param name="filter">过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Entities")]
[HttpPost, Route("Entities")] public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> Entities([FromBody]KeywordFilter filter)
public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> Entities([FromBody]KeywordFilter filter) {
{ return WitEntities(null, filter);
return WitEntities(null, filter); }
}
/// <summary>
/// <summary> /// 排序查询所有数据
/// 排序查询所有数据 /// </summary>
/// </summary> /// <param name="filter">过滤实体</param>
/// <param name="filter">过滤实体</param> /// <returns></returns>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
[HttpPost, Route("OrderEntities")] public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> OrderEntities([FromBody]KeywordFilter filter)
public JsonActionResult<IEnumerable<T_NW_ROLE_DATA_PERM>> OrderEntities([FromBody]KeywordFilter filter) {
{ return WitOrderEntities(null, filter);
return WitOrderEntities(null, filter); }
}
/// <summary>
/// <summary> /// 分页查询数据
/// 分页查询数据 /// </summary>
/// </summary> /// <param name="pageFilter">分页过滤实体</param>
/// <param name="pageFilter">分页过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Paged")]
[HttpPost, Route("Paged")] public PagedActionResult<T_NW_ROLE_DATA_PERM> Paged([FromBody]KeywordPageFilter pageFilter)
public PagedActionResult<T_NW_ROLE_DATA_PERM> Paged([FromBody]KeywordPageFilter pageFilter) {
{ return WitPaged(null, pageFilter);
return WitPaged(null, pageFilter); }
}
/// <summary>
/// <summary> /// 排序分页查询数据
/// 排序分页查询数据 /// </summary>
/// </summary> /// <param name="pageFilter">分页过滤实体</param>
/// <param name="pageFilter">分页过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("OrderPaged")]
[HttpPost, Route("OrderPaged")] public PagedActionResult<T_NW_ROLE_DATA_PERM> OrderPaged([FromBody]KeywordPageFilter pageFilter)
public PagedActionResult<T_NW_ROLE_DATA_PERM> OrderPaged([FromBody]KeywordPageFilter pageFilter) {
{ return WitOrderPaged(null, pageFilter);
return WitOrderPaged(null, pageFilter); }
}
/// <summary>
/// <summary> /// 根据主键删除数据
/// 根据主键删除数据 /// </summary>
/// </summary> /// <param name="id">主键ID</param>
/// <param name="id">主键ID</param> /// <returns></returns>
/// <returns></returns> [HttpGet, Route("Delete")]
[HttpGet, Route("Delete")] public JsonActionResult<bool> Delete(string id)
public JsonActionResult<bool> Delete(string id) {
{ return WitRealDelete(id);
return WitRealDelete(id); }
}
/// <summary>
/// <summary> /// 更新或新增数据
/// 更新或新增数据 /// </summary>
/// </summary> /// <param name="entity">对象实体</param>
/// <param name="entity">对象实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Update")]
[HttpPost, Route("Update")] public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_DATA_PERM entity)
public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_DATA_PERM entity) {
{ return WitUpdate(entity);
return WitUpdate(entity); }
}
/// <summary>
/// <summary> /// 批量更新
/// 批量更新 /// </summary>
/// </summary> /// <param name="entity">对象实体</param>
/// <param name="entity">对象实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("BatchUpdate")]
[HttpPost, Route("BatchUpdate")] public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_DATA_PERM> entity)
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_DATA_PERM> entity) {
{ return WitBantchUpdate(entity?.Data);
return WitBantchUpdate(entity?.Data); }
}
/// <summary>
/// <summary> /// 批量删除数据
/// 批量删除数据 /// </summary>
/// </summary> /// <param name="ids">id字符串id用逗号分隔</param>
/// <param name="ids">id字符串id用逗号分隔</param> /// <returns></returns>
/// <returns></returns> [HttpGet, Route("BatchDelete")]
[HttpGet, Route("BatchDelete")] public JsonActionResult<bool> BatchDelete(string ids)
public JsonActionResult<bool> BatchDelete(string ids) {
{ return WitRealBatchDelete(ids);
return WitRealBatchDelete(ids); }
}
/// <summary>
/// <summary> /// 获得单条实体数据
/// 获得单条实体数据 /// </summary>
/// </summary> /// <param name="filter">过滤实体</param>
/// <param name="filter">过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Get")]
[HttpPost, Route("Get")] public JsonActionResult<T_NW_ROLE_DATA_PERM> Get([FromBody] KeywordFilter filter)
public JsonActionResult<T_NW_ROLE_DATA_PERM> Get([FromBody] KeywordFilter filter) {
{ return WitEntity(null, filter);
return WitEntity(null, filter); }
}
}
} #endregion
#endregion
#region RoleMenu-
#region RoleMenu- /// <summary>
/// <summary> /// 子企业权限表
/// 子企业权限表 /// </summary>
/// </summary> [Route("api/NW/RoleMenu")]
[Route("api/NW/RoleMenu")] public partial class RoleMenuController : AuthorizeApiController<T_NW_ROLE_MENU>
public partial class RoleMenuController : AuthorizeApiController<T_NW_ROLE_MENU> {
{ /// <summary>
/// <summary> /// 查询所有数据
/// 查询所有数据 /// </summary>
/// </summary> /// <param name="filter">过滤实体</param>
/// <param name="filter">过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Entities")]
[HttpPost, Route("Entities")] public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> Entities([FromBody]KeywordFilter filter)
public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> Entities([FromBody]KeywordFilter filter) {
{ return WitEntities(null, filter);
return WitEntities(null, filter); }
}
/// <summary>
/// <summary> /// 排序查询所有数据
/// 排序查询所有数据 /// </summary>
/// </summary> /// <param name="filter">过滤实体</param>
/// <param name="filter">过滤实体</param> /// <returns></returns>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
[HttpPost, Route("OrderEntities")] public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> OrderEntities([FromBody]KeywordFilter filter)
public JsonActionResult<IEnumerable<T_NW_ROLE_MENU>> OrderEntities([FromBody]KeywordFilter filter) {
{ return WitOrderEntities(null, filter);
return WitOrderEntities(null, filter); }
}
/// <summary>
/// <summary> /// 分页查询数据
/// 分页查询数据 /// </summary>
/// </summary> /// <param name="pageFilter">分页过滤实体</param>
/// <param name="pageFilter">分页过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Paged")]
[HttpPost, Route("Paged")] public PagedActionResult<T_NW_ROLE_MENU> Paged([FromBody]KeywordPageFilter pageFilter)
public PagedActionResult<T_NW_ROLE_MENU> Paged([FromBody]KeywordPageFilter pageFilter) {
{ return WitPaged(null, pageFilter);
return WitPaged(null, pageFilter); }
}
/// <summary>
/// <summary> /// 排序分页查询数据
/// 排序分页查询数据 /// </summary>
/// </summary> /// <param name="pageFilter">分页过滤实体</param>
/// <param name="pageFilter">分页过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("OrderPaged")]
[HttpPost, Route("OrderPaged")] public PagedActionResult<T_NW_ROLE_MENU> OrderPaged([FromBody]KeywordPageFilter pageFilter)
public PagedActionResult<T_NW_ROLE_MENU> OrderPaged([FromBody]KeywordPageFilter pageFilter) {
{ return WitOrderPaged(null, pageFilter);
return WitOrderPaged(null, pageFilter); }
}
/// <summary>
/// <summary> /// 根据主键删除数据
/// 根据主键删除数据 /// </summary>
/// </summary> /// <param name="id">主键ID</param>
/// <param name="id">主键ID</param> /// <returns></returns>
/// <returns></returns> [HttpGet, Route("Delete")]
[HttpGet, Route("Delete")] public JsonActionResult<bool> Delete(string id)
public JsonActionResult<bool> Delete(string id) {
{ return WitRealDelete(id);
return WitRealDelete(id); }
}
/// <summary>
/// <summary> /// 更新或新增数据
/// 更新或新增数据 /// </summary>
/// </summary> /// <param name="entity">对象实体</param>
/// <param name="entity">对象实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Update")]
[HttpPost, Route("Update")] public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_MENU entity)
public JsonActionResult<bool> Update([FromBody]T_NW_ROLE_MENU entity) {
{ return WitUpdate(entity);
return WitUpdate(entity); }
}
/// <summary>
/// <summary> /// 批量更新
/// 批量更新 /// </summary>
/// </summary> /// <param name="entity">对象实体</param>
/// <param name="entity">对象实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("BatchUpdate")]
[HttpPost, Route("BatchUpdate")] public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_MENU> entity)
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_NW_ROLE_MENU> entity) {
{ return WitBantchUpdate(entity?.Data);
return WitBantchUpdate(entity?.Data); }
}
/// <summary>
/// <summary> /// 批量删除数据
/// 批量删除数据 /// </summary>
/// </summary> /// <param name="ids">id字符串id用逗号分隔</param>
/// <param name="ids">id字符串id用逗号分隔</param> /// <returns></returns>
/// <returns></returns> [HttpGet, Route("BatchDelete")]
[HttpGet, Route("BatchDelete")] public JsonActionResult<bool> BatchDelete(string ids)
public JsonActionResult<bool> BatchDelete(string ids) {
{ return WitRealBatchDelete(ids);
return WitRealBatchDelete(ids); }
}
/// <summary>
/// <summary> /// 获得单条实体数据
/// 获得单条实体数据 /// </summary>
/// </summary> /// <param name="filter">过滤实体</param>
/// <param name="filter">过滤实体</param> /// <returns></returns>
/// <returns></returns> [HttpPost, Route("Get")]
[HttpPost, Route("Get")] public JsonActionResult<T_NW_ROLE_MENU> Get([FromBody] KeywordFilter filter)
public JsonActionResult<T_NW_ROLE_MENU> Get([FromBody] KeywordFilter filter) {
{ return WitEntity(null, filter);
return WitEntity(null, filter); }
}
}
} #endregion
#endregion }
}

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -1,13 +1,13 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件基础接口类 // T4模板文件基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -21,5 +21,4 @@ using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.ApiModel.PF;
namespace APT.PP.WebApi.Controllers.Api namespace APT.PP.WebApi.Controllers.Api
{ {
}
}

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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