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

Compare commits

base: wyw:370976960b078955de97e9b62aa0639fd70b13fe
Branches Tags
wyw:master
..
compare: wyw:53fc12b0fa99deecd7ddd7b33d08a7a0e1aafe71
Branches Tags
wyw:master

No commits in common. "370976960b078955de97e9b62aa0639fd70b13fe" and "53fc12b0fa99deecd7ddd7b33d08a7a0e1aafe71" have entirely different histories.
370976960b ... 53fc12b0fa

22 changed files with 149146 additions and 286215 deletions
Show Stats Expand all files Collapse all files

7
APT.BaseData.Domain/Entities/PF/T_PF_ANNOURCEMENT.cs
View File

@ -98,12 +98,5 @@ namespace APT.BaseData.Domain.Entities
/// </summary>
[Description("下发哪些子公司")]
public ICollection<T_PF_ANNOURCEMENT_ORG> Nav_Orgs { get; set; }
/// <summary>
/// 撰稿人
/// </summary>
[Description("撰稿人")]
[DataFieldIngore]
public string CREATE_USER_NAME { get; set; }
}
}

11
APT.BaseData.Domain/Entities/PF/T_PF_BITITLE.cs
View File

@ -18,17 +18,10 @@ namespace APT.BaseData.Domain.Entities
/// </summary>
[Description("标语")]
[FormFieldEdit]
[DataFieldLength(1500)]
public string TITLE { get; set; }
/// <summary>
/// 显示标语
/// </summary>
[Description("显示标语")]
[FormFieldTable]
[FormFieldQuery]
[DataFieldLength(500)]
public string TITLE_SHOW { get; set; }
[DataFieldLength(1000)]
public string TITLE { get; set; }
/// <summary>
/// 版本号

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

@ -160,9 +160,6 @@ namespace APT.BaseData.Services.Services.OP
if (dicORGCONN != null && dicORGCONN.Count > 0 && dicORGCONN.ContainsKey(ORG_ID))
{
//string strConn = dicORGCONN[ORG_ID];
//strConn = strConn.Replace("127.0.0.1", "124.117.209.78");
//return strConn;
return dicORGCONN[ORG_ID];
}
return "";

139649
APT.Data.Migrations/Migrations/20260509075107_wyw2026050902.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

46
APT.Data.Migrations/Migrations/20260509075107_wyw2026050902.cs
View File

@ -1,46 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2026050902 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "TITLE",
table: "T_PF_BITITLE",
type: "nvarchar(1500)",
maxLength: 1500,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(1000)",
oldMaxLength: 1000,
oldNullable: true);
migrationBuilder.AddColumn<string>(
name: "TITLE_SHOW",
table: "T_PF_BITITLE",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "TITLE_SHOW",
table: "T_PF_BITITLE");
migrationBuilder.AlterColumn<string>(
name: "TITLE",
table: "T_PF_BITITLE",
type: "nvarchar(1000)",
maxLength: 1000,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(1500)",
oldMaxLength: 1500,
oldNullable: true);
}
}
}

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

@ -12260,12 +12260,8 @@ namespace APT.Data.Migrations.Migrations
.HasColumnType("int");
b.Property<string>("TITLE")
.HasMaxLength(1500)
.HasColumnType("nvarchar(1500)");
b.Property<string>("TITLE_SHOW")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
.HasMaxLength(1000)
.HasColumnType("nvarchar(1000)");
b.Property<Guid>("USER_ID_CREATER")
.HasColumnType("uniqueidentifier");

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

@ -16696,7 +16696,6 @@ builder.HasOne(t => t.Nav_Tenant).WithMany().HasForeignKey(t => t.TEMPLATE_ID).O
builder.Property(t => t.TITLE).HasMaxLength(300);
builder.Property(t => t.ABSTRACT).HasMaxLength(1000);
builder.Property(t => t.CONTENT).HasMaxLength(5000);
builder.Ignore(t => t.CREATE_USER_NAME);
}
}
#endregion
@ -16872,8 +16871,7 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
public override void Configure(EntityTypeBuilder<T_PF_BITITLE> builder)
{
base.Configure(builder);
builder.Property(t => t.TITLE).HasMaxLength(1500);
builder.Property(t => t.TITLE_SHOW).HasMaxLength(500);
builder.Property(t => t.TITLE).HasMaxLength(1000);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID_CREATER).OnDelete(DeleteBehavior.Restrict);
}
}

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

