添加集团字段
This commit is contained in:
何美荣
parent
06a25b01a1
commit
e110da6406
@ -15,5 +15,8 @@ namespace APT.BaseData.Domain.Entities.FM
|
||||
[Description("编码")]
|
||||
|
||||
public string CODE { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
137966
APT.Data.Migrations/Migrations/20260313071635_hmr2026031301.Designer.cs
generated
Normal file
137966
APT.Data.Migrations/Migrations/20260313071635_hmr2026031301.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
123
APT.Data.Migrations/Migrations/20260313071635_hmr2026031301.cs
Normal file
123
APT.Data.Migrations/Migrations/20260313071635_hmr2026031301.cs
Normal 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");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -8293,6 +8293,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -48908,6 +48911,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<int>("LAW_STATUS")
|
||||
.HasColumnType("int");
|
||||
|
||||
@ -49341,6 +49347,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -77460,6 +77469,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -77520,6 +77532,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("LAW_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -77652,6 +77667,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -87031,6 +87049,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -87098,6 +87119,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -87156,6 +87180,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
@ -87214,6 +87241,9 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<bool>("IS_DELETED")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("JT_SYNC")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<Guid?>("MODIFIER_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
|
||||
@ -114,5 +114,8 @@ namespace APT.MS.Domain.Entities.LR
|
||||
[FormFieldQuery]
|
||||
[FormFieldEdit]
|
||||
public DateTime EXECUTE_TIME { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -27,5 +27,8 @@ namespace APT.MS.Domain.Entities.LR
|
||||
[Description("类型名称")]
|
||||
[DataFieldIndex(true)]
|
||||
public string NAME { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -70,5 +70,8 @@ namespace APT.MS.Domain.Entities.SK
|
||||
[Description("导航属性：辨识区域")]
|
||||
[NotMapped]
|
||||
public T_SK_RISK_AREA Nav_Area { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,5 +38,8 @@ namespace APT.MS.Domain.Entities.SK
|
||||
[Description("导航属性：法律法规库")]
|
||||
[NotMapped]
|
||||
public T_LR_LAW Nav_Law { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -91,5 +91,8 @@ namespace APT.MS.Domain.Entities.SK
|
||||
[DataFieldIngore]
|
||||
[NotMapped]
|
||||
public string CHECK_STANDARD { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -41,5 +41,7 @@ namespace APT.MS.Domain.Entities.SK
|
||||
[Description("导航属性：生产单元")]
|
||||
[NotMapped]
|
||||
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,5 +34,8 @@ namespace APT.MS.Domain.Entities.SK
|
||||
[FormFieldTable]
|
||||
[FormFieldEdit]
|
||||
public decimal SCORE { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,5 +34,8 @@ namespace APT.MS.Domain.Entities.SK
|
||||
[FormFieldTable]
|
||||
[FormFieldEdit]
|
||||
public decimal SCORE { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,5 +34,8 @@ namespace APT.MS.Domain.Entities.SK
|
||||
[FormFieldTable]
|
||||
[FormFieldEdit]
|
||||
public decimal SCORE { get; set; }
|
||||
|
||||
[Description("是否集团数据")]
|
||||
public Boolean JT_SYNC { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.BD.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.BD;
|
||||
|
||||
#region Hmi-HMI资源表维护
|
||||
/// <summary>
|
||||
/// HMI资源表维护
|
||||
@ -123,8 +130,10 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Picture-图片资源
|
||||
/// <summary>
|
||||
/// 图片资源
|
||||
@ -232,8 +241,10 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PictureFile-资源图片文件
|
||||
/// <summary>
|
||||
/// 资源图片文件
|
||||
@ -341,8 +352,10 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Place-区域表
|
||||
/// <summary>
|
||||
/// 区域表
|
||||
@ -449,6 +462,7 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
@ -460,8 +474,10 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ServerInfo-服务器信息表
|
||||
/// <summary>
|
||||
/// 服务器信息表
|
||||
@ -569,8 +585,10 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SystemInfo-系统信息表
|
||||
/// <summary>
|
||||
/// 系统信息表
|
||||
@ -678,8 +696,10 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region WordTemplate-WORD模板维护
|
||||
/// <summary>
|
||||
/// WORD模板维护
|
||||
@ -787,6 +807,8 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.BS.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.MS.Domain.Entities.BS;
|
||||
|
||||
#region CheckContent-检查内容表
|
||||
/// <summary>
|
||||
/// 检查内容表
|
||||
@ -123,8 +130,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContents-检查内容
|
||||
/// <summary>
|
||||
/// 检查内容
|
||||
@ -232,8 +241,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentCheckType-检查类型
|
||||
/// <summary>
|
||||
/// 检查类型
|
||||
@ -341,8 +352,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
|
||||
/// <summary>
|
||||
/// 检查内容检查类型子表(关联层级)
|
||||
@ -450,8 +463,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentHmRiskArea-检查区域
|
||||
/// <summary>
|
||||
/// 检查区域
|
||||
@ -559,8 +574,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckMain-安全检查库
|
||||
/// <summary>
|
||||
/// 安全检查库
|
||||
@ -668,8 +685,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentMainDepartment-安全检查库责任部门
|
||||
/// <summary>
|
||||
/// 安全检查库责任部门
|
||||
@ -777,8 +796,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentQuestion-检查问题
|
||||
/// <summary>
|
||||
/// 检查问题
|
||||
@ -886,8 +907,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckMainLaw-检查库法规
|
||||
/// <summary>
|
||||
/// 检查库法规
|
||||
@ -995,8 +1018,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProject-检查项目
|
||||
/// <summary>
|
||||
/// 检查项目
|
||||
@ -1104,8 +1129,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectCategory-检查项目分类表
|
||||
/// <summary>
|
||||
/// 检查项目分类表
|
||||
@ -1213,8 +1240,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectCategoryChecktype-检查项目分类_检查类型
|
||||
/// <summary>
|
||||
/// 检查项目分类_检查类型
|
||||
@ -1322,8 +1351,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectCategoryObject-检查项目分类_检查区域
|
||||
/// <summary>
|
||||
/// 检查项目分类_检查区域
|
||||
@ -1431,8 +1462,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectProjectCategory-检查项目分类
|
||||
/// <summary>
|
||||
/// 检查项目分类
|
||||
@ -1540,8 +1573,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckQuestion-检查问题
|
||||
/// <summary>
|
||||
/// 检查问题
|
||||
@ -1649,8 +1684,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckType-检查类型表
|
||||
/// <summary>
|
||||
/// 检查类型表
|
||||
@ -1757,6 +1794,7 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
@ -1768,8 +1806,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckTypeLevel-检查层级
|
||||
/// <summary>
|
||||
/// 检查层级
|
||||
@ -1877,8 +1917,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckTypeMinetype-检查类型生产单元
|
||||
/// <summary>
|
||||
/// 检查类型生产单元
|
||||
@ -1986,8 +2028,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentAreaobject-部门范围
|
||||
/// <summary>
|
||||
/// 部门范围
|
||||
@ -2095,8 +2139,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region OperateLog-操作日志
|
||||
/// <summary>
|
||||
/// 操作日志
|
||||
@ -2204,8 +2250,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSet-制定任务
|
||||
/// <summary>
|
||||
/// 制定任务
|
||||
@ -2313,8 +2361,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetArea-制定任务区域
|
||||
/// <summary>
|
||||
/// 制定任务区域
|
||||
@ -2422,8 +2472,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetDepartmentOut-制定任务排除组织
|
||||
/// <summary>
|
||||
/// 制定任务排除组织
|
||||
@ -2531,8 +2583,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetDepObject-制定任务部门触发范围
|
||||
/// <summary>
|
||||
/// 制定任务部门触发范围
|
||||
@ -2640,8 +2694,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetObject-制定任务触发范围
|
||||
/// <summary>
|
||||
/// 制定任务触发范围
|
||||
@ -2749,8 +2805,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskCategory-隐患类别
|
||||
/// <summary>
|
||||
/// 隐患类别
|
||||
@ -2858,8 +2916,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskLevelDelayDays-隐患等级最长延期整改天数
|
||||
/// <summary>
|
||||
/// 隐患等级最长延期整改天数
|
||||
@ -2967,8 +3027,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskReason-隐患原因表
|
||||
/// <summary>
|
||||
/// 隐患原因表
|
||||
@ -3076,8 +3138,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmit-隐患上报表
|
||||
/// <summary>
|
||||
/// 隐患上报表
|
||||
@ -3185,8 +3249,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContent-隐患上报明细
|
||||
/// <summary>
|
||||
/// 隐患上报明细
|
||||
@ -3294,8 +3360,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentBack-隐患上报明细退回
|
||||
/// <summary>
|
||||
/// 隐患上报明细退回
|
||||
@ -3403,8 +3471,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDeal-隐患整改记录
|
||||
/// <summary>
|
||||
/// 隐患整改记录
|
||||
@ -3512,8 +3582,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealAfterFile-检查任务附件表
|
||||
/// <summary>
|
||||
/// 检查任务附件表
|
||||
@ -3621,8 +3693,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealFile-检查任务附件表
|
||||
/// <summary>
|
||||
/// 检查任务附件表
|
||||
@ -3730,8 +3804,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
|
||||
/// <summary>
|
||||
/// 隐患整改验收人签名
|
||||
@ -3839,8 +3915,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealUsersign-隐患整改责任人签名
|
||||
/// <summary>
|
||||
/// 隐患整改责任人签名
|
||||
@ -3948,8 +4026,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentFile-检查任务明细附件表
|
||||
/// <summary>
|
||||
/// 检查任务明细附件表
|
||||
@ -4057,8 +4137,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentReason-隐患上报明细原因
|
||||
/// <summary>
|
||||
/// 隐患上报明细原因
|
||||
@ -4166,8 +4248,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentTemp-隐患上报详情待入库
|
||||
/// <summary>
|
||||
/// 隐患上报详情待入库
|
||||
@ -4275,8 +4359,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitDelayApply-延期整改申请
|
||||
/// <summary>
|
||||
/// 延期整改申请
|
||||
@ -4384,8 +4470,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitDelayApplyDetail-延期整改申请详情
|
||||
/// <summary>
|
||||
/// 延期整改申请详情
|
||||
@ -4493,8 +4581,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitFile-检查任务附件表
|
||||
/// <summary>
|
||||
/// 检查任务附件表
|
||||
@ -4602,8 +4692,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitNotice-隐患通知
|
||||
/// <summary>
|
||||
/// 隐患通知
|
||||
@ -4711,8 +4803,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitNoticePerson-隐患通知
|
||||
/// <summary>
|
||||
/// 隐患通知
|
||||
@ -4820,8 +4914,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskTpm-TPM对接数据
|
||||
/// <summary>
|
||||
/// TPM对接数据
|
||||
@ -4929,8 +5025,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheck-安全检查
|
||||
/// <summary>
|
||||
/// 安全检查
|
||||
@ -5038,8 +5136,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetail-检查明细
|
||||
/// <summary>
|
||||
/// 检查明细
|
||||
@ -5147,8 +5247,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailFile-检查任务明细附件表
|
||||
/// <summary>
|
||||
/// 检查任务明细附件表
|
||||
@ -5256,8 +5358,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailLaw-检查依据
|
||||
/// <summary>
|
||||
/// 检查依据
|
||||
@ -5365,8 +5469,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailQuestion-检查明细问题
|
||||
/// <summary>
|
||||
/// 检查明细问题
|
||||
@ -5474,8 +5580,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailReason-检查明细隐患原因
|
||||
/// <summary>
|
||||
/// 检查明细隐患原因
|
||||
@ -5583,8 +5691,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailReject-检查明细退回
|
||||
/// <summary>
|
||||
/// 检查明细退回
|
||||
@ -5692,8 +5802,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailRejectFile-检查明细退回附件
|
||||
/// <summary>
|
||||
/// 检查明细退回附件
|
||||
@ -5801,8 +5913,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailUser-检查明细人员
|
||||
/// <summary>
|
||||
/// 检查明细人员
|
||||
@ -5910,8 +6024,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckFile-安全检查文件
|
||||
/// <summary>
|
||||
/// 安全检查文件
|
||||
@ -6019,8 +6135,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckProject-安全检查文件
|
||||
/// <summary>
|
||||
/// 安全检查文件
|
||||
@ -6128,8 +6246,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckProjectCategory-安全检查文件
|
||||
/// <summary>
|
||||
/// 安全检查文件
|
||||
@ -6237,8 +6357,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckRecord-检查记录确认
|
||||
/// <summary>
|
||||
/// 检查记录确认
|
||||
@ -6346,8 +6468,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckRecordDetail-检查记录确认明细
|
||||
/// <summary>
|
||||
/// 检查记录确认明细
|
||||
@ -6455,8 +6579,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckRiskArea-检查区域
|
||||
/// <summary>
|
||||
/// 检查区域
|
||||
@ -6564,8 +6690,10 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckUsersign-检查签名
|
||||
/// <summary>
|
||||
/// 检查签名
|
||||
@ -6673,6 +6801,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -17,6 +23,7 @@ namespace APT.FM.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.FM;
|
||||
using APT.BaseData.Domain.Entities;
|
||||
|
||||
#region Api-API
|
||||
/// <summary>
|
||||
/// API
|
||||
@ -124,8 +131,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BaseAdd-企业位置信息
|
||||
/// <summary>
|
||||
/// 企业位置信息
|
||||
@ -233,8 +242,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BaseEnergy-企业能耗配置信息
|
||||
/// <summary>
|
||||
/// 企业能耗配置信息
|
||||
@ -342,8 +353,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BaseInfo-企业基本信息
|
||||
/// <summary>
|
||||
/// 企业基本信息
|
||||
@ -451,8 +464,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCalendarConfig-部门日历配置表
|
||||
/// <summary>
|
||||
/// 部门日历配置表
|
||||
@ -560,8 +575,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCalendarConfigDetail-部门日历配置明细表
|
||||
/// <summary>
|
||||
/// 部门日历配置明细表
|
||||
@ -669,8 +686,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCalendarConfigTeam-部门日历配置班组表
|
||||
/// <summary>
|
||||
/// 部门日历配置班组表
|
||||
@ -778,8 +797,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCompletion-XX班完成情况统计
|
||||
/// <summary>
|
||||
/// XX班完成情况统计
|
||||
@ -887,8 +908,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCompletionSort-班组完成情况前十
|
||||
/// <summary>
|
||||
/// 班组完成情况前十
|
||||
@ -996,8 +1019,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentPost-部门岗位
|
||||
/// <summary>
|
||||
/// 部门岗位
|
||||
@ -1105,8 +1130,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentPostUser-部门岗位人员
|
||||
/// <summary>
|
||||
/// 部门岗位人员
|
||||
@ -1214,8 +1241,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentProductionUnit-生产单元
|
||||
/// <summary>
|
||||
/// 生产单元
|
||||
@ -1323,8 +1352,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentSafeuser-安全员表
|
||||
/// <summary>
|
||||
/// 安全员表
|
||||
@ -1432,8 +1463,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentScheduling-部门排班表
|
||||
/// <summary>
|
||||
/// 部门排班表
|
||||
@ -1541,8 +1574,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentSchedulingDetail-排班信息人员明细表
|
||||
/// <summary>
|
||||
/// 排班信息人员明细表
|
||||
@ -1650,8 +1685,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentUser-部门人员表
|
||||
/// <summary>
|
||||
/// 部门人员表
|
||||
@ -1759,8 +1796,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Enum-枚举管理
|
||||
/// <summary>
|
||||
/// 枚举管理
|
||||
@ -1868,8 +1907,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Enums-枚举表单
|
||||
/// <summary>
|
||||
/// 枚举表单
|
||||
@ -1977,8 +2018,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region EnumItem-枚举项
|
||||
/// <summary>
|
||||
/// 枚举项
|
||||
@ -2086,8 +2129,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region EnumType-枚举类别
|
||||
/// <summary>
|
||||
/// 枚举类别
|
||||
@ -2195,8 +2240,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region HiddenDangerRectification-隐患整改完成情况统计
|
||||
/// <summary>
|
||||
/// 隐患整改完成情况统计
|
||||
@ -2304,8 +2351,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region JobActivityCompletion-班组作业完成率统计
|
||||
/// <summary>
|
||||
/// 班组作业完成率统计
|
||||
@ -2413,8 +2462,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region MessageTemplate-短信模板表
|
||||
/// <summary>
|
||||
/// 短信模板表
|
||||
@ -2522,8 +2573,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Monitoring-服务器监听表
|
||||
/// <summary>
|
||||
/// 服务器监听表
|
||||
@ -2631,8 +2684,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Notice-信息通知表
|
||||
/// <summary>
|
||||
/// 信息通知表
|
||||
@ -2740,8 +2795,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NotificationTask-娑堟伅琛?
|
||||
/// <summary>
|
||||
/// 娑堟伅琛?
|
||||
@ -2849,8 +2906,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
|
||||
/// <summary>
|
||||
/// 寰呭姙琛ㄦ椂闂撮厤缃?
|
||||
@ -2958,8 +3017,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ParamSet-参数设置表
|
||||
/// <summary>
|
||||
/// 参数设置表
|
||||
@ -3067,8 +3128,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ParamSetDepartment-组织关联信息
|
||||
/// <summary>
|
||||
/// 组织关联信息
|
||||
@ -3176,8 +3239,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Person-人员信息
|
||||
/// <summary>
|
||||
/// 人员信息
|
||||
@ -3285,8 +3350,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonCertificateFile-证书
|
||||
/// <summary>
|
||||
/// 证书
|
||||
@ -3394,8 +3461,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonEducationFile-学历证
|
||||
/// <summary>
|
||||
/// 学历证
|
||||
@ -3503,8 +3572,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonIdcardFile-身份证
|
||||
/// <summary>
|
||||
/// 身份证
|
||||
@ -3612,8 +3683,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonSkills-技能
|
||||
/// <summary>
|
||||
/// 技能
|
||||
@ -3721,8 +3794,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonWork-工作经历
|
||||
/// <summary>
|
||||
/// 工作经历
|
||||
@ -3830,8 +3905,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskLevelProportion-风险等级占比
|
||||
/// <summary>
|
||||
/// 风险等级占比
|
||||
@ -3939,8 +4016,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskTypeProportion-风险类别占比
|
||||
/// <summary>
|
||||
/// 风险类别占比
|
||||
@ -4048,8 +4127,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleDepartment-部门权限
|
||||
/// <summary>
|
||||
/// 部门权限
|
||||
@ -4157,8 +4238,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Snapshot-随手拍
|
||||
/// <summary>
|
||||
/// 随手拍
|
||||
@ -4266,8 +4349,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SnapshotFile-随手拍图片
|
||||
/// <summary>
|
||||
/// 随手拍图片
|
||||
@ -4375,8 +4460,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncLimit-数据同步次数限制
|
||||
/// <summary>
|
||||
/// 数据同步次数限制
|
||||
@ -4484,8 +4571,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncLog-跑批日志表
|
||||
/// <summary>
|
||||
/// 跑批日志表
|
||||
@ -4593,8 +4682,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncLogDetail-跑批日志明细表
|
||||
/// <summary>
|
||||
/// 跑批日志明细表
|
||||
@ -4702,8 +4793,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncUserRule-用户数据同步例外配置
|
||||
/// <summary>
|
||||
/// 用户数据同步例外配置
|
||||
@ -4811,8 +4904,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Team-班组表
|
||||
/// <summary>
|
||||
/// 班组表
|
||||
@ -4920,8 +5015,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TeamPerson-班组人员关联信息
|
||||
/// <summary>
|
||||
/// 班组人员关联信息
|
||||
@ -5029,8 +5126,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserDepartment-用户部门关联表
|
||||
/// <summary>
|
||||
/// 用户部门关联表
|
||||
@ -5138,8 +5237,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserPost-宀椾綅鍒楄〃
|
||||
/// <summary>
|
||||
/// 宀椾綅鍒楄〃
|
||||
@ -5247,8 +5348,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserProductionUnit-生产单元
|
||||
/// <summary>
|
||||
/// 生产单元
|
||||
@ -5356,8 +5459,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserProductionUnitSet-生产单元
|
||||
/// <summary>
|
||||
/// 生产单元
|
||||
@ -5465,8 +5570,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserSignFile-签名照片
|
||||
/// <summary>
|
||||
/// 签名照片
|
||||
@ -5574,8 +5681,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserTest-测试多选
|
||||
/// <summary>
|
||||
/// 测试多选
|
||||
@ -5683,8 +5792,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserVacationSet-人员休假设置
|
||||
/// <summary>
|
||||
/// 人员休假设置
|
||||
@ -5792,8 +5903,10 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region WorkTicketCompletion-关键许可工作票完成情况统计
|
||||
/// <summary>
|
||||
/// 关键许可工作票完成情况统计
|
||||
@ -5901,6 +6014,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.LG.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.LG;
|
||||
|
||||
#region Oprate-表单操作日志表
|
||||
/// <summary>
|
||||
/// 表单操作日志表
|
||||
@ -123,6 +130,8 @@ namespace APT.LG.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.NW.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.NW;
|
||||
|
||||
#region Enterprise-子企业表
|
||||
/// <summary>
|
||||
/// 子企业表
|
||||
@ -122,6 +129,7 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
@ -133,8 +141,10 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleDataPerm-子企业数据权限表
|
||||
/// <summary>
|
||||
/// 子企业数据权限表
|
||||
@ -242,8 +252,10 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleMenu-子企业权限表
|
||||
/// <summary>
|
||||
/// 子企业权限表
|
||||
@ -351,6 +363,8 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -16,6 +22,7 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.OP.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.OP;
|
||||
|
||||
#region Alluser-用户表(租户平台)
|
||||
/// <summary>
|
||||
/// 用户表(租户平台)
|
||||
@ -123,8 +130,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BillingRule-计费规则表
|
||||
/// <summary>
|
||||
/// 计费规则表
|
||||
@ -232,8 +241,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BillingRuleVersion-计费规则子表
|
||||
/// <summary>
|
||||
/// 计费规则子表
|
||||
@ -341,8 +352,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ChargeTimeSet-充电时长配置
|
||||
/// <summary>
|
||||
/// 充电时长配置
|
||||
@ -450,8 +463,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Client-客户表
|
||||
/// <summary>
|
||||
/// 客户表
|
||||
@ -559,8 +574,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ClinetOpenid-客户表OpenId
|
||||
/// <summary>
|
||||
/// 客户表OpenId
|
||||
@ -668,8 +685,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CommonQuestion-常见问题
|
||||
/// <summary>
|
||||
/// 常见问题
|
||||
@ -777,8 +796,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileFirmware-充电桩固件表
|
||||
/// <summary>
|
||||
/// 充电桩固件表
|
||||
@ -886,8 +907,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Member-会员表
|
||||
/// <summary>
|
||||
/// 会员表
|
||||
@ -995,8 +1018,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Menu-菜单表(租户平台)
|
||||
/// <summary>
|
||||
/// 菜单表(租户平台)
|
||||
@ -1103,6 +1128,7 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
@ -1114,8 +1140,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Notice-公告表
|
||||
/// <summary>
|
||||
/// 公告表
|
||||
@ -1223,8 +1251,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NoticeDetail-公告内容
|
||||
/// <summary>
|
||||
/// 公告内容
|
||||
@ -1332,8 +1362,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PeakValleyConfig-峰谷配置表
|
||||
/// <summary>
|
||||
/// 峰谷配置表
|
||||
@ -1441,8 +1473,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RechargeCard-充值卡
|
||||
/// <summary>
|
||||
/// 充值卡
|
||||
@ -1550,8 +1584,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RechargeOrder-充值订单
|
||||
/// <summary>
|
||||
/// 充值订单
|
||||
@ -1659,8 +1695,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RechargeSetting-充值金额配置
|
||||
/// <summary>
|
||||
/// 充值金额配置
|
||||
@ -1768,8 +1806,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RfidCard-RFID卡
|
||||
/// <summary>
|
||||
/// RFID卡
|
||||
@ -1877,8 +1917,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleMenu-租户权限表
|
||||
/// <summary>
|
||||
/// 租户权限表
|
||||
@ -1986,8 +2028,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Tenant-租户表
|
||||
/// <summary>
|
||||
/// 租户表
|
||||
@ -2095,8 +2139,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TenantDbConn-租户数据库表
|
||||
/// <summary>
|
||||
/// 租户数据库表
|
||||
@ -2204,8 +2250,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TenantDomain-租户域名表
|
||||
/// <summary>
|
||||
/// 租户域名表
|
||||
@ -2313,8 +2361,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TenantExpiration-租户租期表
|
||||
/// <summary>
|
||||
/// 租户租期表
|
||||
@ -2422,8 +2472,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region User-用户表(租户平台)
|
||||
/// <summary>
|
||||
/// 用户表(租户平台)
|
||||
@ -2531,8 +2583,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Version-版本升级表
|
||||
/// <summary>
|
||||
/// 版本升级表
|
||||
@ -2640,8 +2694,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region VersionMenu-菜单版本升级表
|
||||
/// <summary>
|
||||
/// 菜单版本升级表
|
||||
@ -2749,8 +2805,10 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region VersionTenant-租户版本升级表
|
||||
/// <summary>
|
||||
/// 租户版本升级表
|
||||
@ -2858,6 +2916,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -19,6 +25,7 @@ namespace APT.PF.WebApi.Controllers.Api
|
||||
using APT.BaseData.Domain.Entities;
|
||||
using APT.BaseData.Domain.Entities.PF;
|
||||
using APT.BaseData.Domain.Entities.T4;
|
||||
|
||||
#region ApprovalRole-审批角色
|
||||
/// <summary>
|
||||
/// 审批角色
|
||||
@ -126,8 +133,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Approve-审批流主表
|
||||
/// <summary>
|
||||
/// 审批流主表
|
||||
@ -235,8 +244,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveDetail-审批流子表
|
||||
/// <summary>
|
||||
/// 审批流子表
|
||||
@ -344,8 +355,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveOperationRole-操作角色
|
||||
/// <summary>
|
||||
/// 操作角色
|
||||
@ -453,8 +466,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveRejectConfig-审批驳回配置表
|
||||
/// <summary>
|
||||
/// 审批驳回配置表
|
||||
@ -562,8 +577,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveRoleDepartment-分管部门
|
||||
/// <summary>
|
||||
/// 分管部门
|
||||
@ -671,8 +688,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveTemp-审批流模板主表
|
||||
/// <summary>
|
||||
/// 审批流模板主表
|
||||
@ -780,8 +799,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveTempDetail-审批流模板子表
|
||||
/// <summary>
|
||||
/// 审批流模板子表
|
||||
@ -889,8 +910,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AppVersion-App版本发布
|
||||
/// <summary>
|
||||
/// App版本发布
|
||||
@ -998,8 +1021,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AppVersionFile-App包文件
|
||||
/// <summary>
|
||||
/// App包文件
|
||||
@ -1107,8 +1132,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ClientScopes-资源表
|
||||
/// <summary>
|
||||
/// 资源表
|
||||
@ -1216,8 +1243,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CodeRuleRunLog-编码规则跑批表
|
||||
/// <summary>
|
||||
/// 编码规则跑批表
|
||||
@ -1325,8 +1354,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ComplaintLog-转办记录表
|
||||
/// <summary>
|
||||
/// 转办记录表
|
||||
@ -1434,8 +1465,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DataChannel-数据通道
|
||||
/// <summary>
|
||||
/// 数据通道
|
||||
@ -1543,8 +1576,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DataFrequency-采集频率
|
||||
/// <summary>
|
||||
/// 采集频率
|
||||
@ -1652,8 +1687,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Fddeback-意见反馈
|
||||
/// <summary>
|
||||
/// 意见反馈
|
||||
@ -1761,8 +1798,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FddebackFile-意见反馈附件
|
||||
/// <summary>
|
||||
/// 意见反馈附件
|
||||
@ -1870,8 +1909,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileDb-
|
||||
/// <summary>
|
||||
///
|
||||
@ -1979,8 +2020,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileDbFile-
|
||||
/// <summary>
|
||||
///
|
||||
@ -2088,8 +2131,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileType-
|
||||
/// <summary>
|
||||
///
|
||||
@ -2197,8 +2242,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeChart-首页：图标区域
|
||||
/// <summary>
|
||||
/// 首页：图标区域
|
||||
@ -2306,8 +2353,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeHmi-首页：HMI区域
|
||||
/// <summary>
|
||||
/// 首页：HMI区域
|
||||
@ -2415,8 +2464,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeRanking-首页：排名区域
|
||||
/// <summary>
|
||||
/// 首页：排名区域
|
||||
@ -2524,8 +2575,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeStatistic-首页：统计区域
|
||||
/// <summary>
|
||||
/// 首页：统计区域
|
||||
@ -2633,8 +2686,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormRelation-关联表单配置
|
||||
/// <summary>
|
||||
/// 关联表单配置
|
||||
@ -2742,8 +2797,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region HomeTitle-首页方针
|
||||
/// <summary>
|
||||
/// 首页方针
|
||||
@ -2851,8 +2908,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region MqttConfig-MQTT配置表
|
||||
/// <summary>
|
||||
/// MQTT配置表
|
||||
@ -2960,8 +3019,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region MqttConfigTheme-
|
||||
/// <summary>
|
||||
///
|
||||
@ -3069,8 +3130,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Notice-通知
|
||||
/// <summary>
|
||||
/// 通知
|
||||
@ -3178,8 +3241,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NoticeFile-
|
||||
/// <summary>
|
||||
///
|
||||
@ -3287,8 +3352,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PicFilter-图片条件主表
|
||||
/// <summary>
|
||||
/// 图片条件主表
|
||||
@ -3396,8 +3463,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PicFilterDetail-图片条件子表
|
||||
/// <summary>
|
||||
/// 图片条件子表
|
||||
@ -3505,8 +3574,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region QuestionFeedback-问题反馈表
|
||||
/// <summary>
|
||||
/// 问题反馈表
|
||||
@ -3614,8 +3685,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region QuestionFeedbackFile-问题反馈附件表
|
||||
/// <summary>
|
||||
/// 问题反馈附件表
|
||||
@ -3723,8 +3796,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Scopes-资源表
|
||||
/// <summary>
|
||||
/// 资源表
|
||||
@ -3832,8 +3907,10 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region VersionManage-版本管理表
|
||||
/// <summary>
|
||||
/// 版本管理表
|
||||
@ -3941,6 +4018,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,6 +2,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -15,4 +21,5 @@ using APT.Infrastructure.Api;
|
||||
using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.PP.WebApi.Controllers.Api
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -317,9 +317,11 @@ namespace APT.SK.WebApi.Controllers
|
||||
}
|
||||
T_FM_USER_PRODUCTION_UNIT_SET proUnitNew = null;
|
||||
//查生产单元表
|
||||
var proUnit = this.GetEntity<T_FM_USER_PRODUCTION_UNIT_SET>(t =>t.ID == entity.PRODUCTION_UNIT_ID);
|
||||
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);
|
||||
if (proUnit == null && jtProUnit != null)
|
||||
if (proUnit == null)
|
||||
{
|
||||
if (jtProUnit != null)
|
||||
{
|
||||
//写入
|
||||
proUnitNew = new T_FM_USER_PRODUCTION_UNIT_SET();
|
||||
@ -327,38 +329,46 @@ namespace APT.SK.WebApi.Controllers
|
||||
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.CODE = jtProUnit?.CODE;
|
||||
}
|
||||
//else
|
||||
//{
|
||||
// //更新
|
||||
// proUnitNew = proUnit;
|
||||
// proUnitNew.NAME = jtProUnit?.NAME;
|
||||
// proUnitNew.CODE = jtProUnit?.CODE;
|
||||
//}
|
||||
T_SK_RISK_TYPE riskTypeNew = null;
|
||||
//查风险类别
|
||||
var riskType = this.GetEntity<T_SK_RISK_TYPE>(t => t.ID == entity.TYPE_ID);
|
||||
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);
|
||||
if (riskType == null && jtRiskType!=null)
|
||||
if (riskType == null)
|
||||
{
|
||||
if (jtRiskType != null)
|
||||
{
|
||||
riskTypeNew = new T_SK_RISK_TYPE();
|
||||
riskTypeNew.ORG_ID = entity.ORG_ID;
|
||||
riskTypeNew.ID = entity.TYPE_ID.Value;
|
||||
riskTypeNew.NAME = jtRiskType?.NAME;
|
||||
riskTypeNew.JT_SYNC = true;
|
||||
riskTypeNew.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//更新
|
||||
riskTypeNew = riskType;
|
||||
riskTypeNew.NAME = jtRiskType?.NAME;
|
||||
riskTypeNew.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
|
||||
}
|
||||
//else
|
||||
//{
|
||||
// //更新
|
||||
// riskTypeNew = riskType;
|
||||
// riskTypeNew.NAME = jtRiskType?.NAME;
|
||||
// riskTypeNew.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
|
||||
//}
|
||||
T_SK_SCOREL libLNew = null;
|
||||
//查生产单元表
|
||||
var libL = this.GetEntity<T_SK_SCOREL>(t => t.ID == entity.SCOREL_ID);
|
||||
//查LEC
|
||||
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);
|
||||
if (libL == null && jtlibL != null)
|
||||
if (libL == null)
|
||||
{
|
||||
if (jtlibL != null)
|
||||
{
|
||||
//写入
|
||||
libLNew = new T_SK_SCOREL();
|
||||
@ -366,13 +376,25 @@ namespace APT.SK.WebApi.Controllers
|
||||
libLNew.ID = entity.SCOREL_ID.Value;
|
||||
libLNew.NAME = jtlibL?.NAME;
|
||||
libLNew.CODE = jtlibL?.CODE;
|
||||
libLNew.SCORE = jtlibL==null ?0:jtlibL.SCORE;
|
||||
libLNew.JT_SYNC = true;
|
||||
libLNew.SCORE = jtlibL == null ? 0 : jtlibL.SCORE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//更新
|
||||
libLNew = libL;
|
||||
libLNew.NAME = jtlibL?.NAME;
|
||||
libLNew.CODE = jtlibL?.CODE;
|
||||
libLNew.SCORE = jtlibL == null ? 0 : jtlibL.SCORE;
|
||||
}
|
||||
T_SK_SCOREE libENew = null;
|
||||
//查生产单元表
|
||||
var libE = this.GetEntity<T_SK_SCOREE>(t => t.ID == entity.SCOREE_ID);
|
||||
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);
|
||||
if (libE == null && libE != null)
|
||||
if (libE == null)
|
||||
{
|
||||
if (libE != null)
|
||||
{
|
||||
//写入
|
||||
libENew = new T_SK_SCOREE();
|
||||
@ -381,12 +403,24 @@ namespace APT.SK.WebApi.Controllers
|
||||
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.CODE = jtlibE?.CODE;
|
||||
libENew.SCORE = jtlibE == null ? 0 : jtlibE.SCORE;
|
||||
}
|
||||
T_SK_SCOREC libCNew = null;
|
||||
//查生产单元表
|
||||
var libC = this.GetEntity<T_SK_SCOREC>(t => t.ID == entity.SCOREC_ID);
|
||||
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);
|
||||
if (libC == null && jtlibC != null)
|
||||
if (libC == null)
|
||||
{
|
||||
if (jtlibC != null)
|
||||
{
|
||||
//写入
|
||||
libCNew = new T_SK_SCOREC();
|
||||
@ -394,9 +428,18 @@ namespace APT.SK.WebApi.Controllers
|
||||
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.CODE = jtlibC?.CODE;
|
||||
libCNew.SCORE = jtlibC == null ? 0 : jtlibC.SCORE;
|
||||
}
|
||||
|
||||
if (details != null && details.Any())
|
||||
{
|
||||
foreach (var item in details)
|
||||
@ -451,27 +494,28 @@ namespace APT.SK.WebApi.Controllers
|
||||
if (contentList != null && contentList.Any())
|
||||
{
|
||||
var conIds = contentList.Where(m=>m.CHECK_CONTENTS_ID!=null).Select(t => t.CHECK_CONTENTS_ID).ToList();
|
||||
//存在，不更新
|
||||
var conExsists = checkConts.Where(t=> conIds.Contains(t.ID)).ToList();
|
||||
//if (conExsists != null && conExsists.Any())
|
||||
//{
|
||||
// foreach (var conExsist in conExsists)
|
||||
// {
|
||||
// //检查内容
|
||||
// var first = jtCheckConts.FirstOrDefault(t => t.ID == conExsist.ID);
|
||||
// if (first != null)
|
||||
// {
|
||||
// conExsist.ID = first.ID;
|
||||
// conExsist.ORG_ID = entity.ORG_ID;
|
||||
// conExsist.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
|
||||
// conExsist.Nav_ListCheckQuestion = null;
|
||||
// conExsist.Nav_ContentsBasics = null;
|
||||
// conExsist.CHECKCONTENT = first.CHECKCONTENT;
|
||||
// conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
|
||||
// updateCheckConts.Add(conExsist);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
//存在，更新
|
||||
var conExsists = checkConts.Where(t=> conIds.Contains(t.ID) && t.JT_SYNC).ToList();
|
||||
if (conExsists != null && conExsists.Any())
|
||||
{
|
||||
foreach (var conExsist in conExsists)
|
||||
{
|
||||
//检查内容
|
||||
var first = jtCheckConts.FirstOrDefault(t => t.ID == conExsist.ID);
|
||||
if (first != null)
|
||||
{
|
||||
conExsist.ID = first.ID;
|
||||
conExsist.ORG_ID = entity.ORG_ID;
|
||||
conExsist.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
|
||||
conExsist.Nav_ListCheckQuestion = null;
|
||||
conExsist.Nav_ContentsBasics = null;
|
||||
conExsist.CHECKCONTENT = first.CHECKCONTENT;
|
||||
conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckConts.Add(conExsist);
|
||||
}
|
||||
}
|
||||
}
|
||||
//不存在，写入
|
||||
var conIdNews = conExsists.Select(t => t.ID).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.CHECKCONTENT = first?.CHECKCONTENT;
|
||||
conExsist.CHECK_STANDARD = first?.CHECK_STANDARD;
|
||||
conExsist.JT_SYNC = true;
|
||||
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_TYPE> updateCheckLawTypes = new List<T_LR_LAW_TYPE>();
|
||||
var checkContLaws = this.GetEntities<T_LR_LAW>(t => true, new BaseFilter(entity.ORG_ID));
|
||||
var jtcheckContLaws = db.GetJTLaws(dbName).ToList();
|
||||
List<T_SK_CHECK_CONTENTS_BASIC> updateCheckBas = new List<T_SK_CHECK_CONTENTS_BASIC>();
|
||||
var jtcheckContLawTypes = db.GetJTLawTypes(dbName).ToList();
|
||||
var checkContLawTypes = this.GetEntities<T_LR_LAW_TYPE>(t => true, new BaseFilter(entity.ORG_ID));
|
||||
var checkContLaws = this.GetEntities<T_LR_LAW>(t => true, new BaseFilter(entity.ORG_ID));
|
||||
var jtcheckContLaws = db.GetJTLaws(dbName).ToList();
|
||||
var checkContBas = this.GetEntities<T_SK_CHECK_CONTENTS_BASIC>(t => true, new BaseFilter(entity.ORG_ID));
|
||||
var jtcheckContBas = db.GetJTBas(dbName).ToList();
|
||||
if (basicList != null && basicList.Any())
|
||||
{
|
||||
var conIds = basicList.Where(m => m.LAW_ID != null).Select(t => t.LAW_ID).Distinct().ToList();
|
||||
//存在，不更新
|
||||
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID)).ToList();
|
||||
//if (conExsists != null && conExsists.Any())
|
||||
//{
|
||||
// foreach (var conExsist in conExsists)
|
||||
// {
|
||||
// //法律法规
|
||||
// var first = jtcheckContLaws.FirstOrDefault(t => t.ID == conExsist.ID);
|
||||
// if (first != null)
|
||||
// {
|
||||
// var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
|
||||
// if (firstType == null)
|
||||
// {
|
||||
// var jtFirstType = jtcheckContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
|
||||
// if (jtFirstType != null)
|
||||
// {
|
||||
// T_LR_LAW_TYPE lawType = new T_LR_LAW_TYPE();
|
||||
// lawType.ID = jtFirstType.ID;
|
||||
// lawType.NAME = jtFirstType.NAME;
|
||||
// updateCheckLawTypes.Add(lawType);
|
||||
// conExsist.ID = first.ID;
|
||||
// conExsist.ORG_ID = entity.ORG_ID;
|
||||
// conExsist.CODE = first?.CODE;
|
||||
// conExsist.NAME = first?.NAME;
|
||||
// conExsist.VERSION_NUM = first?.VERSION_NUM;
|
||||
// conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
|
||||
// conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
|
||||
// conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
// conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
// conExsist.TYPE_ID = first.TYPE_ID;
|
||||
// updateCheckLaws.Add(conExsist);
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// conExsist.ID = first.ID;
|
||||
// conExsist.ORG_ID = entity.ORG_ID;
|
||||
// conExsist.CODE = first?.CODE;
|
||||
// conExsist.NAME = first?.NAME;
|
||||
// conExsist.VERSION_NUM = first?.VERSION_NUM;
|
||||
// conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
|
||||
// conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
|
||||
// conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
// conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
// conExsist.TYPE_ID = first.TYPE_ID;
|
||||
// updateCheckLaws.Add(conExsist);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
var conIds = basicList.Select(t => t.LAW_ID).Distinct().ToList();
|
||||
//存在，更新
|
||||
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
|
||||
if (conExsists != null && conExsists.Any())
|
||||
{
|
||||
foreach (var conExsist in conExsists)
|
||||
{
|
||||
//法律法规
|
||||
var first = jtcheckContLaws.FirstOrDefault(t => t.ID == conExsist.ID);
|
||||
if (first != null)
|
||||
{
|
||||
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID && t.JT_SYNC);
|
||||
if (firstType == null)
|
||||
{
|
||||
var jtFirstType = jtcheckContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
|
||||
if (jtFirstType != null)
|
||||
{
|
||||
T_LR_LAW_TYPE lawType = new T_LR_LAW_TYPE();
|
||||
lawType.ORG_ID = entity.ORG_ID;
|
||||
lawType.ID = jtFirstType.ID;
|
||||
lawType.NAME = jtFirstType.NAME;
|
||||
lawType.JT_SYNC = true;
|
||||
updateCheckLawTypes.Add(lawType);
|
||||
conExsist.ID = first.ID;
|
||||
conExsist.ORG_ID = entity.ORG_ID;
|
||||
conExsist.CODE = first?.CODE;
|
||||
conExsist.NAME = first?.NAME;
|
||||
conExsist.VERSION_NUM = first?.VERSION_NUM;
|
||||
conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
|
||||
conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = first.TYPE_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
conExsist.ID = first.ID;
|
||||
conExsist.ORG_ID = entity.ORG_ID;
|
||||
conExsist.CODE = first?.CODE;
|
||||
conExsist.NAME = first?.NAME;
|
||||
conExsist.VERSION_NUM = first?.VERSION_NUM;
|
||||
conExsist.LAW_STATUS = first == null ? BSLawStatusEnum.现行 : first.LAW_STATUS;
|
||||
conExsist.UPDATE_TIME = first == null ? DateTime.Now : first.UPDATE_TIME;
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = first.TYPE_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//不存在，写入
|
||||
var conIdNews = conExsists.Select(t => t.ID).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);
|
||||
if (first!= null)
|
||||
if (first != null)
|
||||
{
|
||||
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
|
||||
if (firstType == null)
|
||||
@ -574,8 +626,10 @@ namespace APT.SK.WebApi.Controllers
|
||||
if (jtFirstType != null)
|
||||
{
|
||||
T_LR_LAW_TYPE lawType = new T_LR_LAW_TYPE();
|
||||
lawType.ORG_ID = entity.ORG_ID;
|
||||
lawType.ID = jtFirstType.ID;
|
||||
lawType.NAME = jtFirstType.NAME;
|
||||
lawType.JT_SYNC = true;
|
||||
updateCheckLawTypes.Add(lawType);
|
||||
T_LR_LAW conExsist = new T_LR_LAW();
|
||||
conExsist.ID = id.Value;
|
||||
@ -588,6 +642,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = jtFirstType.ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -604,12 +659,49 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = first.TYPE_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//检查内容子表保存
|
||||
var conBasics = basicList.GroupBy(t => new { t.CHECK_CONTENTS_ID, t.LAW_ID }).ToList();
|
||||
if (conBasics != null && conBasics.Any())
|
||||
{
|
||||
foreach (var item in conBasics)
|
||||
{
|
||||
var first = checkContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID && t.JT_SYNC);
|
||||
if (first == null)
|
||||
{
|
||||
//写入
|
||||
var jtFirstType = jtcheckContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
|
||||
if (jtFirstType != null)
|
||||
{
|
||||
T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
|
||||
conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
|
||||
conBasic.LAW_ID = item.Key.LAW_ID;
|
||||
conBasic.ORG_ID = entity.ORG_ID;
|
||||
conBasic.ID = jtFirstType.ID;
|
||||
conBasic.JT_SYNC = true;
|
||||
updateCheckBas.Add(conBasic);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//更新
|
||||
T_SK_CHECK_CONTENTS_BASIC conBasic = new T_SK_CHECK_CONTENTS_BASIC();
|
||||
conBasic.CHECK_CONTENTS_ID = item.Key.CHECK_CONTENTS_ID;
|
||||
conBasic.LAW_ID = item.Key.LAW_ID;
|
||||
conBasic.ORG_ID = entity.ORG_ID;
|
||||
conBasic.ID = first.ID;
|
||||
conBasic.JT_SYNC = true;
|
||||
updateCheckBas.Add(conBasic);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//查隐患描述
|
||||
List<T_SK_CHECK_QUESTION> updateCheckQues = new List<T_SK_CHECK_QUESTION>();
|
||||
var checkContHids = this.GetEntities<T_SK_CHECK_QUESTION>(t => true, new BaseFilter(entity.ORG_ID));
|
||||
@ -617,26 +709,27 @@ namespace APT.SK.WebApi.Controllers
|
||||
if (hiddenList != null && hiddenList.Any())
|
||||
{
|
||||
var conIds = hiddenList.Where(m => m.CHECK_QUESTION_ID != null).Select(t => t.CHECK_QUESTION_ID).Distinct().ToList();
|
||||
//存在，不更新
|
||||
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID)).ToList();
|
||||
//if (conExsists != null && conExsists.Any())
|
||||
//{
|
||||
// foreach (var conExsist in conExsists)
|
||||
// {
|
||||
// //隐患描述
|
||||
// var first = jtCheckContHids.FirstOrDefault(t => t.ID == conExsist.ID);
|
||||
// if (first != null)
|
||||
// {
|
||||
// conExsist.ID = first.ID;
|
||||
// conExsist.ORG_ID = entity.ORG_ID;
|
||||
// conExsist.QUESTION_LEVEL = first?.QUESTION_LEVEL;
|
||||
// conExsist.DEMAND = first?.DEMAND;
|
||||
// conExsist.DESCREPTION = first?.DESCREPTION;
|
||||
// conExsist.CHECK_CONTENTS_ID = first?.CHECK_CONTENTS_ID;
|
||||
// updateCheckQues.Add(conExsist);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
//存在，更新
|
||||
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
|
||||
if (conExsists != null && conExsists.Any())
|
||||
{
|
||||
foreach (var conExsist in conExsists)
|
||||
{
|
||||
//隐患描述
|
||||
var first = jtCheckContHids.FirstOrDefault(t => t.ID == conExsist.ID);
|
||||
if (first != null)
|
||||
{
|
||||
conExsist.ID = first.ID;
|
||||
conExsist.ORG_ID = entity.ORG_ID;
|
||||
conExsist.QUESTION_LEVEL = first?.QUESTION_LEVEL;
|
||||
conExsist.DEMAND = first?.DEMAND;
|
||||
conExsist.DESCREPTION = first?.DESCREPTION;
|
||||
conExsist.CHECK_CONTENTS_ID = first?.CHECK_CONTENTS_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckQues.Add(conExsist);
|
||||
}
|
||||
}
|
||||
}
|
||||
//不存在，写入
|
||||
var conIdNews = conExsists.Select(t => t.ID).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.DESCREPTION = first?.DESCREPTION;
|
||||
conExsist.CHECK_CONTENTS_ID = first?.CHECK_CONTENTS_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckQues.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -797,6 +891,8 @@ namespace APT.SK.WebApi.Controllers
|
||||
BantchSaveEntityNoCommit(updateCheckConts);
|
||||
if (updateCheckQues != null && updateCheckQues.Any())
|
||||
BantchSaveEntityNoCommit(updateCheckQues);
|
||||
if (updateCheckBas != null && updateCheckBas.Any())
|
||||
BantchSaveEntityNoCommit(updateCheckBas);
|
||||
if (deleteBasBasicIds != null && deleteBasBasicIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC>(deleteBasBasicIds);
|
||||
if (deleteBasHiddenIds != null && deleteBasHiddenIds.Any())
|
||||
@ -1412,7 +1508,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
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);
|
||||
if (exsist != null)
|
||||
{
|
||||
@ -1431,6 +1527,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
set.ORG_ID = orgId;
|
||||
set.NAME = jtExsist?.NAME;
|
||||
set.CODE = jtExsist?.CODE;
|
||||
set.JT_SYNC = true;
|
||||
proUnitList.Add(set);
|
||||
}
|
||||
}
|
||||
@ -1445,7 +1542,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
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);
|
||||
if (exsist != null)
|
||||
{
|
||||
@ -1464,6 +1561,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
riskTypeNew.ID = id.Value;
|
||||
riskTypeNew.NAME = jtExsist?.NAME;
|
||||
riskTypeNew.PRODUCTION_UNIT_ID = jtExsist?.PRODUCTION_UNIT_ID;
|
||||
riskTypeNew.JT_SYNC = true;
|
||||
riskTypeList.Add(riskTypeNew);
|
||||
}
|
||||
}
|
||||
@ -1477,7 +1575,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
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);
|
||||
if (exsist != null)
|
||||
{
|
||||
@ -1497,6 +1595,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
libLNew.ID = id.Value;
|
||||
libLNew.NAME = jtExsist?.NAME;
|
||||
libLNew.CODE = jtExsist?.CODE;
|
||||
libLNew.JT_SYNC = true;
|
||||
libLNew.SCORE = jtExsist == null ? 0 : jtExsist.SCORE;
|
||||
libLList.Add(libLNew);
|
||||
}
|
||||
@ -1512,7 +1611,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
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);
|
||||
if (exsist != null)
|
||||
{
|
||||
@ -1532,6 +1631,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
libENew.ID = id.Value;
|
||||
libENew.NAME = jtExsist?.NAME;
|
||||
libENew.CODE = jtExsist?.CODE;
|
||||
libENew.JT_SYNC = true;
|
||||
libENew.SCORE = jtExsist == null ? 0 : jtExsist.SCORE;
|
||||
libEList.Add(libENew);
|
||||
}
|
||||
@ -1546,7 +1646,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
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);
|
||||
if (exsist != null)
|
||||
{
|
||||
@ -1567,6 +1667,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
libCNew.NAME = jtExsist?.NAME;
|
||||
libCNew.CODE = jtExsist?.CODE;
|
||||
libCNew.SCORE = jtExsist == null ? 0 : jtExsist.SCORE;
|
||||
libCNew.JT_SYNC = true;
|
||||
libCList.Add(libCNew);
|
||||
}
|
||||
}
|
||||
@ -1669,7 +1770,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
var conIds = contentList.Select(t => t.CHECK_CONTENTS_ID).ToList();
|
||||
//存在，更新
|
||||
var conExsists = checkConts.Where(t => conIds.Contains(t.ID)).ToList();
|
||||
var conExsists = checkConts.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
|
||||
if (conExsists != null && conExsists.Any())
|
||||
{
|
||||
foreach (var conExsist in conExsists)
|
||||
@ -1685,6 +1786,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.Nav_ContentsBasics = null;
|
||||
conExsist.CHECKCONTENT = first.CHECKCONTENT;
|
||||
conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckConts.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -1708,6 +1810,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.Nav_ContentsBasics = null;
|
||||
conExsist.CHECKCONTENT = first.CHECKCONTENT;
|
||||
conExsist.CHECK_STANDARD = first.CHECK_STANDARD;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckConts.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -1727,7 +1830,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
var conIds = basicList.Select(t => t.LAW_ID).Distinct().ToList();
|
||||
//存在，更新
|
||||
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID)).ToList();
|
||||
var conExsists = checkContLaws.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
|
||||
if (conExsists != null && conExsists.Any())
|
||||
{
|
||||
foreach (var conExsist in conExsists)
|
||||
@ -1736,7 +1839,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
var first = jtcheckContLaws.FirstOrDefault(t => t.ID == conExsist.ID);
|
||||
if (first != null)
|
||||
{
|
||||
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
|
||||
var firstType = checkContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID && t.JT_SYNC);
|
||||
if (firstType == null)
|
||||
{
|
||||
var jtFirstType = jtcheckContLawTypes.FirstOrDefault(t => t.ID == first.TYPE_ID);
|
||||
@ -1746,6 +1849,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
lawType.ORG_ID = orgId;
|
||||
lawType.ID = jtFirstType.ID;
|
||||
lawType.NAME = jtFirstType.NAME;
|
||||
lawType.JT_SYNC = true;
|
||||
updateCheckLawTypes.Add(lawType);
|
||||
conExsist.ID = first.ID;
|
||||
conExsist.ORG_ID = orgId;
|
||||
@ -1757,6 +1861,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = first.TYPE_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -1772,6 +1877,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = first.TYPE_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -1798,6 +1904,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
lawType.ORG_ID = orgId;
|
||||
lawType.ID = jtFirstType.ID;
|
||||
lawType.NAME = jtFirstType.NAME;
|
||||
lawType.JT_SYNC = true;
|
||||
updateCheckLawTypes.Add(lawType);
|
||||
T_LR_LAW conExsist = new T_LR_LAW();
|
||||
conExsist.ID = id.Value;
|
||||
@ -1810,6 +1917,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = jtFirstType.ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -1826,6 +1934,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.EXECUTE_TIME = first == null ? DateTime.Now : first.EXECUTE_TIME;
|
||||
conExsist.USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value;
|
||||
conExsist.TYPE_ID = first.TYPE_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckLaws.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -1837,7 +1946,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
foreach (var item in conBasics)
|
||||
{
|
||||
var first = checkContBas.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.Key.CHECK_CONTENTS_ID && t.LAW_ID == item.Key.LAW_ID);
|
||||
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)
|
||||
{
|
||||
//写入
|
||||
@ -1849,6 +1958,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conBasic.LAW_ID = item.Key.LAW_ID;
|
||||
conBasic.ORG_ID = orgId;
|
||||
conBasic.ID = jtFirstType.ID;
|
||||
conBasic.JT_SYNC = true;
|
||||
updateCheckBas.Add(conBasic);
|
||||
}
|
||||
}
|
||||
@ -1860,6 +1970,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conBasic.LAW_ID = item.Key.LAW_ID;
|
||||
conBasic.ORG_ID = orgId;
|
||||
conBasic.ID = first.ID;
|
||||
conBasic.JT_SYNC = true;
|
||||
updateCheckBas.Add(conBasic);
|
||||
}
|
||||
}
|
||||
@ -1873,7 +1984,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
{
|
||||
var conIds = hiddenList.Select(t => t.CHECK_QUESTION_ID).Distinct().ToList();
|
||||
//存在，更新
|
||||
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID)).ToList();
|
||||
var conExsists = checkContHids.Where(t => conIds.Contains(t.ID) && t.JT_SYNC).ToList();
|
||||
if (conExsists != null && conExsists.Any())
|
||||
{
|
||||
foreach (var conExsist in conExsists)
|
||||
@ -1888,6 +1999,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.DEMAND = first.DEMAND;
|
||||
conExsist.DESCREPTION = first.DESCREPTION;
|
||||
conExsist.CHECK_CONTENTS_ID = first.CHECK_CONTENTS_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckQues.Add(conExsist);
|
||||
}
|
||||
}
|
||||
@ -1910,6 +2022,7 @@ namespace APT.SK.WebApi.Controllers
|
||||
conExsist.DEMAND = first.DEMAND;
|
||||
conExsist.DESCREPTION = first.DESCREPTION;
|
||||
conExsist.CHECK_CONTENTS_ID = first.CHECK_CONTENTS_ID;
|
||||
conExsist.JT_SYNC = true;
|
||||
updateCheckQues.Add(conExsist);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user