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

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

@ -14,6 +14,9 @@ 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");

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

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

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

@ -26,6 +26,9 @@ namespace APT.MS.Domain.Entities.LR
/// </summary> /// </summary>
[Description("类型名称")] [Description("类型名称")]
[DataFieldIndex(true)] [DataFieldIndex(true)]
public string NAME { get; set; } public string NAME { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
} }
} }

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

@ -69,6 +69,9 @@ namespace APT.MS.Domain.Entities.SK
/// </summary> /// </summary>
[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; }
} }
} }

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

@ -37,6 +37,9 @@ namespace APT.MS.Domain.Entities.SK
/// </summary> /// </summary>
[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; }
} }
} }

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

@ -90,6 +90,9 @@ namespace APT.MS.Domain.Entities.SK
[Description("判定标准")] [Description("判定标准")]
[DataFieldIngore] [DataFieldIngore]
[NotMapped] [NotMapped]
public string CHECK_STANDARD { get; set; } public string CHECK_STANDARD { get; set; }
[Description("是否集团数据")]
public Boolean JT_SYNC { get; set; }
} }
} }

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

@ -40,6 +40,8 @@ namespace APT.MS.Domain.Entities.SK
public Guid? PRODUCTION_UNIT_ID { get; set; } public Guid? PRODUCTION_UNIT_ID { get; set; }
[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; }
} }
} }

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

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

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

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

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

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

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

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

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

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

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,13 @@
 
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// 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
{ {
}
}

147662
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);
} }
} }

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

File diff suppressed because it is too large Load Diff