@ -13,6 +13,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -30,6 +36,7 @@ namespace APT.BD.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护
/// <summary>
/// HMI资源表维护
@ -139,10 +146,12 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region Picture-图片资源
/// <summary>
/// 图片资源
@ -252,10 +261,12 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region PictureFile-资源图片文件
/// <summary>
/// 资源图片文件
@ -365,10 +376,12 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region Place-区域表
/// <summary>
/// 区域表
@ -476,6 +489,7 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -488,10 +502,12 @@ namespace APT.BD.WebApi.Controllers.Api
}
}
#endregion
#region ServerInfo-服务器信息表
/// <summary>
/// 服务器信息表
@ -601,10 +617,12 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region SystemInfo-系统信息表
/// <summary>
/// 系统信息表
@ -714,10 +732,12 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region WordTemplate-WORD模板维护
/// <summary>
/// WORD模板维护
@ -827,7 +847,9 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
}

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

@ -13,6 +13,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -30,6 +36,7 @@ namespace APT.BS.WebApi.Controllers.Api
using APT.MS.Domain.Entities.BS;
#region CheckContent-检查内容表
/// <summary>
/// 检查内容表
@ -139,10 +146,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContents-检查内容
/// <summary>
/// 检查内容
@ -252,10 +261,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentCheckType-检查类型
/// <summary>
/// 检查类型
@ -365,10 +376,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
/// <summary>
/// 检查内容检查类型子表(关联层级)
@ -478,10 +491,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentHmRiskArea-检查区域
/// <summary>
/// 检查区域
@ -591,10 +606,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckMain-安全检查库
/// <summary>
/// 安全检查库
@ -704,10 +721,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentMainDepartment-安全检查库责任部门
/// <summary>
/// 安全检查库责任部门
@ -817,10 +836,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentQuestion-检查问题
/// <summary>
/// 检查问题
@ -930,10 +951,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckMainLaw-检查库法规
/// <summary>
/// 检查库法规
@ -1043,10 +1066,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProject-检查项目
/// <summary>
/// 检查项目
@ -1156,10 +1181,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectCategory-检查项目分类表
/// <summary>
/// 检查项目分类表
@ -1269,10 +1296,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectCategoryChecktype-检查项目分类_检查类型
/// <summary>
/// 检查项目分类_检查类型
@ -1382,10 +1411,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectCategoryObject-检查项目分类_检查区域
/// <summary>
/// 检查项目分类_检查区域
@ -1495,10 +1526,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectProjectCategory-检查项目分类
/// <summary>
/// 检查项目分类
@ -1608,10 +1641,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckQuestion-检查问题
/// <summary>
/// 检查问题
@ -1721,10 +1756,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckType-检查类型表
/// <summary>
/// 检查类型表
@ -1831,6 +1868,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -1844,10 +1882,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckTypeLevel-检查层级
/// <summary>
/// 检查层级
@ -1957,10 +1997,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckTypeMinetype-检查类型生产单元
/// <summary>
/// 检查类型生产单元
@ -2070,10 +2112,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region DepartmentAreaobject-部门范围
/// <summary>
/// 部门范围
@ -2183,10 +2227,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region OperateLog-操作日志
/// <summary>
/// 操作日志
@ -2296,10 +2342,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSet-制定任务
/// <summary>
/// 制定任务
@ -2409,10 +2457,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetArea-制定任务区域
/// <summary>
/// 制定任务区域
@ -2522,10 +2572,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetDepartmentOut-制定任务排除组织
/// <summary>
/// 制定任务排除组织
@ -2635,10 +2687,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetDepObject-制定任务部门触发范围
/// <summary>
/// 制定任务部门触发范围
@ -2748,10 +2802,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetObject-制定任务触发范围
/// <summary>
/// 制定任务触发范围
@ -2861,10 +2917,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskCategory-隐患类别
/// <summary>
/// 隐患类别
@ -2974,10 +3032,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskLevelDelayDays-隐患等级最长延期整改天数
/// <summary>
/// 隐患等级最长延期整改天数
@ -3087,10 +3147,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskReason-隐患原因表
/// <summary>
/// 隐患原因表
@ -3200,10 +3262,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmit-隐患上报表
/// <summary>
/// 隐患上报表
@ -3313,10 +3377,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContent-隐患上报明细
/// <summary>
/// 隐患上报明细
@ -3426,10 +3492,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentBack-隐患上报明细退回
/// <summary>
/// 隐患上报明细退回
@ -3539,10 +3607,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDeal-隐患整改记录
/// <summary>
/// 隐患整改记录
@ -3652,10 +3722,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealAfterFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3765,10 +3837,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3878,10 +3952,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
/// <summary>
/// 隐患整改验收人签名
@ -3991,10 +4067,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealUsersign-隐患整改责任人签名
/// <summary>
/// 隐患整改责任人签名
@ -4104,10 +4182,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -4217,10 +4297,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentReason-隐患上报明细原因
/// <summary>
/// 隐患上报明细原因
@ -4330,10 +4412,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentTemp-隐患上报详情待入库
/// <summary>
/// 隐患上报详情待入库
@ -4443,10 +4527,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitDelayApply-延期整改申请
/// <summary>
/// 延期整改申请
@ -4556,10 +4642,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitDelayApplyDetail-延期整改申请详情
/// <summary>
/// 延期整改申请详情
@ -4669,10 +4757,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -4782,10 +4872,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitNotice-隐患通知
/// <summary>
/// 隐患通知
@ -4895,10 +4987,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitNoticePerson-隐患通知
/// <summary>
/// 隐患通知
@ -5008,10 +5102,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskTpm-TPM对接数据
/// <summary>
/// TPM对接数据
@ -5121,10 +5217,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheck-安全检查
/// <summary>
/// 安全检查
@ -5234,10 +5332,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetail-检查明细
/// <summary>
/// 检查明细
@ -5347,10 +5447,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -5460,10 +5562,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailLaw-检查依据
/// <summary>
/// 检查依据
@ -5573,10 +5677,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailQuestion-检查明细问题
/// <summary>
/// 检查明细问题
@ -5686,10 +5792,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailReason-检查明细隐患原因
/// <summary>
/// 检查明细隐患原因
@ -5799,10 +5907,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailReject-检查明细退回
/// <summary>
/// 检查明细退回
@ -5912,10 +6022,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailRejectFile-检查明细退回附件
/// <summary>
/// 检查明细退回附件
@ -6025,10 +6137,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailUser-检查明细人员
/// <summary>
/// 检查明细人员
@ -6138,10 +6252,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckFile-安全检查文件
/// <summary>
/// 安全检查文件
@ -6251,10 +6367,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckProject-安全检查文件
/// <summary>
/// 安全检查文件
@ -6364,10 +6482,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckProjectCategory-安全检查文件
/// <summary>
/// 安全检查文件
@ -6477,10 +6597,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckRecord-检查记录确认
/// <summary>
/// 检查记录确认
@ -6590,10 +6712,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckRecordDetail-检查记录确认明细
/// <summary>
/// 检查记录确认明细
@ -6703,10 +6827,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckRiskArea-检查区域
/// <summary>
/// 检查区域
@ -6816,10 +6942,12 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckUsersign-检查签名
/// <summary>
/// 检查签名
@ -6929,7 +7057,9 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
}

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

