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

Compare commits

base: wyw:8d3d5bd284836aa8a2447f1b2a5031c52c27b386
Branches Tags
wyw:master
..
compare: wyw:ebe74f333d1932703efa682c5601bfbaeb738c01
Branches Tags
wyw:master

No commits in common. "8d3d5bd284836aa8a2447f1b2a5031c52c27b386" and "ebe74f333d1932703efa682c5601bfbaeb738c01" have entirely different histories.
8d3d5bd284 ... ebe74f333d

26 changed files with 139260 additions and 280212 deletions
Show Stats Expand all files Collapse all files

3
APT.BaseData.Domain/Entities/FM/T_FM_USER_PRODUCTION_UNIT_SET.cs
View File

@ -15,8 +15,5 @@ namespace APT.BaseData.Domain.Entities.FM
[Description("编码")]
public string CODE { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

137966
APT.Data.Migrations/Migrations/20260313071635_hmr2026031301.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

123
APT.Data.Migrations/Migrations/20260313071635_hmr2026031301.cs
View File

@ -1,123 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026031301 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_SK_SCOREL",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_SK_SCOREE",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_SK_SCOREC",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_SK_RISK_TYPE",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_SK_CHECK_QUESTION",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_SK_CHECK_CONTENTS_BASIC",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_SK_CHECK_CONTENTS",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_LR_LAW_TYPE",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_LR_LAW",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "JT_SYNC",
table: "T_FM_USER_PRODUCTION_UNIT_SET",
type: "bit",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_SK_SCOREL");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_SK_SCOREE");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_SK_SCOREC");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_SK_RISK_TYPE");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_SK_CHECK_QUESTION");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_SK_CHECK_CONTENTS_BASIC");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_SK_CHECK_CONTENTS");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_LR_LAW_TYPE");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_LR_LAW");
migrationBuilder.DropColumn(
name: "JT_SYNC",
table: "T_FM_USER_PRODUCTION_UNIT_SET");
}
}
}

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

@ -8293,9 +8293,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -48911,9 +48908,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<int>("LAW_STATUS")
.HasColumnType("int");
@ -49347,9 +49341,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -77469,9 +77460,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -77532,9 +77520,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("LAW_ID")
.HasColumnType("uniqueidentifier");
@ -77667,9 +77652,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -87049,9 +87031,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -87119,9 +87098,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -87180,9 +87156,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -87241,9 +87214,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("JT_SYNC")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");

3
APT.MS.Domain/Entities/SC/LR/61T_LR_LAW.cs
View File

