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

Compare commits

base: wyw:37f7d5fad2983b98afb001ab63436e3249eab5a9
Branches Tags
wyw:master
...
compare: wyw:fdf4bd38d63a0bbdb378ebf8f82caa5605a27a97
Branches Tags
wyw:master

2 Commits
37f7d5fad2 ... fdf4bd38d6

Author SHA1 Message Date
wyw
fdf4bd38d6 213 2025-10-24 11:50:51 +08:00
wyw
4759c66c1a 1、审批模板 审批明细 添加 ISHEAD 
2、审批表单 添加 驳回api属性
3、总部获取 子公司信息修改
 2025-10-24 11:47:37 +08:00
23 changed files with 243996 additions and 116452 deletions
Show Stats Expand all files Collapse all files

134
APT.BaseData.Domain/Entities/PF/T_PF_APPROVE.cs
View File

@ -8,89 +8,91 @@ using APT.BaseData.Domain.Entities.FM;
namespace APT.BaseData.Domain.Entities namespace APT.BaseData.Domain.Entities
{ {
[Description("审批流主表")] [Description("审批流主表")]
public partial class T_PF_APPROVE : MesEntityBase public partial class T_PF_APPROVE : MesEntityBase
{ {
[Description("流程编码")] [Description("流程编码")]
[FormFieldEdit] [FormFieldEdit]
[FormFieldQuery] [FormFieldQuery]
[FormFieldTable] [FormFieldTable]
[DataFieldLength(20)] [DataFieldLength(20)]
public string CODE { get; set; } public string CODE { get; set; }
/// <summary> /// <summary>
/// 显示名称 /// 显示名称
/// </summary> /// </summary>
[Description("流程名称")] [Description("流程名称")]
[FormFieldEdit] [FormFieldEdit]
[FormFieldQuery] [FormFieldQuery]
[FormFieldTable] [FormFieldTable]
[DataFieldLength(50)] [DataFieldLength(50)]
public string NAME { get; set; } public string NAME { get; set; }
[FormFieldEdit] [FormFieldEdit]
[FormFieldQuery] [FormFieldQuery]
[FormFieldTable] [FormFieldTable]
[DataFieldLength(10)] [DataFieldLength(10)]
[Description("审批表单编码")] [Description("审批表单编码")]
public string APPROVE_CODE { get; set; } public string APPROVE_CODE { get; set; }
[FormFieldEdit] [FormFieldEdit]
[FormFieldQuery] [FormFieldQuery]
[FormFieldTable] [FormFieldTable]
[Description("数据ID")] [Description("数据ID")]
public Guid DATA_ID { get; set; } public Guid DATA_ID { get; set; }
[Description("审批状态")] [Description("审批状态")]
[FormFieldEdit] [FormFieldEdit]
[FormFieldQuery] [FormFieldQuery]
[FormFieldTable] [FormFieldTable]
[EnumName("ApproveStatus")] [EnumName("ApproveStatus")]
public int APPROVE_STATUS { get; set; } public int APPROVE_STATUS { get; set; }
/// <summary> /// <summary>
///Get接口，需返回bool类型 ///Get接口，需返回bool类型
/// </summary> /// </summary>
[Description("回调接口")] [Description("回调接口")]
[FormFieldEdit] [FormFieldEdit]
[FormFieldTable] [FormFieldTable]
[DataFieldLength(100)] [DataFieldLength(100)]
public string CALLBACK_INTERFACE { get; set; } public string CALLBACK_INTERFACE { get; set; }
/// <summary> /// <summary>
/// 当前节点 /// 当前节点
/// </summary> /// </summary>
[DataFieldIngore] [DataFieldIngore]
public T_PF_APPROVE_DETAIL CurrentNode { get; set; } public T_PF_APPROVE_DETAIL CurrentNode { get; set; }
[FormFieldEdit] [FormFieldEdit]
[Description("导航：审批模板子表")] [Description("导航：审批模板子表")]
public ICollection<T_PF_APPROVE_DETAIL> Nav_ApproveDetails { get; set; } public ICollection<T_PF_APPROVE_DETAIL> Nav_ApproveDetails { get; set; }
/// <summary> /// <summary>
/// 当前节点 /// 当前节点
/// </summary> /// </summary>
[DataFieldIngore] [DataFieldIngore]
public bool IS_SEND_MESSAGE { get; set; } public bool IS_SEND_MESSAGE { get; set; }
[FormFieldEdit] [FormFieldEdit]
[DataFieldLength(200)] [DataFieldLength(200)]
[Description("自定义参数")] [Description("自定义参数")]
public string PARAM { get; set; } public string PARAM { get; set; }
/// <summary>
/// <summary> /// 是否取消
/// 是否取消 /// </summary>
/// </summary> [Description("是否取消")]
[Description("是否取消")] public bool ISCANCEL { get; set; }
public bool ISCANCEL { get; set; }
[Description("ÉóÅúÄ£°åID")] [Description("ÉóÅúÄ£°åID")]
public Guid? APPROVE_TEMP_ID { get; set; } public Guid? APPROVE_TEMP_ID { get; set; }
/// <summary>
/// 驳回接口
/// </summary>
[Description("²µ»Ø½Ó¿Ú")] [Description("²µ»Ø½Ó¿Ú")]
[DataFieldIngore] [DataFieldLength(100)]
public string REJECT_INTERFACE { get; set; } public string REJECT_INTERFACE { get; set; }
} }
} }