@ -13,6 +13,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -31,6 +37,7 @@ namespace APT.FM.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities;
#region Api-API
/// <summary>
/// API
@ -140,10 +147,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region BaseAdd-企业位置信息
/// <summary>
/// 企业位置信息
@ -253,10 +262,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region BaseEnergy-企业能耗配置信息
/// <summary>
/// 企业能耗配置信息
@ -366,10 +377,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region BaseInfo-企业基本信息
/// <summary>
/// 企业基本信息
@ -479,10 +492,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCalendarConfig-部门日历配置表
/// <summary>
/// 部门日历配置表
@ -592,10 +607,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCalendarConfigDetail-部门日历配置明细表
/// <summary>
/// 部门日历配置明细表
@ -705,10 +722,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCalendarConfigTeam-部门日历配置班组表
/// <summary>
/// 部门日历配置班组表
@ -818,10 +837,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCompletion-XX班完成情况统计
/// <summary>
/// XX班完成情况统计
@ -931,10 +952,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCompletionSort-班组完成情况前十
/// <summary>
/// 班组完成情况前十
@ -1044,10 +1067,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentPost-部门岗位
/// <summary>
/// 部门岗位
@ -1157,10 +1182,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentPostUser-部门岗位人员
/// <summary>
/// 部门岗位人员
@ -1270,10 +1297,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -1383,10 +1412,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentSafeuser-安全员表
/// <summary>
/// 安全员表
@ -1496,10 +1527,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentScheduling-部门排班表
/// <summary>
/// 部门排班表
@ -1609,10 +1642,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentSchedulingDetail-排班信息人员明细表
/// <summary>
/// 排班信息人员明细表
@ -1722,10 +1757,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentUser-部门人员表
/// <summary>
/// 部门人员表
@ -1835,10 +1872,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Enum-枚举管理
/// <summary>
/// 枚举管理
@ -1948,10 +1987,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Enums-枚举表单
/// <summary>
/// 枚举表单
@ -2061,10 +2102,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region EnumItem-枚举项
/// <summary>
/// 枚举项
@ -2174,10 +2217,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region EnumType-枚举类别
/// <summary>
/// 枚举类别
@ -2287,10 +2332,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region HiddenDangerRectification-隐患整改完成情况统计
/// <summary>
/// 隐患整改完成情况统计
@ -2400,10 +2447,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region JobActivityCompletion-班组作业完成率统计
/// <summary>
/// 班组作业完成率统计
@ -2513,10 +2562,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region MessageTemplate-短信模板表
/// <summary>
/// 短信模板表
@ -2626,10 +2677,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Monitoring-服务器监听表
/// <summary>
/// 服务器监听表
@ -2739,10 +2792,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Notice-信息通知表
/// <summary>
/// 信息通知表
@ -2852,10 +2907,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region NotificationTask-娑堟伅琛?
/// <summary>
/// 娑堟伅琛?
@ -2965,10 +3022,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
/// <summary>
/// 寰呭姙琛ㄦ椂闂撮厤缃?
@ -3078,10 +3137,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region ParamSet-参数设置表
/// <summary>
/// 参数设置表
@ -3191,10 +3252,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region ParamSetDepartment-组织关联信息
/// <summary>
/// 组织关联信息
@ -3304,10 +3367,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Person-人员信息
/// <summary>
/// 人员信息
@ -3417,10 +3482,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonCertificateFile-证书
/// <summary>
/// 证书
@ -3530,10 +3597,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonEducationFile-学历证
/// <summary>
/// 学历证
@ -3643,10 +3712,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonIdcardFile-身份证
/// <summary>
/// 身份证
@ -3756,10 +3827,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonSkills-技能
/// <summary>
/// 技能
@ -3869,10 +3942,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonWork-工作经历
/// <summary>
/// 工作经历
@ -3982,10 +4057,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region RiskLevelProportion-风险等级占比
/// <summary>
/// 风险等级占比
@ -4095,10 +4172,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region RiskTypeProportion-风险类别占比
/// <summary>
/// 风险类别占比
@ -4208,10 +4287,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region RoleDepartment-部门权限
/// <summary>
/// 部门权限
@ -4321,10 +4402,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Snapshot-随手拍
/// <summary>
/// 随手拍
@ -4434,10 +4517,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SnapshotFile-随手拍图片
/// <summary>
/// 随手拍图片
@ -4547,10 +4632,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncLimit-数据同步次数限制
/// <summary>
/// 数据同步次数限制
@ -4660,10 +4747,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncLog-跑批日志表
/// <summary>
/// 跑批日志表
@ -4773,10 +4862,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncLogDetail-跑批日志明细表
/// <summary>
/// 跑批日志明细表
@ -4886,10 +4977,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncUserRule-用户数据同步例外配置
/// <summary>
/// 用户数据同步例外配置
@ -4999,10 +5092,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Team-班组表
/// <summary>
/// 班组表
@ -5112,10 +5207,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region TeamPerson-班组人员关联信息
/// <summary>
/// 班组人员关联信息
@ -5225,10 +5322,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserDepartment-用户部门关联表
/// <summary>
/// 用户部门关联表
@ -5338,10 +5437,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserPost-宀椾綅鍒楄〃
/// <summary>
/// 宀椾綅鍒楄〃
@ -5451,10 +5552,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -5564,10 +5667,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserProductionUnitSet-生产单元
/// <summary>
/// 生产单元
@ -5677,10 +5782,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserSignFile-签名照片
/// <summary>
/// 签名照片
@ -5790,10 +5897,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserTest-测试多选
/// <summary>
/// 测试多选
@ -5903,10 +6012,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserVacationSet-人员休假设置
/// <summary>
/// 人员休假设置
@ -6016,10 +6127,12 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region WorkTicketCompletion-关键许可工作票完成情况统计
/// <summary>
/// 关键许可工作票完成情况统计
@ -6129,7 +6242,9 @@ using APT.BaseData.Domain.Entities;
}
#endregion
}

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -13,6 +13,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -29,6 +35,7 @@ namespace APT.LG.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.LG;
#region Oprate-表单操作日志表
/// <summary>
/// 表单操作日志表
@ -137,6 +144,8 @@ namespace APT.LG.WebApi.Controllers.Api
}
}
#endregion
}

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