@ -114,8 +114,5 @@ namespace APT.MS.Domain.Entities.LR
[FormFieldQuery]
[FormFieldEdit]
public DateTime EXECUTE_TIME { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

3
APT.MS.Domain/Entities/SC/LR/91T_LR_LAW_TYPE.cs
View File

@ -27,8 +27,5 @@ namespace APT.MS.Domain.Entities.LR
[Description("类型名称")]
[DataFieldIndex(true)]
public string NAME { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS.cs
View File

@ -70,8 +70,5 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：辨识区域")]
[NotMapped]
public T_SK_RISK_AREA Nav_Area { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS_BASIC.cs
View File

@ -38,8 +38,5 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：法律法规库")]
[NotMapped]
public T_LR_LAW Nav_Law { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_CHECK_QUESTION.cs
View File

@ -91,8 +91,5 @@ namespace APT.MS.Domain.Entities.SK
[DataFieldIngore]
[NotMapped]
public string CHECK_STANDARD { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

2
APT.MS.Domain/Entities/SK/T_SK_RISK_TYPE.cs
View File

@ -41,7 +41,5 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：生产单元")]
[NotMapped]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_SCOREC.cs
View File

@ -34,8 +34,5 @@ namespace APT.MS.Domain.Entities.SK
[FormFieldTable]
[FormFieldEdit]
public decimal SCORE { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_SCOREE.cs
View File

@ -34,8 +34,5 @@ namespace APT.MS.Domain.Entities.SK
[FormFieldTable]
[FormFieldEdit]
public decimal SCORE { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

3
APT.MS.Domain/Entities/SK/T_SK_SCOREL.cs
View File

@ -34,8 +34,5 @@ namespace APT.MS.Domain.Entities.SK
[FormFieldTable]
[FormFieldEdit]
public decimal SCORE { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
}
}

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BD.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护
/// <summary>
/// HMI资源表维护
@ -130,10 +123,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Picture-图片资源
/// <summary>
/// 图片资源
@ -241,10 +232,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PictureFile-资源图片文件
/// <summary>
/// 资源图片文件
@ -352,10 +341,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Place-区域表
/// <summary>
/// 区域表
@ -462,8 +449,7 @@ namespace APT.BD.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -474,10 +460,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region ServerInfo-服务器信息表
/// <summary>
/// 服务器信息表
@ -585,10 +569,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SystemInfo-系统信息表
/// <summary>
/// 系统信息表
@ -696,10 +678,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region WordTemplate-WORD模板维护
/// <summary>
/// WORD模板维护
@ -807,8 +787,6 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BS.WebApi.Controllers.Api
{
using APT.MS.Domain.Entities.BS;
#region CheckContent-检查内容表
/// <summary>
/// 检查内容表
@ -130,10 +123,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContents-检查内容
/// <summary>
/// 检查内容
@ -241,10 +232,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentCheckType-检查类型
/// <summary>
/// 检查类型
@ -352,10 +341,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
/// <summary>
/// 检查内容检查类型子表(关联层级)
@ -463,10 +450,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentHmRiskArea-检查区域
/// <summary>
/// 检查区域
@ -574,10 +559,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckMain-安全检查库
/// <summary>
/// 安全检查库
@ -685,10 +668,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentMainDepartment-安全检查库责任部门
/// <summary>
/// 安全检查库责任部门
@ -796,10 +777,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckContentQuestion-检查问题
/// <summary>
/// 检查问题
@ -907,10 +886,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckMainLaw-检查库法规
/// <summary>
/// 检查库法规
@ -1018,10 +995,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProject-检查项目
/// <summary>
/// 检查项目
@ -1129,10 +1104,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategory-检查项目分类表
/// <summary>
/// 检查项目分类表
@ -1240,10 +1213,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategoryChecktype-检查项目分类_检查类型
/// <summary>
/// 检查项目分类_检查类型
@ -1351,10 +1322,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectCategoryObject-检查项目分类_检查区域
/// <summary>
/// 检查项目分类_检查区域
@ -1462,10 +1431,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckProjectProjectCategory-检查项目分类
/// <summary>
/// 检查项目分类
@ -1573,10 +1540,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckQuestion-检查问题
/// <summary>
/// 检查问题
@ -1684,10 +1649,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckType-检查类型表
/// <summary>
/// 检查类型表
@ -1794,8 +1757,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -1806,10 +1768,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region CheckTypeLevel-检查层级
/// <summary>
/// 检查层级
@ -1917,10 +1877,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CheckTypeMinetype-检查类型生产单元
/// <summary>
/// 检查类型生产单元
@ -2028,10 +1986,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentAreaobject-部门范围
/// <summary>
/// 部门范围
@ -2139,10 +2095,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region OperateLog-操作日志
/// <summary>
/// 操作日志
@ -2250,10 +2204,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSet-制定任务
/// <summary>
/// 制定任务
@ -2361,10 +2313,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetArea-制定任务区域
/// <summary>
/// 制定任务区域
@ -2472,10 +2422,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetDepartmentOut-制定任务排除组织
/// <summary>
/// 制定任务排除组织
@ -2583,10 +2531,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetDepObject-制定任务部门触发范围
/// <summary>
/// 制定任务部门触发范围
@ -2694,10 +2640,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PlanSetObject-制定任务触发范围
/// <summary>
/// 制定任务触发范围
@ -2805,10 +2749,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskCategory-隐患类别
/// <summary>
/// 隐患类别
@ -2916,10 +2858,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskLevelDelayDays-隐患等级最长延期整改天数
/// <summary>
/// 隐患等级最长延期整改天数
@ -3027,10 +2967,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskReason-隐患原因表
/// <summary>
/// 隐患原因表
@ -3138,10 +3076,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmit-隐患上报表
/// <summary>
/// 隐患上报表
@ -3249,10 +3185,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContent-隐患上报明细
/// <summary>
/// 隐患上报明细
@ -3360,10 +3294,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentBack-隐患上报明细退回
/// <summary>
/// 隐患上报明细退回
@ -3471,10 +3403,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDeal-隐患整改记录
/// <summary>
/// 隐患整改记录
@ -3582,10 +3512,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealAfterFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3693,10 +3621,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3804,10 +3730,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
/// <summary>
/// 隐患整改验收人签名
@ -3915,10 +3839,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentDealUsersign-隐患整改责任人签名
/// <summary>
/// 隐患整改责任人签名
@ -4026,10 +3948,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -4137,10 +4057,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentReason-隐患上报明细原因
/// <summary>
/// 隐患上报明细原因
@ -4248,10 +4166,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitContentTemp-隐患上报详情待入库
/// <summary>
/// 隐患上报详情待入库
@ -4359,10 +4275,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitDelayApply-延期整改申请
/// <summary>
/// 延期整改申请
@ -4470,10 +4384,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitDelayApplyDetail-延期整改申请详情
/// <summary>
/// 延期整改申请详情
@ -4581,10 +4493,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -4692,10 +4602,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitNotice-隐患通知
/// <summary>
/// 隐患通知
@ -4803,10 +4711,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskSubmitNoticePerson-隐患通知
/// <summary>
/// 隐患通知
@ -4914,10 +4820,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RiskTpm-TPM对接数据
/// <summary>
/// TPM对接数据
@ -5025,10 +4929,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheck-安全检查
/// <summary>
/// 安全检查
@ -5136,10 +5038,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetail-检查明细
/// <summary>
/// 检查明细
@ -5247,10 +5147,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -5358,10 +5256,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailLaw-检查依据
/// <summary>
/// 检查依据
@ -5469,10 +5365,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailQuestion-检查明细问题
/// <summary>
/// 检查明细问题
@ -5580,10 +5474,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailReason-检查明细隐患原因
/// <summary>
/// 检查明细隐患原因
@ -5691,10 +5583,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailReject-检查明细退回
/// <summary>
/// 检查明细退回
@ -5802,10 +5692,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailRejectFile-检查明细退回附件
/// <summary>
/// 检查明细退回附件
@ -5913,10 +5801,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckDetailUser-检查明细人员
/// <summary>
/// 检查明细人员
@ -6024,10 +5910,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckFile-安全检查文件
/// <summary>
/// 安全检查文件
@ -6135,10 +6019,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckProject-安全检查文件
/// <summary>
/// 安全检查文件
@ -6246,10 +6128,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckProjectCategory-安全检查文件
/// <summary>
/// 安全检查文件
@ -6357,10 +6237,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRecord-检查记录确认
/// <summary>
/// 检查记录确认
@ -6468,10 +6346,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRecordDetail-检查记录确认明细
/// <summary>
/// 检查记录确认明细
@ -6579,10 +6455,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckRiskArea-检查区域
/// <summary>
/// 检查区域
@ -6690,10 +6564,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region SafeCheckUsersign-检查签名
/// <summary>
/// 检查签名
@ -6801,8 +6673,6 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -23,7 +17,6 @@ namespace APT.FM.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
#region Api-API
/// <summary>
/// API
@ -131,10 +124,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseAdd-企业位置信息
/// <summary>
/// 企业位置信息
@ -242,10 +233,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseEnergy-企业能耗配置信息
/// <summary>
/// 企业能耗配置信息
@ -353,10 +342,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region BaseInfo-企业基本信息
/// <summary>
/// 企业基本信息
@ -464,10 +451,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfig-部门日历配置表
/// <summary>
/// 部门日历配置表
@ -575,10 +560,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfigDetail-部门日历配置明细表
/// <summary>
/// 部门日历配置明细表
@ -686,10 +669,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCalendarConfigTeam-部门日历配置班组表
/// <summary>
/// 部门日历配置班组表
@ -797,10 +778,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCompletion-XX班完成情况统计
/// <summary>
/// XX班完成情况统计
@ -908,10 +887,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentCompletionSort-班组完成情况前十
/// <summary>
/// 班组完成情况前十
@ -1019,10 +996,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentPost-部门岗位
/// <summary>
/// 部门岗位
@ -1130,10 +1105,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentPostUser-部门岗位人员
/// <summary>
/// 部门岗位人员
@ -1241,10 +1214,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -1352,10 +1323,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentSafeuser-安全员表
/// <summary>
/// 安全员表
@ -1463,10 +1432,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentScheduling-部门排班表
/// <summary>
/// 部门排班表
@ -1574,10 +1541,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentSchedulingDetail-排班信息人员明细表
/// <summary>
/// 排班信息人员明细表
@ -1685,10 +1650,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region DepartmentUser-部门人员表
/// <summary>
/// 部门人员表
@ -1796,10 +1759,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Enum-枚举管理
/// <summary>
/// 枚举管理
@ -1907,10 +1868,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Enums-枚举表单
/// <summary>
/// 枚举表单
@ -2018,10 +1977,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region EnumItem-枚举项
/// <summary>
/// 枚举项
@ -2129,10 +2086,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region EnumType-枚举类别
/// <summary>
/// 枚举类别
@ -2240,10 +2195,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region HiddenDangerRectification-隐患整改完成情况统计
/// <summary>
/// 隐患整改完成情况统计
@ -2351,10 +2304,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region JobActivityCompletion-班组作业完成率统计
/// <summary>
/// 班组作业完成率统计
@ -2462,10 +2413,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region MessageTemplate-短信模板表
/// <summary>
/// 短信模板表
@ -2573,10 +2522,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Monitoring-服务器监听表
/// <summary>
/// 服务器监听表
@ -2684,10 +2631,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Notice-信息通知表
/// <summary>
/// 信息通知表
@ -2795,10 +2740,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region NotificationTask-娑堟伅琛?
/// <summary>
/// 娑堟伅琛?
@ -2906,10 +2849,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
/// <summary>
/// 寰呭姙琛ㄦ椂闂撮厤缃?
@ -3017,10 +2958,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region ParamSet-参数设置表
/// <summary>
/// 参数设置表
@ -3128,10 +3067,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region ParamSetDepartment-组织关联信息
/// <summary>
/// 组织关联信息
@ -3239,10 +3176,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Person-人员信息
/// <summary>
/// 人员信息
@ -3350,10 +3285,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonCertificateFile-证书
/// <summary>
/// 证书
@ -3461,10 +3394,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonEducationFile-学历证
/// <summary>
/// 学历证
@ -3572,10 +3503,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonIdcardFile-身份证
/// <summary>
/// 身份证
@ -3683,10 +3612,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonSkills-技能
/// <summary>
/// 技能
@ -3794,10 +3721,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region PersonWork-工作经历
/// <summary>
/// 工作经历
@ -3905,10 +3830,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RiskLevelProportion-风险等级占比
/// <summary>
/// 风险等级占比
@ -4016,10 +3939,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RiskTypeProportion-风险类别占比
/// <summary>
/// 风险类别占比
@ -4127,10 +4048,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region RoleDepartment-部门权限
/// <summary>
/// 部门权限
@ -4238,10 +4157,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Snapshot-随手拍
/// <summary>
/// 随手拍
@ -4349,10 +4266,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SnapshotFile-随手拍图片
/// <summary>
/// 随手拍图片
@ -4460,10 +4375,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLimit-数据同步次数限制
/// <summary>
/// 数据同步次数限制
@ -4571,10 +4484,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLog-跑批日志表
/// <summary>
/// 跑批日志表
@ -4682,10 +4593,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncLogDetail-跑批日志明细表
/// <summary>
/// 跑批日志明细表
@ -4793,10 +4702,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region SyncUserRule-用户数据同步例外配置
/// <summary>
/// 用户数据同步例外配置
@ -4904,10 +4811,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region Team-班组表
/// <summary>
/// 班组表
@ -5015,10 +4920,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region TeamPerson-班组人员关联信息
/// <summary>
/// 班组人员关联信息
@ -5126,10 +5029,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserDepartment-用户部门关联表
/// <summary>
/// 用户部门关联表
@ -5237,10 +5138,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserPost-宀椾綅鍒楄〃
/// <summary>
/// 宀椾綅鍒楄〃
@ -5348,10 +5247,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -5459,10 +5356,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserProductionUnitSet-生产单元
/// <summary>
/// 生产单元
@ -5570,10 +5465,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserSignFile-签名照片
/// <summary>
/// 签名照片
@ -5681,10 +5574,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserTest-测试多选
/// <summary>
/// 测试多选
@ -5792,10 +5683,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region UserVacationSet-人员休假设置
/// <summary>
/// 人员休假设置
@ -5903,10 +5792,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
#region WorkTicketCompletion-关键许可工作票完成情况统计
/// <summary>
/// 关键许可工作票完成情况统计
@ -6014,8 +5901,6 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter);
}
}
#endregion
}

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

File diff suppressed because it is too large Load Diff

296
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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.LG.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.LG;
#region Oprate-表单操作日志表
/// <summary>
/// 表单操作日志表
@ -130,8 +123,6 @@ namespace APT.LG.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.NW.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.NW;
#region Enterprise-子企业表
/// <summary>
/// 子企业表
@ -129,8 +122,7 @@ namespace APT.NW.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -141,10 +133,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region RoleDataPerm-子企业数据权限表
/// <summary>
/// 子企业数据权限表
@ -252,10 +242,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RoleMenu-子企业权限表
/// <summary>
/// 子企业权限表
@ -363,8 +351,6 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.OP.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.OP;
#region Alluser-用户表(租户平台)
/// <summary>
/// 用户表(租户平台)
@ -130,10 +123,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region BillingRule-计费规则表
/// <summary>
/// 计费规则表
@ -241,10 +232,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region BillingRuleVersion-计费规则子表
/// <summary>
/// 计费规则子表
@ -352,10 +341,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ChargeTimeSet-充电时长配置
/// <summary>
/// 充电时长配置
@ -463,10 +450,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Client-客户表
/// <summary>
/// 客户表
@ -574,10 +559,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region ClinetOpenid-客户表OpenId
/// <summary>
/// 客户表OpenId
@ -685,10 +668,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region CommonQuestion-常见问题
/// <summary>
/// 常见问题
@ -796,10 +777,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region FileFirmware-充电桩固件表
/// <summary>
/// 充电桩固件表
@ -907,10 +886,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Member-会员表
/// <summary>
/// 会员表
@ -1018,10 +995,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Menu-菜单表(租户平台)
/// <summary>
/// 菜单表(租户平台)
@ -1128,8 +1103,7 @@ namespace APT.OP.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// <summary>
/// 获得树形实体数据
/// </summary>
/// <param name="filter"></param>
@ -1140,10 +1114,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter);
}
}
#endregion
#region Notice-公告表
/// <summary>
/// 公告表
@ -1251,10 +1223,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region NoticeDetail-公告内容
/// <summary>
/// 公告内容
@ -1362,10 +1332,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region PeakValleyConfig-峰谷配置表
/// <summary>
/// 峰谷配置表
@ -1473,10 +1441,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeCard-充值卡
/// <summary>
/// 充值卡
@ -1584,10 +1550,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeOrder-充值订单
/// <summary>
/// 充值订单
@ -1695,10 +1659,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RechargeSetting-充值金额配置
/// <summary>
/// 充值金额配置
@ -1806,10 +1768,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RfidCard-RFID卡
/// <summary>
/// RFID卡
@ -1917,10 +1877,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region RoleMenu-租户权限表
/// <summary>
/// 租户权限表
@ -2028,10 +1986,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Tenant-租户表
/// <summary>
/// 租户表
@ -2139,10 +2095,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantDbConn-租户数据库表
/// <summary>
/// 租户数据库表
@ -2250,10 +2204,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantDomain-租户域名表
/// <summary>
/// 租户域名表
@ -2361,10 +2313,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region TenantExpiration-租户租期表
/// <summary>
/// 租户租期表
@ -2472,10 +2422,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region User-用户表(租户平台)
/// <summary>
/// 用户表(租户平台)
@ -2583,10 +2531,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region Version-版本升级表
/// <summary>
/// 版本升级表
@ -2694,10 +2640,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region VersionMenu-菜单版本升级表
/// <summary>
/// 菜单版本升级表
@ -2805,10 +2749,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
#region VersionTenant-租户版本升级表
/// <summary>
/// 租户版本升级表
@ -2916,8 +2858,6 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter);
}
}
#endregion
}

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
// 此代码由T4模板自动生成
@ -25,7 +19,6 @@ namespace APT.PF.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4;
#region ApprovalRole-审批角色
/// <summary>
/// 审批角色
@ -133,10 +126,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Approve-审批流主表
/// <summary>
/// 审批流主表
@ -244,10 +235,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveDetail-审批流子表
/// <summary>
/// 审批流子表
@ -355,10 +344,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveOperationRole-操作角色
/// <summary>
/// 操作角色
@ -466,10 +453,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveRejectConfig-审批驳回配置表
/// <summary>
/// 审批驳回配置表
@ -577,10 +562,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveRoleDepartment-分管部门
/// <summary>
/// 分管部门
@ -688,10 +671,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveTemp-审批流模板主表
/// <summary>
/// 审批流模板主表
@ -799,10 +780,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ApproveTempDetail-审批流模板子表
/// <summary>
/// 审批流模板子表
@ -910,10 +889,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region AppVersion-App版本发布
/// <summary>
/// App版本发布
@ -1021,10 +998,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region AppVersionFile-App包文件
/// <summary>
/// App包文件
@ -1132,10 +1107,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ClientScopes-资源表
/// <summary>
/// 资源表
@ -1243,10 +1216,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region CodeRuleRunLog-编码规则跑批表
/// <summary>
/// 编码规则跑批表
@ -1354,10 +1325,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region ComplaintLog-转办记录表
/// <summary>
/// 转办记录表
@ -1465,10 +1434,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region DataChannel-数据通道
/// <summary>
/// 数据通道
@ -1576,10 +1543,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region DataFrequency-采集频率
/// <summary>
/// 采集频率
@ -1687,10 +1652,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Fddeback-意见反馈
/// <summary>
/// 意见反馈
@ -1798,10 +1761,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FddebackFile-意见反馈附件
/// <summary>
/// 意见反馈附件
@ -1909,10 +1870,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileDb-
/// <summary>
///
@ -2020,10 +1979,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileDbFile-
/// <summary>
///
@ -2131,10 +2088,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FileType-
/// <summary>
///
@ -2242,10 +2197,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeChart-首页：图标区域
/// <summary>
/// 首页：图标区域
@ -2353,10 +2306,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeHmi-首页：HMI区域
/// <summary>
/// 首页：HMI区域
@ -2464,10 +2415,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeRanking-首页：排名区域
/// <summary>
/// 首页：排名区域
@ -2575,10 +2524,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormHomeStatistic-首页：统计区域
/// <summary>
/// 首页：统计区域
@ -2686,10 +2633,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region FormRelation-关联表单配置
/// <summary>
/// 关联表单配置
@ -2797,10 +2742,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region HomeTitle-首页方针
/// <summary>
/// 首页方针
@ -2908,10 +2851,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region MqttConfig-MQTT配置表
/// <summary>
/// MQTT配置表
@ -3019,10 +2960,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region MqttConfigTheme-
/// <summary>
///
@ -3130,10 +3069,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Notice-通知
/// <summary>
/// 通知
@ -3241,10 +3178,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region NoticeFile-
/// <summary>
///
@ -3352,10 +3287,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region PicFilter-图片条件主表
/// <summary>
/// 图片条件主表
@ -3463,10 +3396,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region PicFilterDetail-图片条件子表
/// <summary>
/// 图片条件子表
@ -3574,10 +3505,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region QuestionFeedback-问题反馈表
/// <summary>
/// 问题反馈表
@ -3685,10 +3614,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region QuestionFeedbackFile-问题反馈附件表
/// <summary>
/// 问题反馈附件表
@ -3796,10 +3723,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region Scopes-资源表
/// <summary>
/// 资源表
@ -3907,10 +3832,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
#region VersionManage-版本管理表
/// <summary>
/// 版本管理表
@ -4018,8 +3941,6 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter);
}
}
#endregion
}

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

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

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