9
APT.BaseData.Domain/Entities/PF/T_PF_APPROVE_TEMP_DETAIL.cs
View File

@ -63,5 +63,14 @@ namespace APT.BaseData.Domain.Entities
[Description("½ÇÉ«ÀàÐÍ")] [Description("½ÇÉ«ÀàÐÍ")]
[EnumName("FMDepartmentType")] [EnumName("FMDepartmentType")]
public int DEPARTMENT_TYPE { get; set; } public int DEPARTMENT_TYPE { get; set; }
/// <summary>
/// 是否总部
/// </summary>
[Description("是否总部")]
[FormFieldTable]
[FormFieldQuery]
[FormFieldEdit]
public bool ISHEAD { get; set; } = false;
} }
} }

16
APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
View File

@ -396,6 +396,7 @@ namespace APT.BaseData.Services.Services.FM
approve.CALLBACK_INTERFACE = approveTemp.CALLBACK_INTERFACE; approve.CALLBACK_INTERFACE = approveTemp.CALLBACK_INTERFACE;
//一个表单对应多个模板时，保存自定义参数 //一个表单对应多个模板时，保存自定义参数
approve.PARAM = approveTemp.PARAM; approve.PARAM = approveTemp.PARAM;
approve.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
var approveRoles = approveTemp.Nav_ApproveTempDetails.Where(t => t.APPROVE_ROLE_ID != null).Select(x => (Guid)x.APPROVE_ROLE_ID).Distinct().ToList(); var approveRoles = approveTemp.Nav_ApproveTempDetails.Where(t => t.APPROVE_ROLE_ID != null).Select(x => (Guid)x.APPROVE_ROLE_ID).Distinct().ToList();
var ahApproveRole = this.GetEntities<T_PF_APPROVAL_ROLE>(t => t.NAME.Contains("安环"), new BaseFilter(approveTemp.ORG_ID)).Select(m => m.ID).ToList(); var ahApproveRole = this.GetEntities<T_PF_APPROVAL_ROLE>(t => t.NAME.Contains("安环"), new BaseFilter(approveTemp.ORG_ID)).Select(m => m.ID).ToList();
@ -428,6 +429,7 @@ namespace APT.BaseData.Services.Services.FM
detail.NUM = t.NUM; detail.NUM = t.NUM;
detail.APPROVE_ROLE_ID = t.APPROVE_ROLE_ID; detail.APPROVE_ROLE_ID = t.APPROVE_ROLE_ID;
detail.IS_ALLOW_UPDATE = t.IS_ALLOW_UPDATE; detail.IS_ALLOW_UPDATE = t.IS_ALLOW_UPDATE;
detail.ISHEAD = t.ISHEAD;
if (listNUM.Contains(t.NUM)) if (listNUM.Contains(t.NUM))
{ {
//如果传参未找到 就是没有 //如果传参未找到 就是没有
@ -623,6 +625,20 @@ namespace APT.BaseData.Services.Services.FM
if (listBSLog != null && listBSLog.Any()) if (listBSLog != null && listBSLog.Any())
BantchSaveEntityNoCommit(listBSLog);//有修改和新增 BantchSaveEntityNoCommit(listBSLog);//有修改和新增
}); });
#region //涉及到总部的人员 待办 直接把数据传到总部去
var checkAdd = appdetails.FirstOrDefault(e => e.ISHEAD && e.IS_CURRENT);
if (checkAdd != null)
{
try
{
}
catch (Exception ex) { }
}
#endregion
if (!string.IsNullOrEmpty(CALLBACK_INTERFACE)) if (!string.IsNullOrEmpty(CALLBACK_INTERFACE))
{ {
if (CALLBACK_INTERFACE.EndsWith("New")) if (CALLBACK_INTERFACE.EndsWith("New"))

40
APT.BaseData.Services/Services/FM/FMNotificationTaskService.cs
View File

@ -12,6 +12,7 @@ using System.Linq;
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.ApiModel.Platform; using APT.BaseData.Domain.ApiModel.Platform;
using APT.Infrastructure.Api.Redis; using APT.Infrastructure.Api.Redis;
using APT.Migrations;
namespace APT.BaseData.Services.Services.FM namespace APT.BaseData.Services.Services.FM
{ {
@ -1481,5 +1482,44 @@ namespace APT.BaseData.Services.Services.FM
#endregion #endregion
#region 总部待办处理
public void TaskToHead(IEnumerable<T_PF_APPROVE_DETAIL> appdetails, T_FM_NOTIFICATION_TASK taskNext, T_FM_NOTIFICATION_TASK taskLast)
{
var checkAdd = appdetails.FirstOrDefault(e => e.ISHEAD && e.IS_CURRENT);
if (checkAdd != null)
{
var isLastDeal = false;//上一个是审批相关
if (taskLast != null)
{
var checkLast = appdetails.FirstOrDefault(e => e.ISHEAD && e.APPROVE_USER_ID.HasValue && e.APPROVE_USER_ID.Value == taskLast.USER_ID);
if (checkLast != null)
isLastDeal = true;
}
try
{
using (var context = new MigrationContext(""))
{
if (isLastDeal && taskLast != null)
{
this.UpdateEntityByConn(taskLast, "");
}
if (taskNext != null)
{
this.AddEntityByConn(taskNext, "");
}
context.SaveChanges();
}
}
catch (Exception ex) { }
}
}
#endregion
} }
} }

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