@ -13,6 +13,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -30,6 +36,7 @@ namespace APT.NW.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities.NW;
#region Enterprise-子企业表
/// <summary>
/// 子企业表
@ -137,6 +144,7 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -149,10 +157,12 @@ namespace APT.NW.WebApi.Controllers.Api
}
}
#endregion
#region RoleDataPerm-子企业数据权限表
/// <summary>
/// 子企业数据权限表
@ -262,10 +272,12 @@ namespace APT.NW.WebApi.Controllers.Api
}
#endregion
#region RoleMenu-子企业权限表
/// <summary>
/// 子企业权限表
@ -375,7 +387,9 @@ namespace APT.NW.WebApi.Controllers.Api
}
#endregion
}

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

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -23,6 +29,7 @@ namespace APT.OP.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.OP;
#region Alluser-用户表(租户平台)
/// <summary>
/// 用户表(租户平台)
@ -131,9 +138,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region BillingRule-计费规则表
/// <summary>
/// 计费规则表
@ -242,9 +251,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region BillingRuleVersion-计费规则子表
/// <summary>
/// 计费规则子表
@ -353,9 +364,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region ChargeTimeSet-充电时长配置
/// <summary>
/// 充电时长配置
@ -464,9 +477,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Client-客户表
/// <summary>
/// 客户表
@ -575,9 +590,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region ClinetOpenid-客户表OpenId
/// <summary>
/// 客户表OpenId
@ -686,9 +703,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region CommonQuestion-常见问题
/// <summary>
/// 常见问题
@ -797,9 +816,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region FileFirmware-充电桩固件表
/// <summary>
/// 充电桩固件表
@ -908,9 +929,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Member-会员表
/// <summary>
/// 会员表
@ -1019,9 +1042,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Menu-菜单表(租户平台)
/// <summary>
/// 菜单表(租户平台)
@ -1129,6 +1154,7 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -1140,9 +1166,11 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region Notice-公告表
/// <summary>
/// 公告表
@ -1251,9 +1279,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region NoticeDetail-公告内容
/// <summary>
/// 公告内容
@ -1362,9 +1392,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region PeakValleyConfig-峰谷配置表
/// <summary>
/// 峰谷配置表
@ -1473,9 +1505,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RechargeCard-充值卡
/// <summary>
/// 充值卡
@ -1584,9 +1618,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RechargeOrder-充值订单
/// <summary>
/// 充值订单
@ -1695,9 +1731,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RechargeSetting-充值金额配置
/// <summary>
/// 充值金额配置
@ -1806,9 +1844,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RfidCard-RFID卡
/// <summary>
/// RFID卡
@ -1917,9 +1957,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region RoleMenu-租户权限表
/// <summary>
/// 租户权限表
@ -2028,9 +2070,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Tenant-租户表
/// <summary>
/// 租户表
@ -2139,9 +2183,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region TenantDbConn-租户数据库表
/// <summary>
/// 租户数据库表
@ -2250,9 +2296,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region TenantDomain-租户域名表
/// <summary>
/// 租户域名表
@ -2361,9 +2409,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region TenantExpiration-租户租期表
/// <summary>
/// 租户租期表
@ -2472,9 +2522,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region User-用户表(租户平台)
/// <summary>
/// 用户表(租户平台)
@ -2583,9 +2635,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region Version-版本升级表
/// <summary>
/// 版本升级表
@ -2694,9 +2748,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region VersionMenu-菜单版本升级表
/// <summary>
/// 菜单版本升级表
@ -2805,9 +2861,11 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
#region VersionTenant-租户版本升级表
/// <summary>
/// 租户版本升级表
@ -2916,6 +2974,8 @@ namespace APT.OP.WebApi.Controllers.Api
}
}
#endregion
}