File diff suppressed because it is too large Load Diff

415
APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
View File

@ -317,129 +317,86 @@ namespace APT.SK.WebApi.Controllers
}
T_FM_USER_PRODUCTION_UNIT_SET proUnitNew = null;
//查生产单元表
var proUnit = this.GetEntity<T_FM_USER_PRODUCTION_UNIT_SET>(t =>t.ID == entity.PRODUCTION_UNIT_ID && t.JT_SYNC);
var proUnit = this.GetEntity<T_FM_USER_PRODUCTION_UNIT_SET>(t =>t.ID == entity.PRODUCTION_UNIT_ID);
var jtProUnit = db.GetJTProUnits(dbName).FirstOrDefault(t => t.ID == entity.PRODUCTION_UNIT_ID);
if (proUnit == null)
if (proUnit == null && jtProUnit != null)
{
if (jtProUnit != null)
{
//写入
proUnitNew = new T_FM_USER_PRODUCTION_UNIT_SET();
proUnitNew.ORG_ID = entity.ORG_ID;
proUnitNew.ID = entity.PRODUCTION_UNIT_ID.Value;
proUnitNew.NAME = jtProUnit?.NAME;
proUnitNew.CODE = jtProUnit?.CODE;
proUnitNew.JT_SYNC = true;
}
}
else
{
//更新
proUnitNew = proUnit;
//写入
proUnitNew = new T_FM_USER_PRODUCTION_UNIT_SET();
proUnitNew.ORG_ID = entity.ORG_ID;
proUnitNew.ID = entity.PRODUCTION_UNIT_ID.Value;
proUnitNew.NAME = jtProUnit?.NAME;
proUnitNew.CODE = jtProUnit?.CODE;
}
//else
//{
// //更新
// proUnitNew = proUnit;
// proUnitNew.NAME = jtProUnit?.NAME;
// proUnitNew.CODE = jtProUnit?.CODE;
//}
T_SK_RISK_TYPE riskTypeNew = null;
//查风险类别
var riskType = this.GetEntity<T_SK_RISK_TYPE>(t => t.ID == entity.TYPE_ID && t.JT_SYNC);
var riskType = this.GetEntity<T_SK_RISK_TYPE>(t => t.ID == entity.TYPE_ID);
var jtRiskType = db.GetJTRiskTypes(dbName).FirstOrDefault(t => t.ID == entity.TYPE_ID);
if (riskType == null)
if (riskType == null && jtRiskType!=null)
{
if (jtRiskType != null)
{
riskTypeNew = new T_SK_RISK_TYPE();
riskTypeNew.ORG_ID = entity.ORG_ID;
riskTypeNew.ID = entity.TYPE_ID.Value;
riskTypeNew.NAME = jtRiskType?.NAME;
riskTypeNew.JT_SYNC = true;
riskTypeNew.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
}
}
else
{
//更新
riskTypeNew = riskType;
riskTypeNew = new T_SK_RISK_TYPE();
riskTypeNew.ORG_ID = entity.ORG_ID;
riskTypeNew.ID = entity.TYPE_ID.Value;
riskTypeNew.NAME = jtRiskType?.NAME;
riskTypeNew.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
}
//else
//{
// //更新
// riskTypeNew = riskType;
// riskTypeNew.NAME = jtRiskType?.NAME;
// riskTypeNew.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
//}
T_SK_SCOREL libLNew = null;
//查LEC
var libL = this.GetEntity<T_SK_SCOREL>(t => t.ID == entity.SCOREL_ID && t.JT_SYNC);
//查生产单元表
var libL = this.GetEntity<T_SK_SCOREL>(t => t.ID == entity.SCOREL_ID);
var jtlibL = db.GetJTLibLs(dbName).FirstOrDefault(t => t.ID == entity.SCOREL_ID);
if (libL == null)
if (libL == null && jtlibL != null)
{
if (jtlibL != null)
{
//写入
libLNew = new T_SK_SCOREL();
libLNew.ORG_ID = entity.ORG_ID;
libLNew.ID = entity.SCOREL_ID.Value;
libLNew.NAME = jtlibL?.NAME;
libLNew.CODE = jtlibL?.CODE;
libLNew.JT_SYNC = true;
libLNew.SCORE = jtlibL == null ? 0 : jtlibL.SCORE;
}
}
else
{
//更新
libLNew = libL;
//写入
libLNew = new T_SK_SCOREL();
libLNew.ORG_ID = entity.ORG_ID;
libLNew.ID = entity.SCOREL_ID.Value;
libLNew.NAME = jtlibL?.NAME;
libLNew.CODE = jtlibL?.CODE;
libLNew.SCORE = jtlibL == null ? 0 : jtlibL.SCORE;
libLNew.SCORE = jtlibL==null ?0:jtlibL.SCORE;
}
T_SK_SCOREE libENew = null;
//查生产单元表
var libE = this.GetEntity<T_SK_SCOREE>(t => t.ID == entity.SCOREE_ID && t.JT_SYNC);
var libE = this.GetEntity<T_SK_SCOREE>(t => t.ID == entity.SCOREE_ID);
var jtlibE = db.GetJTLibEs(dbName).FirstOrDefault(t => t.ID == entity.SCOREE_ID);
if (libE == null)
if (libE == null && libE != null)
{
if (libE != null)
{
//写入
libENew = new T_SK_SCOREE();
libENew.ORG_ID = entity.ORG_ID;
libENew.ID = entity.SCOREE_ID.Value;
libENew.NAME = jtlibE?.NAME;
libENew.CODE = jtlibE?.CODE;
libENew.SCORE = jtlibE == null ? 0 : jtlibE.SCORE;
libENew.JT_SYNC = true;
}
}
else
{
//更新
libENew = libE;
//写入
libENew = new T_SK_SCOREE();
libENew.ORG_ID = entity.ORG_ID;
libENew.ID = entity.SCOREE_ID.Value;
libENew.NAME = jtlibE?.NAME;
libENew.CODE = jtlibE?.CODE;
libENew.SCORE = jtlibE == null ? 0 : jtlibE.SCORE;
}
T_SK_SCOREC libCNew = null;
//查生产单元表
var libC = this.GetEntity<T_SK_SCOREC>(t => t.ID == entity.SCOREC_ID && t.JT_SYNC);
var libC = this.GetEntity<T_SK_SCOREC>(t => t.ID == entity.SCOREC_ID);
var jtlibC = db.GetJTLibCs(dbName).FirstOrDefault(t => t.ID == entity.SCOREC_ID);
if (libC == null)
if (libC == null && jtlibC != null)
{
if (jtlibC != null)
{
//写入
libCNew = new T_SK_SCOREC();
libCNew.ORG_ID = entity.ORG_ID;
libCNew.ID = entity.SCOREC_ID.Value;
libCNew.NAME = jtlibC?.NAME;
libCNew.CODE = jtlibC?.CODE;
libCNew.JT_SYNC = true;
libCNew.SCORE = jtlibC == null ? 0 : jtlibC.SCORE;
}
}
else
{
//更新
libCNew = libC;
//写入
libCNew = new T_SK_SCOREC();
libCNew.ORG_ID = entity.ORG_ID;
libCNew.ID = entity.SCOREC_ID.Value;
libCNew.NAME = jtlibC?.NAME;
libCNew.CODE = jtlibC?.CODE;
libCNew.SCORE = jtlibC == null ? 0 : jtlibC.SCORE;
}
if (details != null && details.Any())
{
foreach (var item in details)
@ -494,28 +451,27 @@ namespace APT.SK.WebApi.Controllers
if (contentList != null && contentList.Any())
{
var conIds = contentList.Where(m=>m.CHECK_CONTENTS_ID!=null).Select(t => t.CHECK_CONTENTS_ID).ToList();
//存在，更新
var conExsists = checkConts.Where(t=> conIds.Contains(t.ID) && t.JT_SYNC).ToList();
if (conExsists != null && conExsists.Any())
{
foreach (var conExsist in conExsists)
{
//检查内容
var first = jtCheckConts.FirstOrDefault(t => t.ID == conExsist.ID);
if (first != null)
{
conExsist.ID = first.ID;
conExsist.ORG_ID = entity.ORG_ID;
conExsist.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
conExsist.Nav_ListCheckQuestion = null;
conExsist.Nav_ContentsBasics = null;
conExsist.CHECKCONTENT = first.CHECKCONTENT;
conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
conExsist.JT_SYNC = true;
updateCheckConts.Add(conExsist);
}
}
}
//存在，不更新
var conExsists = checkConts.Where(t=> conIds.Contains(t.ID)).ToList();
//if (conExsists != null && conExsists.Any())
//{
// foreach (var conExsist in conExsists)
// {
// //检查内容
// var first = jtCheckConts.FirstOrDefault(t => t.ID == conExsist.ID);
// if (first != null)
// {
// conExsist.ID = first.ID;
// conExsist.ORG_ID = entity.ORG_ID;
// conExsist.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
// conExsist.Nav_ListCheckQuestion = null;
// conExsist.Nav_ContentsBasics = null;
// conExsist.CHECKCONTENT = first.CHECKCONTENT;
// conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
// updateCheckConts.Add(conExsist);
// }
// }
//}
//不存在，写入
var conIdNews = conExsists.Select(t => t.ID).ToList();
var conExsistNews = conIds.Where(t =>t!=null && !conIdNews.Contains(t.Value)).ToList();
@ -535,7 +491,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.Nav_ContentsBasics = null;
conExsist.CHECKCONTENT = first?.CHECKCONTENT;
conExsist.CHECK_STANDARD = first?.CHECK_STANDARD;
conExsist.JT_SYNC = true;
updateCheckConts.Add(conExsist);
}
}
@ -544,70 +499,63 @@ namespace APT.SK.WebApi.Controllers
//查检查依据(法律法规)
List<T_LR_LAW> updateCheckLaws = new List<T_LR_LAW>();
List<T_LR_LAW_TYPE> updateCheckLawTypes = new List<T_LR_LAW_TYPE>();
List<T_SK_CHECK_CONTENTS_BASIC> updateCheckBas = new List<T_SK_CHECK_CONTENTS_BASIC>();
var jtcheckContLawTypes = db.GetJTLawTypes(dbName).ToList();
var checkContLawTypes = this.GetEntities<T_LR_LAW_TYPE>(t => true, new BaseFilter(entity.ORG_ID));
var checkContLaws = this.GetEntities<T_LR_LAW>(t => true, new BaseFilter(entity.ORG_ID));
var jtcheckContLaws = db.GetJTLaws(dbName).ToList();
var checkContBas = this.GetEntities<T_SK_CHECK_CONTENTS_BASIC>(t => true, new BaseFilter(entity.ORG_ID));
var jtcheckContBas = db.GetJTBas(dbName).ToList();
var jtcheckContLawTypes = db.GetJTLawTypes(dbName).ToList();
var checkContLawTypes = this.GetEntities<T_LR_LAW_TYPE>(t => true, new BaseFilter(entity.ORG_ID));
if (basicList != null && basicList.Any())
{
var conIds = basicList.Select(t => t.LAW_ID).Distinct().ToList();
//存在，更新
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
if (conExsists != null && conExsists.Any())
{
foreach (var conExsist in conExsists)
{
//法律法规
var first = jtcheckContLaws.FirstOrDefault(t => t.ID == conExsist.ID);
if (first != null)
{
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID && t.JT_SYNC);
if (firstType == null)
{
var jtFirstType = jtcheckContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
if (jtFirstType != null)
{
T_LR_LAW_TYPE lawType = new T_LR_LAW_TYPE();
lawType.ORG_ID = entity.ORG_ID;
lawType.ID = jtFirstType.ID;
lawType.NAME = jtFirstType.NAME;
lawType.JT_SYNC = true;
updateCheckLawTypes.Add(lawType);
conExsist.ID = first.ID;
conExsist.ORG_ID = entity.ORG_ID;
conExsist.CODE = first?.CODE;
conExsist.NAME = first?.NAME;
conExsist.VERSION_NUM = first?.VERSION_NUM;
conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = first.TYPE_ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
else
{
conExsist.ID = first.ID;
conExsist.ORG_ID = entity.ORG_ID;
conExsist.CODE = first?.CODE;
conExsist.NAME = first?.NAME;
conExsist.VERSION_NUM = first?.VERSION_NUM;
conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = first.TYPE_ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
}
}
var conIds = basicList.Where(m => m.LAW_ID != null).Select(t => t.LAW_ID).Distinct().ToList();
//存在，不更新
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID)).ToList();
//if (conExsists != null && conExsists.Any())
//{
// foreach (var conExsist in conExsists)
// {
// //法律法规
// var first = jtcheckContLaws.FirstOrDefault(t => t.ID == conExsist.ID);
// if (first != null)
// {
// var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
// if (firstType == null)
// {
// var jtFirstType = jtcheckContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
// if (jtFirstType != null)
// {
// T_LR_LAW_TYPE lawType = new T_LR_LAW_TYPE();
// lawType.ID = jtFirstType.ID;
// lawType.NAME = jtFirstType.NAME;
// updateCheckLawTypes.Add(lawType);
// conExsist.ID = first.ID;
// conExsist.ORG_ID = entity.ORG_ID;
// conExsist.CODE = first?.CODE;
// conExsist.NAME = first?.NAME;
// conExsist.VERSION_NUM = first?.VERSION_NUM;
// conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
// conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
// conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
// conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
// conExsist.TYPE_ID = first.TYPE_ID;
// updateCheckLaws.Add(conExsist);
// }
// }
// else
// {
// conExsist.ID = first.ID;
// conExsist.ORG_ID = entity.ORG_ID;
// conExsist.CODE = first?.CODE;
// conExsist.NAME = first?.NAME;
// conExsist.VERSION_NUM = first?.VERSION_NUM;
// conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
// conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
// conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
// conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
// conExsist.TYPE_ID = first.TYPE_ID;
// updateCheckLaws.Add(conExsist);
// }
// }
// }
//}
//不存在，写入
var conIdNews = conExsists.Select(t => t.ID).ToList();
var conExsistNews = conIds.Where(t => t != null && !conIdNews.Contains(t.Value)).ToList();
@ -617,7 +565,7 @@ namespace APT.SK.WebApi.Controllers
{
//检查依据（法律法规）
var first = jtcheckContLaws.FirstOrDefault(t => t.ID == id);
if (first != null)
if (first!= null)
{
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
if (firstType == null)
@ -626,10 +574,8 @@ namespace APT.SK.WebApi.Controllers
if (jtFirstType != null)
{
T_LR_LAW_TYPE lawType = new T_LR_LAW_TYPE();
lawType.ORG_ID = entity.ORG_ID;
lawType.ID = jtFirstType.ID;
lawType.NAME = jtFirstType.NAME;
lawType.JT_SYNC = true;
updateCheckLawTypes.Add(lawType);
T_LR_LAW conExsist = new T_LR_LAW();
conExsist.ID = id.Value;
@ -642,7 +588,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = jtFirstType.ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
@ -659,49 +604,12 @@ namespace APT.SK.WebApi.Controllers
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = first.TYPE_ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
}
}
//检查内容子表保存
var conBasics = basicList.GroupBy(t => new { t.CHECK_CONTENTS_ID, t.LAW_ID }).ToList();
if (conBasics != null && conBasics.Any())
{
foreach (var item in conBasics)
{
var first = checkContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID && t.JT_SYNC);
if (first == null)
{
//写入
var jtFirstType = jtcheckContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
if (jtFirstType != null)
{
T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
conBasic.LAW_ID = item.Key.LAW_ID;
conBasic.ORG_ID = entity.ORG_ID;
conBasic.ID = jtFirstType.ID;
conBasic.JT_SYNC = true;
updateCheckBas.Add(conBasic);
}
}
else
{
//更新
T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
conBasic.LAW_ID = item.Key.LAW_ID;
conBasic.ORG_ID = entity.ORG_ID;
conBasic.ID = first.ID;
conBasic.JT_SYNC = true;
updateCheckBas.Add(conBasic);
}
}
}
}
//查隐患描述
List<T_SK_CHECK_QUESTION> updateCheckQues = new List<T_SK_CHECK_QUESTION>();
var checkContHids = this.GetEntities<T_SK_CHECK_QUESTION>(t => true, new BaseFilter(entity.ORG_ID));
@ -709,27 +617,26 @@ namespace APT.SK.WebApi.Controllers
if (hiddenList != null && hiddenList.Any())
{
var conIds = hiddenList.Where(m => m.CHECK_QUESTION_ID != null).Select(t => t.CHECK_QUESTION_ID).Distinct().ToList();
//存在，更新
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
if (conExsists != null && conExsists.Any())
{
foreach (var conExsist in conExsists)
{
//隐患描述
var first = jtCheckContHids.FirstOrDefault(t => t.ID == conExsist.ID);
if (first != null)
{
conExsist.ID = first.ID;
conExsist.ORG_ID = entity.ORG_ID;
conExsist.QUESTION_LEVEL = first?.QUESTION_LEVEL;
conExsist.DEMAND = first?.DEMAND;
conExsist.DESCREPTION = first?.DESCREPTION;
conExsist.CHECK_CONTENTS_ID = first?.CHECK_CONTENTS_ID;
conExsist.JT_SYNC = true;
updateCheckQues.Add(conExsist);
}
}
}
//存在，不更新
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID)).ToList();
//if (conExsists != null && conExsists.Any())
//{
// foreach (var conExsist in conExsists)
// {
// //隐患描述
// var first = jtCheckContHids.FirstOrDefault(t => t.ID == conExsist.ID);
// if (first != null)
// {
// conExsist.ID = first.ID;
// conExsist.ORG_ID = entity.ORG_ID;
// conExsist.QUESTION_LEVEL = first?.QUESTION_LEVEL;
// conExsist.DEMAND = first?.DEMAND;
// conExsist.DESCREPTION = first?.DESCREPTION;
// conExsist.CHECK_CONTENTS_ID = first?.CHECK_CONTENTS_ID;
// updateCheckQues.Add(conExsist);
// }
// }
//}
//不存在，写入
var conIdNews = conExsists.Select(t => t.ID).ToList();
var conExsistNews = conIds.Where(t =>t!=null&& !conIdNews.Contains(t.Value)).ToList();
@ -748,7 +655,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.DEMAND = first?.DEMAND;
conExsist.DESCREPTION = first?.DESCREPTION;
conExsist.CHECK_CONTENTS_ID = first?.CHECK_CONTENTS_ID;
conExsist.JT_SYNC = true;
updateCheckQues.Add(conExsist);
}
}
@ -891,8 +797,6 @@ namespace APT.SK.WebApi.Controllers
BantchSaveEntityNoCommit(updateCheckConts);
if (updateCheckQues != null && updateCheckQues.Any())
BantchSaveEntityNoCommit(updateCheckQues);
if (updateCheckBas != null && updateCheckBas.Any())
BantchSaveEntityNoCommit(updateCheckBas);
if (deleteBasBasicIds != null && deleteBasBasicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC>(deleteBasBasicIds);
if (deleteBasHiddenIds != null && deleteBasHiddenIds.Any())
@ -1508,7 +1412,7 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var id in proUnitIds)
{
var exsist = proUnits.FirstOrDefault(t => t.ID == id && t.JT_SYNC);
var exsist = proUnits.FirstOrDefault(t => t.ID == id);
var jtExsist = jtProUnits.FirstOrDefault(t => t.ID == id);
if (exsist != null)
{
@ -1527,7 +1431,6 @@ namespace APT.SK.WebApi.Controllers
set.ORG_ID = orgId;
set.NAME = jtExsist?.NAME;
set.CODE = jtExsist?.CODE;
set.JT_SYNC = true;
proUnitList.Add(set);
}
}
@ -1542,7 +1445,7 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var id in riskTypeIds)
{
var exsist = riskTypes.FirstOrDefault(t => t.ID == id && t.JT_SYNC);
var exsist = riskTypes.FirstOrDefault(t => t.ID == id);
var jtExsist = jtRiskTypes.FirstOrDefault(t => t.ID == id);
if (exsist != null)
{
@ -1561,7 +1464,6 @@ namespace APT.SK.WebApi.Controllers
riskTypeNew.ID = id.Value;
riskTypeNew.NAME = jtExsist?.NAME;
riskTypeNew.PRODUCTION_UNIT_ID = jtExsist?.PRODUCTION_UNIT_ID;
riskTypeNew.JT_SYNC = true;
riskTypeList.Add(riskTypeNew);
}
}
@ -1575,7 +1477,7 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var id in libLIds)
{
var exsist = libLs.FirstOrDefault(t => t.ID == id && t.JT_SYNC);
var exsist = libLs.FirstOrDefault(t => t.ID == id);
var jtExsist = jtlibLs.FirstOrDefault(t => t.ID == id);
if (exsist != null)
{
@ -1595,7 +1497,6 @@ namespace APT.SK.WebApi.Controllers
libLNew.ID = id.Value;
libLNew.NAME = jtExsist?.NAME;
libLNew.CODE = jtExsist?.CODE;
libLNew.JT_SYNC = true;
libLNew.SCORE = jtExsist == null ? 0 : jtExsist.SCORE;
libLList.Add(libLNew);
}
@ -1611,7 +1512,7 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var id in libEIds)
{
var exsist = libEs.FirstOrDefault(t => t.ID == id && t.JT_SYNC);
var exsist = libEs.FirstOrDefault(t => t.ID == id);
var jtExsist = jtlibEs.FirstOrDefault(t => t.ID == id);
if (exsist != null)
{
@ -1631,7 +1532,6 @@ namespace APT.SK.WebApi.Controllers
libENew.ID = id.Value;
libENew.NAME = jtExsist?.NAME;
libENew.CODE = jtExsist?.CODE;
libENew.JT_SYNC = true;
libENew.SCORE = jtExsist == null ? 0 : jtExsist.SCORE;
libEList.Add(libENew);
}
@ -1646,7 +1546,7 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var id in libCIds)
{
var exsist = libCs.FirstOrDefault(t => t.ID == id && t.JT_SYNC);
var exsist = libCs.FirstOrDefault(t => t.ID == id);
var jtExsist = jtlibCs.FirstOrDefault(t => t.ID == id);
if (exsist != null)
{
@ -1667,7 +1567,6 @@ namespace APT.SK.WebApi.Controllers
libCNew.NAME = jtExsist?.NAME;
libCNew.CODE = jtExsist?.CODE;
libCNew.SCORE = jtExsist == null ? 0 : jtExsist.SCORE;
libCNew.JT_SYNC = true;
libCList.Add(libCNew);
}
}
@ -1770,7 +1669,7 @@ namespace APT.SK.WebApi.Controllers
{
var conIds = contentList.Select(t => t.CHECK_CONTENTS_ID).ToList();
//存在，更新
var conExsists = checkConts.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
var conExsists = checkConts.Where(t => conIds.Contains(t.ID)).ToList();
if (conExsists != null && conExsists.Any())
{
foreach (var conExsist in conExsists)
@ -1786,7 +1685,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.Nav_ContentsBasics = null;
conExsist.CHECKCONTENT = first.CHECKCONTENT;
conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
conExsist.JT_SYNC = true;
updateCheckConts.Add(conExsist);
}
}
@ -1810,7 +1708,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.Nav_ContentsBasics = null;
conExsist.CHECKCONTENT = first.CHECKCONTENT;
conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
conExsist.JT_SYNC = true;
updateCheckConts.Add(conExsist);
}
}
@ -1830,7 +1727,7 @@ namespace APT.SK.WebApi.Controllers
{
var conIds = basicList.Select(t => t.LAW_ID).Distinct().ToList();
//存在，更新
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID)).ToList();
if (conExsists != null && conExsists.Any())
{
foreach (var conExsist in conExsists)
@ -1839,7 +1736,7 @@ namespace APT.SK.WebApi.Controllers
var first = jtcheckContLaws.FirstOrDefault(t => t.ID == conExsist.ID);
if (first != null)
{
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID && t.JT_SYNC);
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
if (firstType == null)
{
var jtFirstType = jtcheckContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
@ -1849,7 +1746,6 @@ namespace APT.SK.WebApi.Controllers
lawType.ORG_ID = orgId;
lawType.ID = jtFirstType.ID;
lawType.NAME = jtFirstType.NAME;
lawType.JT_SYNC = true;
updateCheckLawTypes.Add(lawType);
conExsist.ID = first.ID;
conExsist.ORG_ID = orgId;
@ -1861,7 +1757,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = first.TYPE_ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
@ -1877,7 +1772,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = first.TYPE_ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
@ -1904,7 +1798,6 @@ namespace APT.SK.WebApi.Controllers
lawType.ORG_ID = orgId;
lawType.ID = jtFirstType.ID;
lawType.NAME = jtFirstType.NAME;
lawType.JT_SYNC = true;
updateCheckLawTypes.Add(lawType);
T_LR_LAW conExsist = new T_LR_LAW();
conExsist.ID = id.Value;
@ -1917,7 +1810,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = jtFirstType.ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
@ -1934,7 +1826,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
conExsist.TYPE_ID = first.TYPE_ID;
conExsist.JT_SYNC = true;
updateCheckLaws.Add(conExsist);
}
}
@ -1946,7 +1837,7 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var item in conBasics)
{
var first = checkContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID && t.JT_SYNC);
var first = checkContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
if (first == null)
{
//写入
@ -1958,7 +1849,6 @@ namespace APT.SK.WebApi.Controllers
conBasic.LAW_ID = item.Key.LAW_ID;
conBasic.ORG_ID = orgId;
conBasic.ID = jtFirstType.ID;
conBasic.JT_SYNC = true;
updateCheckBas.Add(conBasic);
}
}
@ -1970,7 +1860,6 @@ namespace APT.SK.WebApi.Controllers
conBasic.LAW_ID = item.Key.LAW_ID;
conBasic.ORG_ID = orgId;
conBasic.ID = first.ID;
conBasic.JT_SYNC = true;
updateCheckBas.Add(conBasic);
}
}
@ -1984,7 +1873,7 @@ namespace APT.SK.WebApi.Controllers
{
var conIds = hiddenList.Select(t => t.CHECK_QUESTION_ID).Distinct().ToList();
//存在，更新
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID)).ToList();
if (conExsists != null && conExsists.Any())
{
foreach (var conExsist in conExsists)
@ -1999,7 +1888,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.DEMAND = first.DEMAND;
conExsist.DESCREPTION = first.DESCREPTION;
conExsist.CHECK_CONTENTS_ID = first.CHECK_CONTENTS_ID;
conExsist.JT_SYNC = true;
updateCheckQues.Add(conExsist);
}
}
@ -2022,7 +1910,6 @@ namespace APT.SK.WebApi.Controllers
conExsist.DEMAND = first.DEMAND;
conExsist.DESCREPTION = first.DESCREPTION;
conExsist.CHECK_CONTENTS_ID = first.CHECK_CONTENTS_ID;
conExsist.JT_SYNC = true;
updateCheckQues.Add(conExsist);
}
}

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

File diff suppressed because it is too large Load Diff