@ -215,5 +215,72 @@ namespace APT.BaseData.Services.Services.OP
} }
return ""; return "";
} }
/// <summary>
/// 获取 ORG_ID的数据库链接
/// </summary>
/// <param name="TenantCOde">过滤值</param>
/// <returns></returns>
public string GetHeadConn(string TenantCOde)
{
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.ConnAll))
dicORGCONN = CsRedisManager.StringGet<Dictionary<Guid, string>>(RedisCacheKey.ConnAll);
}
#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);
List<Guid> listConnID = listTent.Select(e => e.DB_CONN_ID.Value).ToList();
var listDbConn = context.GetEntities<T_OP_TENANT_DB_CONN>(e => listConnID.Contains(e.ID), null, null);
if (listDbConn != null && listDbConn.Count() > 0)
{
var env = ConfigurationManager.AppSettings["Env"];
foreach (var item in listDbConn)
{
conn = item.DB_CONN;
if (env == ((int)EnvType.外网).ToString())
{
conn = item.DB_CONN_WAN;
}
if (!dicORGCONN.ContainsKey(item.ID))
{
dicORGCONN.Add(listTent.First(e => e.DB_CONN_ID == item.ID).ID, conn);
}
}
if (isRedisConfig && dicORGCONN.Count > 0)
{
try
{
CsRedisManager.StringSet<Dictionary<Guid, string>>(RedisCacheKey.ConnAll, dicORGCONN);//所有数据库链接 存入 Redis
}
catch { }
}
}
}
}
#endregion
if (dicORGCONN != null && dicORGCONN.Count > 0 && dicORGCONN.ContainsKey(ORG_ID))
{
return dicORGCONN[ORG_ID];
}
return "";
}
} }
} }