25
APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFAnnourcementController.cs
View File

@ -13,7 +13,6 @@ using APT.BaseData.Domain.Enums.OP;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.IServices.OP;
using Microsoft.Data.SqlClient;
using APT.BaseData.Domain.Entities.FM;
namespace APT.PF.WebApiControllers.Api.PF
{
@ -72,7 +71,6 @@ namespace APT.PF.WebApiControllers.Api.PF
item.Nav_OrgSub = null;
}
}
entity.CREATER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
this.UnifiedCommit(() =>
{
UpdateEntityNoCommit(entity);
@ -344,28 +342,5 @@ namespace APT.PF.WebApiControllers.Api.PF
return true;
});
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_PF_ANNOURCEMENT> Get([FromBody] KeywordFilter filter)
{
return SafeExecute(() =>
{
var result = GetEntity<T_PF_ANNOURCEMENT>(null, filter, null);
if (result.CREATER_ID.HasValue)
{
result.CREATE_USER_NAME = GetEntity<T_FM_USER>(result.CREATER_ID.Value).NAME;
}
else
{
result.CREATE_USER_NAME = "";
}
return result;
});
}
}
}

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

@ -13,6 +13,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -33,6 +39,7 @@ using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4;
#region Annourcement-公告
/// <summary>
/// 公告
@ -142,10 +149,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AnnourcementFile-公告附件
/// <summary>
/// 公告附件
@ -255,10 +264,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AnnourcementOrg-公告下属公司
/// <summary>
/// 公告下属公司
@ -368,10 +379,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApprovalRole-审批角色
/// <summary>
/// 审批角色
@ -481,10 +494,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Approve-审批流主表
/// <summary>
/// 审批流主表
@ -594,10 +609,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveDetail-审批流子表
/// <summary>
/// 审批流子表
@ -707,10 +724,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveOperationRole-操作角色
/// <summary>
/// 操作角色
@ -820,10 +839,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveRejectConfig-审批驳回配置表
/// <summary>
/// 审批驳回配置表
@ -933,10 +954,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveRoleDepartment-分管部门
/// <summary>
/// 分管部门
@ -1046,10 +1069,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveTemp-审批流模板主表
/// <summary>
/// 审批流模板主表
@ -1159,10 +1184,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveTempDetail-审批流模板子表
/// <summary>
/// 审批流模板子表
@ -1272,10 +1299,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AppVersion-App版本发布
/// <summary>
/// App版本发布
@ -1385,10 +1414,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AppVersionFile-App包文件
/// <summary>
/// App包文件
@ -1498,10 +1529,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region BiplaySet-播放设置
/// <summary>
/// 播放设置
@ -1611,10 +1644,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Bititle-标语
/// <summary>
/// 标语
@ -1724,10 +1759,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Bivideoimg-图片视频
/// <summary>
/// 图片视频
@ -1837,10 +1874,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region BivideoimgFile-图片视频
/// <summary>
/// 图片视频
@ -1950,10 +1989,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ClientScopes-资源表
/// <summary>
/// 资源表
@ -2063,10 +2104,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region CodeRuleRunLog-编码规则跑批表
/// <summary>
/// 编码规则跑批表
@ -2176,10 +2219,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ComplaintLog-转办记录表
/// <summary>
/// 转办记录表
@ -2289,10 +2334,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region DataChannel-数据通道
/// <summary>
/// 数据通道
@ -2402,10 +2449,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region DataFrequency-采集频率
/// <summary>
/// 采集频率
@ -2515,10 +2564,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Fddeback-意见反馈
/// <summary>
/// 意见反馈
@ -2628,10 +2679,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FddebackFile-意见反馈附件
/// <summary>
/// 意见反馈附件
@ -2741,10 +2794,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FileDb-
/// <summary>
///
@ -2854,10 +2909,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FileDbFile-
/// <summary>
///
@ -2967,10 +3024,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FileType-
/// <summary>
///
@ -3080,10 +3139,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeChart-首页：图标区域
/// <summary>
/// 首页：图标区域
@ -3193,10 +3254,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeHmi-首页：HMI区域
/// <summary>
/// 首页：HMI区域
@ -3306,10 +3369,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeRanking-首页：排名区域
/// <summary>
/// 首页：排名区域
@ -3419,10 +3484,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeStatistic-首页：统计区域
/// <summary>
/// 首页：统计区域
@ -3532,10 +3599,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormRelation-关联表单配置
/// <summary>
/// 关联表单配置
@ -3645,10 +3714,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region HomeTitle-首页方针
/// <summary>
/// 首页方针
@ -3758,10 +3829,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region MqttConfig-MQTT配置表
/// <summary>
/// MQTT配置表
@ -3871,10 +3944,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region MqttConfigTheme-
/// <summary>
///
@ -3984,10 +4059,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Notice-通知
/// <summary>
/// 通知
@ -4097,10 +4174,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region NoticeFile-
/// <summary>
///
@ -4210,10 +4289,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region PicFilter-图片条件主表
/// <summary>
/// 图片条件主表
@ -4323,10 +4404,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region PicFilterDetail-图片条件子表
/// <summary>
/// 图片条件子表
@ -4436,10 +4519,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region QuestionFeedback-问题反馈表
/// <summary>
/// 问题反馈表
@ -4549,10 +4634,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region QuestionFeedbackFile-问题反馈附件表
/// <summary>
/// 问题反馈附件表
@ -4662,10 +4749,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Scopes-资源表
/// <summary>
/// 资源表
@ -4775,10 +4864,12 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region VersionManage-版本管理表
/// <summary>
/// 版本管理表
@ -4888,7 +4979,9 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
}

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

@ -13,6 +13,12 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -28,4 +34,5 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.PP.WebApi.Controllers.Api
{
}

6
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
View File

@ -733,14 +733,12 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{
string strConn = OPTenantDBConnService.GetConnByORGID(filter.OrgId.Value);
DataSet ds = DBHelper.ExecProcedure(strConn, "proc_HomeSubTeamMeetingRecord", dic, HttpContext.Request.Path);
string percent = "";
double percent = 0;
if (ds != null && ds.Tables != null && ds.Tables.Count > 0)
{
foreach (DataRow item in ds.Tables[0].Rows)
{
percent = item[0].ToString();
if (percent.Contains("."))
percent = Convert.ToDouble(item[0].ToString()).ToString("0.00");
percent = Convert.ToDouble(item[0].ToString());
listResult.Add(new
{
companyName = item["CNAME"],

61
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
View File

@ -219,73 +219,23 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
}
var DetailDel = Nav_NewUserDetail.Where(e => e.IS_DELETED);
if (DetailDel != null && DetailDel.Count() > 0)
Nav_NewUserDetail = Nav_NewUserDetail.Where(e => !e.IS_DELETED).ToList();
var FilesDel = Nav_Files.Where(e => e.IS_DELETED);
if (FilesDel != null && FilesDel.Count() > 0)
Nav_Files = Nav_Files.Where(e => !e.IS_DELETED).ToList();
var detailFilesDel = detailFiles.Where(e => e.IS_DELETED);
if (detailFilesDel != null && detailFilesDel.Count() > 0)
detailFiles = detailFiles.Where(e => !e.IS_DELETED).ToList();
var TeachersDel = Nav_Teachers.Where(e => e.IS_DELETED);
if (TeachersDel != null && TeachersDel.Count() > 0)
Nav_Teachers = Nav_Teachers.Where(e => !e.IS_DELETED).ToList();
//老师 附件 明细附件 都是页面传值 BantchUpdateEntity_noneBase处理需要判断是否确实有值 没有就去除
IEnumerable<Guid> IlistID = null;
if (FilesDel != null && FilesDel.Count() > 0)
{
IlistID = FilesDel.Select(e => e.ID);
FilesDel = GetEntities<T_SE_NEW_USERS_FILE>(e => IlistID.Contains(e.ID), null, null);
if (FilesDel != null && FilesDel.Count() > 0)
{
FilesDel.ForEach(e => e.IS_DELETED = true);
}
}
if (detailFilesDel != null && detailFilesDel.Count() > 0)
{
IlistID = detailFilesDel.Select(e => e.ID);
detailFilesDel = GetEntities<T_SE_NEW_USER_DETAIL_FILE>(e => IlistID.Contains(e.ID), null, null);
if (detailFilesDel != null && detailFilesDel.Count() > 0)
{
detailFilesDel.ForEach(e => e.IS_DELETED = true);
}
}
if (TeachersDel != null && TeachersDel.Count() > 0)
{
IlistID = TeachersDel.Select(e => e.ID);
TeachersDel = GetEntities<T_SE_NEW_USERS_TEACHER>(e => IlistID.Contains(e.ID), null, null);
if (TeachersDel != null && TeachersDel.Count() > 0)
{
TeachersDel.ForEach(e => e.IS_DELETED = true);
}
}
UnifiedCommit(() =>
{
UpdateEntityNoCommit(entity);
if (sendNoticeList != null && sendNoticeList.Any())
BantchAddEntityNoCommit(sendNoticeList);
if (finishNotice != null)
UpdateEntityNoCommit(finishNotice);
if (Nav_NewUserDetail != null && Nav_NewUserDetail.Any())
BantchSaveEntityNoCommit(Nav_NewUserDetail);//BantchSaveEntityNoCommit(Nav_NewUserDetail); BantchUpdateEntity_noneBase
if (DetailDel != null && DetailDel.Any())
BantchUpdateEntity_noneBase(DetailDel);
BantchUpdateEntity_noneBase(Nav_NewUserDetail);//BantchSaveEntityNoCommit(Nav_NewUserDetail);
if (Nav_Files != null && Nav_Files.Any())
BantchSaveEntityNoCommit(Nav_Files);//BantchSaveEntityNoCommit BantchUpdateEntity_noneBase
if (FilesDel != null && FilesDel.Any())
BantchUpdateEntity_noneBase(FilesDel);
BantchUpdateEntity_noneBase(Nav_Files);//BantchSaveEntityNoCommit
if (detailFiles.Any())
BantchSaveEntityNoCommit(detailFiles);//BantchSaveEntityNoCommit BantchUpdateEntity_noneBase
if (detailFilesDel != null && detailFilesDel.Any())
BantchUpdateEntity_noneBase(detailFilesDel);
BantchUpdateEntity_noneBase(detailFiles);//BantchSaveEntityNoCommit
if (Nav_Teachers.Any())
BantchSaveEntityNoCommit(Nav_Teachers);//BantchSaveEntityNoCommit BantchUpdateEntity_noneBase
if (TeachersDel != null && TeachersDel.Count() > 0)
BantchUpdateEntity_noneBase(TeachersDel);
BantchUpdateEntity_noneBase(Nav_Teachers);//BantchSaveEntityNoCommit
if (listUserDel != null && listUserDel.Any())
BantchUpdateEntity_noneBase(listUserDel);
if (listPersonDel != null && listPersonDel.Any())
@ -294,7 +244,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
BantchUpdateEntity_noneBase(listRoleDel);
if (listUT != null && listUT.Any())
BantchUpdateEntity_noneBase(listUT);
BantchUpdateEntity_noneBase(new List<T_SE_NEW_USERS>() { entity });
});
if (listUserDel != null && listUserDel.Count() > 0)

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff