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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-03-13 16:37:05 +08:00
commit 06bdd14bd4
26 changed files with 280212 additions and 139260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

File diff suppressed because it is too large Load Diff

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

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

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

@ -114,5 +114,8 @@ namespace APT.MS.Domain.Entities.LR
[FormFieldQuery] [FormFieldQuery]
[FormFieldEdit] [FormFieldEdit]
public DateTime EXECUTE_TIME { get; set; } 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,5 +27,8 @@ namespace APT.MS.Domain.Entities.LR
[Description("类型名称")] [Description("类型名称")]
[DataFieldIndex(true)] [DataFieldIndex(true)]
public string NAME { get; set; } 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,5 +70,8 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：辨识区域")] [Description("导航属性：辨识区域")]
[NotMapped] [NotMapped]
public T_SK_RISK_AREA Nav_Area { get; set; } 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,5 +38,8 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：法律法规库")] [Description("导航属性：法律法规库")]
[NotMapped] [NotMapped]
public T_LR_LAW Nav_Law { get; set; } 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,5 +91,8 @@ namespace APT.MS.Domain.Entities.SK
[DataFieldIngore] [DataFieldIngore]
[NotMapped] [NotMapped]
public string CHECK_STANDARD { get; set; } 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,5 +41,7 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：生产单元")] [Description("导航属性：生产单元")]
[NotMapped] [NotMapped]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; } 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,5 +34,8 @@ namespace APT.MS.Domain.Entities.SK
[FormFieldTable] [FormFieldTable]
[FormFieldEdit] [FormFieldEdit]
public decimal SCORE { get; set; } 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,5 +34,8 @@ namespace APT.MS.Domain.Entities.SK
[FormFieldTable] [FormFieldTable]
[FormFieldEdit] [FormFieldEdit]
public decimal SCORE { get; set; } 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,5 +34,8 @@ namespace APT.MS.Domain.Entities.SK
[FormFieldTable] [FormFieldTable]
[FormFieldEdit] [FormFieldEdit]
public decimal SCORE { get; set; } 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,6 +2,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BD.WebApi.Controllers.Api namespace APT.BD.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.BD; using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护 #region Hmi-HMI资源表维护
/// <summary> /// <summary>
/// HMI资源表维护 /// HMI资源表维护
@ -123,8 +130,10 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Picture-图片资源 #region Picture-图片资源
/// <summary> /// <summary>
/// 图片资源 /// 图片资源
@ -232,8 +241,10 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PictureFile-资源图片文件 #region PictureFile-资源图片文件
/// <summary> /// <summary>
/// 资源图片文件 /// 资源图片文件
@ -341,8 +352,10 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Place-区域表 #region Place-区域表
/// <summary> /// <summary>
/// 区域表 /// 区域表
@ -449,7 +462,8 @@ namespace APT.BD.WebApi.Controllers.Api
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary>
/// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
/// <param name="filter"></param> /// <param name="filter"></param>
@ -460,8 +474,10 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region ServerInfo-服务器信息表 #region ServerInfo-服务器信息表
/// <summary> /// <summary>
/// 服务器信息表 /// 服务器信息表
@ -569,8 +585,10 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SystemInfo-系统信息表 #region SystemInfo-系统信息表
/// <summary> /// <summary>
/// 系统信息表 /// 系统信息表
@ -678,8 +696,10 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region WordTemplate-WORD模板维护 #region WordTemplate-WORD模板维护
/// <summary> /// <summary>
/// WORD模板维护 /// WORD模板维护
@ -787,6 +807,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

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

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

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

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

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

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

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

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

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

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

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

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