27
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -7651,7 +7651,14 @@ namespace APT.BaseData.Services.DomainServices
} }
var ret = string.Empty; var ret = string.Empty;
modelApp = this.GetEntity<T_PF_APPROVE>(entity.ID.ToString(), "Nav_ApproveDetails");
//BaseFilter filterH = new BaseFilter();
//filterH.IgnoreOrgRule = true;
//filterH.IgnoreDataRule = true;
//filterH.OrgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;// entity.ORG_ID;
//modelApp = this.GetEntity<T_PF_APPROVE>(e => e.ID == entity.ID, filterH, "Nav_ApproveDetails");
modelApp = this.GetEntity<T_PF_APPROVE>(e => e.ID == entity.ID, "Nav_ApproveDetails");
if (modelApp == null) if (modelApp == null)
this.ThrowError("020027"); this.ThrowError("020027");
@ -8653,8 +8660,8 @@ namespace APT.BaseData.Services.DomainServices
MODIFY_TIME = modelAdd.CREATE_TIME, MODIFY_TIME = modelAdd.CREATE_TIME,
CREATER_ID = modelAdd.CREATER_ID, CREATER_ID = modelAdd.CREATER_ID,
MODIFIER_ID = modelAdd.CREATER_ID, MODIFIER_ID = modelAdd.CREATER_ID,
DEPARTMENT_ID = depMade.ID,//制表人 所在组织 DEPARTMENT_ID = depMade.ID,//制表人 所在组织
//RESPONOBJECT = modelAdd.RESPONOBJECT, //RESPONOBJECT = modelAdd.RESPONOBJECT,
}); });
listCheckDetail.Add(item); listCheckDetail.Add(item);
@ -13129,7 +13136,7 @@ namespace APT.BaseData.Services.DomainServices
{ {
if (de != null) if (de != null)
{ {
var departTemp = librarys.FirstOrDefault(t =>t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID); var departTemp = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID);
T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL(); T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL();
detail.ORG_ID = entity.ORG_ID; detail.ORG_ID = entity.ORG_ID;
detail.RISK_EVALUATION_ID = result.ID; detail.RISK_EVALUATION_ID = result.ID;
@ -13202,7 +13209,7 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = item.ORG_ID; dep.ORG_ID = item.ORG_ID;
dep.RISK_EVALUATION_DETAIL_ID = detail.ID; dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
detailPosts.Add(dep); detailPosts.Add(dep);
if (item.Nav_PostDetails!=null && item.Nav_PostDetails.Any()) if (item.Nav_PostDetails != null && item.Nav_PostDetails.Any())
{ {
foreach (var item2 in item.Nav_PostDetails) foreach (var item2 in item.Nav_PostDetails)
{ {
@ -13556,8 +13563,8 @@ namespace APT.BaseData.Services.DomainServices
detailPostDetailSums.Add(depDetail); detailPostDetailSums.Add(depDetail);
postIds.Add((Guid)item2.POST_ID); postIds.Add((Guid)item2.POST_ID);
} }
var postFirstTemp = userPosts.Where(t => postIds.Contains(t.ID)).Select(m=>m.NAME).Distinct().ToList(); var postFirstTemp = userPosts.Where(t => postIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
var postTempx = i + "、" + string.Join(",",postFirstTemp) + "；"; var postTempx = i + "、" + string.Join(",", postFirstTemp) + "；";
detail.EVALUATION_POST = detail.EVALUATION_POST + departTempx; detail.EVALUATION_POST = detail.EVALUATION_POST + departTempx;
} }
i++; i++;
@ -13567,7 +13574,7 @@ namespace APT.BaseData.Services.DomainServices
} }
var param = "部门级"; var param = "部门级";
var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE; var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
if (dminetype == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes) if (dminetype == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes)
{ {
param = "公司级"; param = "公司级";
} }
@ -13589,7 +13596,7 @@ namespace APT.BaseData.Services.DomainServices
result.STATUS = PFStandardStatus.Archived; result.STATUS = PFStandardStatus.Archived;
if (user != null && resultDetails != null && resultDetails.Any()) if (user != null && resultDetails != null && resultDetails.Any())
{ {
var productionId = resultDetails.FirstOrDefault(t=>t.PRODUCTION_UNIT_ID!=null).PRODUCTION_UNIT_ID; var productionId = resultDetails.FirstOrDefault(t => t.PRODUCTION_UNIT_ID != null).PRODUCTION_UNIT_ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
//var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); //var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
@ -13911,7 +13918,7 @@ namespace APT.BaseData.Services.DomainServices
var sumDetailPostDets = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(t => sumPostIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID)); var sumDetailPostDets = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(t => sumPostIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID));
var sumDetailDeparts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)); var sumDetailDeparts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID));
var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID);
var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID!=null)?.PRODUCTION_UNIT_ID; var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID != null)?.PRODUCTION_UNIT_ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
//var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); //var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();

129880
APT.Data.Migrations/Migrations/20251024013621_wyw2025102401.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

35
APT.Data.Migrations/Migrations/20251024013621_wyw2025102401.cs Normal file
View File

@ -0,0 +1,35 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025102401 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "ISHEAD",
table: "T_PF_APPROVE_TEMP_DETAIL",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "REJECT_INTERFACE",
table: "T_PF_APPROVE",
type: "nvarchar(100)",
maxLength: 100,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ISHEAD",
table: "T_PF_APPROVE_TEMP_DETAIL");
migrationBuilder.DropColumn(
name: "REJECT_INTERFACE",
table: "T_PF_APPROVE");
}
}
}

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

@ -11649,6 +11649,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(200) .HasMaxLength(200)
.HasColumnType("nvarchar(200)"); .HasColumnType("nvarchar(200)");
b.Property<string>("REJECT_INTERFACE")
.HasMaxLength(100)
.HasColumnType("nvarchar(100)");
b.HasKey("ID"); b.HasKey("ID");
b.HasIndex("ORG_ID"); b.HasIndex("ORG_ID");
@ -11884,6 +11888,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID") b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<bool>("ISHEAD")
.HasColumnType("bit");
b.Property<bool>("IS_ALLOW_UPDATE") b.Property<bool>("IS_ALLOW_UPDATE")
.HasColumnType("bit"); .HasColumnType("bit");

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

@ -15604,7 +15604,7 @@ builder.Property(t => t.CALLBACK_INTERFACE).HasMaxLength(100);
builder.Ignore(t => t.CurrentNode); builder.Ignore(t => t.CurrentNode);
builder.Ignore(t => t.IS_SEND_MESSAGE); builder.Ignore(t => t.IS_SEND_MESSAGE);
builder.Property(t => t.PARAM).HasMaxLength(200); builder.Property(t => t.PARAM).HasMaxLength(200);
builder.Ignore(t => t.REJECT_INTERFACE); builder.Property(t => t.REJECT_INTERFACE).HasMaxLength(100);
} }
} }
#endregion #endregion

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -1,137 +1,128 @@
 
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//------------------------------------------------------------------------------
using APT.Infrastructure.Core;
//------------------------------------------------------------------------------ using Microsoft.AspNetCore.Mvc;
// T4模板文件：基础接口类 using System.Collections.Generic;
// 此代码由T4模板自动生成 using APT.Utility;
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using APT.Infrastructure.Api;
//------------------------------------------------------------------------------ using APT.BaseData.Domain.ApiModel.PF;
using APT.Infrastructure.Core; namespace APT.LG.WebApi.Controllers.Api
using Microsoft.AspNetCore.Mvc; {
using System.Collections.Generic;
using APT.Utility;
using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF;
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
}

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

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

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

File diff suppressed because it is too large Load Diff

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

@ -674,7 +674,9 @@
{ {
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); filter.Include = new List<string>();
filter.FilterGroup = new FilterGroup();
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.ID == result.APPROVE_TEMP_ID, filter);
if (approveTemp != null) if (approveTemp != null)
result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE; result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
} }
@ -956,8 +958,12 @@
expression = expression.And(e => e.PARAM == keywordFilter.Parameter1); expression = expression.And(e => e.PARAM == keywordFilter.Parameter1);
} }
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId; //var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
var dbApprove = this.GetEntities<T_PF_APPROVE>(expression, new BaseFilter(keywordFilter.OrgId), new string[] { "Nav_ApproveDetails.Nav_ApproveUser" }).OrderByDescending(t => t.CREATE_TIME).ToList(); BaseFilter baseFilter = new BaseFilter();
baseFilter.IgnoreDataRule = true;
baseFilter.IgnoreOrgRule = true;
baseFilter.OrgId = null;
var dbApprove = this.GetEntities<T_PF_APPROVE>(expression, baseFilter, new string[] { "Nav_ApproveDetails.Nav_ApproveUser" }).OrderByDescending(t => t.CREATE_TIME).ToList();
if (!dbApprove.Any()) if (!dbApprove.Any())
return null; return null;
return dbApprove; return dbApprove;

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

File diff suppressed because it is too large Load Diff

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

@ -1,13 +1,7 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -21,5 +15,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
{ {
}
}

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff