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

优化

Browse Source
This commit is contained in:
何美荣 2025-11-19 00:49:45 +08:00
parent 064e4292cb
commit bc8ed95284
15 changed files with 136880 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135973
APT.Data.Migrations/Migrations/20251118164910_hmr2025111901.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

134
APT.Data.Migrations/Migrations/20251118164910_hmr2025111901.cs Normal file
View File

@ -0,0 +1,134 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025111901 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SK_CHECK_SET_USER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CHECK_SET_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_CHECK_SET_USER", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_CHECK_SET_USER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_CHECK_SET_USER_T_FM_USER_USER_ID",
column: x => x.USER_ID,
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_CHECK_SET_USER_T_SK_CHECK_SET_CHECK_SET_ID",
column: x => x.CHECK_SET_ID,
principalTable: "T_SK_CHECK_SET",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER_T_FM_USER_USER_ID",
column: x => x.USER_ID,
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ENTERPRISE_LIBRARY_DETAIL_CONTENT_~",
column: x => x.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID,
principalTable: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_CHECK_SET_USER_CHECK_SET_ID",
table: "T_SK_CHECK_SET_USER",
column: "CHECK_SET_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_CHECK_SET_USER_ORG_ID",
table: "T_SK_CHECK_SET_USER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_CHECK_SET_USER_USER_ID",
table: "T_SK_CHECK_SET_USER",
column: "USER_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER",
column: "ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER_ORG_ID",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER_USER_ID",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER",
column: "USER_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SK_CHECK_SET_USER");
migrationBuilder.DropTable(
name: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER");
}
}
}

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

@ -76928,6 +76928,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_CHECK_SET_CONTENTS_HIDDEN");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_CHECK_SET_USER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid>("CHECK_SET_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("USER_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("CHECK_SET_ID");
b.HasIndex("ORG_ID");
b.HasIndex("USER_ID");
b.ToTable("T_SK_CHECK_SET_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_CHECK_TYPE", b =>
{
b.Property<Guid>("ID")
@ -78502,6 +78559,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<Guid>("ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("USER_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID");
b.HasIndex("ORG_ID");
b.HasIndex("USER_ID");
b.ToTable("T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_ENTERPRISE_LIBRARY_POST", b =>
{
b.Property<Guid>("ID")
@ -124654,6 +124768,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Question");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_CHECK_SET_USER", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_CHECK_SET", "Nav_CheckSet")
.WithMany("Nav_CheckUsers")
.HasForeignKey("CHECK_SET_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_User")
.WithMany()
.HasForeignKey("USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_CheckSet");
b.Navigation("Nav_Org");
b.Navigation("Nav_User");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_CHECK_TYPE", b =>
{
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
@ -125310,6 +125450,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Post");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART", "Nav_DetailDepart")
.WithMany("Nav_DetailUsers")
.HasForeignKey("ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_User")
.WithMany()
.HasForeignKey("USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_DetailDepart");
b.Navigation("Nav_Org");
b.Navigation("Nav_User");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_ENTERPRISE_LIBRARY_POST", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_Department")
@ -135087,6 +135253,8 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_CHECK_SET", b =>
{
b.Navigation("Nav_CheckSetContents");
b.Navigation("Nav_CheckUsers");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_CHECK_SET_CONTENTS", b =>
@ -135174,6 +135342,8 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART", b =>
{
b.Navigation("Nav_DetailPosts");
b.Navigation("Nav_DetailUsers");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_ENTERPRISE_LIBRARY_POST", b =>

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

@ -13109,6 +13109,17 @@ builder.HasOne(t => t.Nav_Question).WithMany().HasForeignKey(t => t.CHECK_QUESTI
builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
builder.Property(t => t.RECTIFICATION_MEASURES).HasMaxLength(500);
}
}
#endregion
#region CheckSetUser
public partial class SKCheckSetUserMap :APTEntityBaseMap<T_SK_CHECK_SET_USER>
{
public override void Configure(EntityTypeBuilder<T_SK_CHECK_SET_USER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_CheckSet).WithMany(t=>t.Nav_CheckUsers).HasForeignKey(t => t.CHECK_SET_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region CheckType
@ -13433,6 +13444,17 @@ builder.Property(t => t.RECTIFICATION_MEASURES).HasMaxLength(500);
builder.HasOne(t => t.Nav_DetailDepart).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region EnterpriseLibraryDetailContentUser
public partial class SKEnterpriseLibraryDetailContentUserMap :APTEntityBaseMap<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>
{
public override void Configure(EntityTypeBuilder<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_DetailDepart).WithMany(t=>t.Nav_DetailUsers).HasForeignKey(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region EnterpriseLibraryPost
@ -15039,6 +15061,7 @@ builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Ignore(t => t.STATUS);
}
}
#endregion

6
APT.MS.Domain/Entities/SK/T_SK_CHECK_SET.cs
View File

@ -75,6 +75,10 @@ namespace APT.MS.Domain.Entities.SK
[Description("是否同步基础库")]
[DataFieldIngore]
public string PUBLISH { get; set; }
public string PUBLISH { get; set; }
[Description("检查人")]
[FormFieldEdit]
public ICollection<T_SK_CHECK_SET_USER> Nav_CheckUsers { get; set; }
}
}

33
APT.MS.Domain/Entities/SK/T_SK_CHECK_SET_USER.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("检查人")]
public class T_SK_CHECK_SET_USER : MesEntityBase
{
/// <summary>
/// 主表
/// </summary>
[Description("主表")]
[DataFieldForeignKey("Nav_CheckSet", "Nav_CheckUsers")]
public Guid CHECK_SET_ID { get; set; }
/// <summary>
/// 导航属性：主表
/// </summary>
[Description("导航属性：主表")]
public T_SK_CHECK_SET Nav_CheckSet { get; set; }
[Description("检查人")]
[DataFieldForeignKey("Nav_User")]
public Guid? USER_ID { get; set; }
[Description("导航属性：检查人")]
public virtual T_FM_USER Nav_User { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART.cs
View File

@ -42,7 +42,11 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("检查岗位表")]
[FormFieldEdit]
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST> Nav_DetailPosts { get; set; }
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST> Nav_DetailPosts { get; set; }
[Description("检查人员表")]
[FormFieldEdit]
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> Nav_DetailUsers { get; set; }
[Description("检查类型")]
[DataFieldForeignKey("Nav_CheckType")]

33
APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("检查人员")]
public class T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER : MesEntityBase
{
/// <summary>
/// 检查部门
/// </summary>
[Description("检查部门")]
[DataFieldForeignKey("Nav_DetailDepart", "Nav_DetailUsers")]
public Guid ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID { get; set; }
/// <summary>
/// 导航属性：检查部门
/// </summary>
[Description("导航属性：检查部门")]
public T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART Nav_DetailDepart { get; set; }
[Description("检查人员")]
[DataFieldForeignKey("Nav_User")]
public Guid? USER_ID { get; set; }
[Description("导航属性：检查人员")]
public T_FM_USER Nav_User { get; set; }
}
}

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

@ -17,7 +17,8 @@ namespace APT.MS.Domain.Entities.SK
public class T_SK_HIDDEN_DANGER_REPORT : MesEntityBase
{
[Description("检查记录汇总表")]
public Guid? SECURITY_INSPECTION_RECORD_SUMMARY_ID { get; set; }
public Guid? SECURITY_INSPECTION_RECORD_SUMMARY_ID { get; set; }
[Description("发起人")]
[DataFieldForeignKey("Nav_ApplyUser")]
public Guid? APPLY_USER_ID { get; set; }

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

@ -1,4 +1,5 @@
using APT.Infrastructure.Core;
using APT.BaseData.Domain.Enums.PF;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.BS;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums.SK;
@ -146,6 +147,8 @@ namespace APT.MS.Domain.Entities.SK
[Description("隐患原因")]
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[DataFieldIngore]
public PFStandardStatus? STATUS { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }

50
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
View File

@ -55,10 +55,13 @@ namespace APT.SK.WebApi.Controllers.Api
{
List<T_SK_CHECK_SET_CONTENTS_HIDDEN> hiddens = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
List<T_SK_CHECK_SET_CONTENTS_BASIC> basics = new List<T_SK_CHECK_SET_CONTENTS_BASIC>();
List<T_SK_CHECK_SET_USER> users = new List<T_SK_CHECK_SET_USER>();
//List<T_SK_CHECK_SET_CONTENTS_AREA> areas = new List<T_SK_CHECK_SET_CONTENTS_AREA>();
//List<T_SK_CHECK_SET_CONTENTS_AREA_RISK> risks = new List<T_SK_CHECK_SET_CONTENTS_AREA_RISK>();
var details = entity.Nav_CheckSetContents;
entity.Nav_CheckSetContents = null;
var checkUsers = entity.Nav_CheckUsers;
entity.Nav_CheckUsers = null;
List<Guid> detailIds = new List<Guid>();
//List<Guid> hiddenIds = new List<Guid>();
List<Guid> basicIds = new List<Guid>();
@ -70,6 +73,10 @@ namespace APT.SK.WebApi.Controllers.Api
{
throw new Exception("相同检查已存在，请修改检查信息或回到列表页检索");
}
if (checkUsers != null && checkUsers.Any())
{
checkUsers = checkUsers.Where(t => !t.IS_DELETED).ToList();
}
if (details != null && details.Any())
{
foreach (var item in details)
@ -119,6 +126,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
//同步到企业库
var checkUserIds = checkUsers.Select(t => t.USER_ID).Distinct().ToList();
var areaIds = details.Select(t => t.AREA_ID).Distinct().ToList();
var riskNames = details.Select(t => t.RISK_NAME).Distinct().ToList();
var measures = details.Select(t => t.MEASURES_NAME).Distinct().ToList();
@ -148,6 +156,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT> libraryDetailContList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN> libraryDetailHiddList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> libraryDetailDepList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> libraryDetailUserList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>();
//List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST> libraryDetailPostList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
@ -161,6 +170,12 @@ namespace APT.SK.WebApi.Controllers.Api
{
throw new Exception("管控措施不能为空，请排查确认");
}
var detAreaIds = details.Select(t => t.AREA_ID).Distinct().ToList();
var areaInfo = this.GetEntity<T_SK_RISK_AREA>(t => detAreaIds.Contains(t.ID) && t.PARENT_ID !=null);
if (areaInfo != null)
{
throw new Exception("入库区域只能为最小区域，当前区域"+ areaInfo.NAME + "仍有下级区域");
}
foreach (var item in details)
{
var libFirst = librarys.FirstOrDefault(t => t.RISK_NAME == item.RISK_NAME && t.AREA_ID == item.AREA_ID);
@ -205,6 +220,17 @@ namespace APT.SK.WebApi.Controllers.Api
dep.CHECK_CYCLE = entity.CHECK_CYCLE;
dep.NUM = 1;
libraryDetailDepList.Add(dep);
if (checkUserIds != null && checkUserIds.Any())
{
foreach (var userId in checkUserIds)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER user = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER();
user.ORG_ID = entity.ORG_ID;
user.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
user.USER_ID = userId;
libraryDetailUserList.Add(user);
}
}
//T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST pos = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST();
//pos.ORG_ID = entity.ORG_ID;
//pos.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
@ -244,6 +270,17 @@ namespace APT.SK.WebApi.Controllers.Api
dep.CHECK_CYCLE = entity.CHECK_CYCLE;
dep.NUM = 1;
libraryDetailDepList.Add(dep);
if (checkUserIds != null && checkUserIds.Any())
{
foreach (var userId in checkUserIds)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER user = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER();
user.ORG_ID = entity.ORG_ID;
user.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
user.USER_ID = userId;
libraryDetailUserList.Add(user);
}
}
//T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST pos = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST();
//pos.ORG_ID = entity.ORG_ID;
//pos.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
@ -265,6 +302,17 @@ namespace APT.SK.WebApi.Controllers.Api
dep.CHECK_CYCLE = entity.CHECK_CYCLE;
dep.NUM = 1;
libraryDetailDepList.Add(dep);
if (checkUserIds != null && checkUserIds.Any())
{
foreach (var userId in checkUserIds)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER user = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER();
user.ORG_ID = entity.ORG_ID;
user.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
user.USER_ID = userId;
libraryDetailUserList.Add(user);
}
}
//T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST pos = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST();
//pos.ORG_ID = entity.ORG_ID;
//pos.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
@ -351,6 +399,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS>(detailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (checkUsers != null && checkUsers.Any())
BantchSaveEntityNoCommit(checkUsers);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (hiddens != null && hiddens.Any())

28
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -134,7 +134,8 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> departIds = new List<Guid>();
List<Guid> postIds = new List<Guid>();
List<Guid> hiddenIds = new List<Guid>();
List<Guid> basicIds = new List<Guid>();
List<Guid> basicIds = new List<Guid>();
List<Guid> checkUserIds = new List<Guid>();
List<T_SK_ENTERPRISE_LIBRARY_DEPART> libraryDepart = new List<T_SK_ENTERPRISE_LIBRARY_DEPART>();
List<T_SK_ENTERPRISE_LIBRARY_POST> libraryPost = new List<T_SK_ENTERPRISE_LIBRARY_POST>();
List<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL> libraryPostList = new List<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>();
@ -143,7 +144,8 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> departList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST> postList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN> hiddenList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC> basicList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC> basicList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> checkUserList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>();
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_User").ToList();
if (departs != null && departs.Any())
{
@ -207,7 +209,8 @@ namespace APT.SK.WebApi.Controllers.Api
basicIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
hiddenIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
departIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
postIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => departIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
postIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => departIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
checkUserIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>(t => departIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details.Where(t => !t.IS_DELETED).ToList())
{
T_SK_ENTERPRISE_LIBRARY_DETAIL de = new T_SK_ENTERPRISE_LIBRARY_DETAIL();
@ -287,7 +290,18 @@ namespace APT.SK.WebApi.Controllers.Api
postList.Add(po);
}
}
if (item4.Nav_DetailUsers != null && item4.Nav_DetailUsers.Any())
{
foreach (var item5 in item4.Nav_DetailUsers.Where(t => !t.IS_DELETED).ToList())
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER po = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER();
po.ID = Guid.NewGuid();
po.ORG_ID = entity.ORG_ID;
po.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = pt.ID;
po.USER_ID = item5.USER_ID;
checkUserList.Add(po);
}
}
}
}
@ -565,7 +579,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenIds != null && hiddenIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>(hiddenIds);
if (postIds != null && postIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(postIds);
this.BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(postIds);
if (checkUserIds != null && checkUserIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>(checkUserIds);
if (departIds != null && departIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(departIds);
if (basicIds != null && basicIds.Any())
@ -600,6 +616,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (checkUserList != null && checkUserList.Any())
BantchSaveEntityNoCommit(checkUserList);
if (basicHiddenIds != null && basicHiddenIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN>(basicHiddenIds);
if (basicBasicIds != null && basicBasicIds.Any())

96
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -145,39 +145,8 @@ namespace APT.SK.WebApi.Controllers
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.RECITIFY_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0') + "-整改责任人确认", entity.ID, entity.ORG_ID, (Guid)entity.RECITIFY_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022_SHOWPRINT");
}
}
else if (entity.STATUS == PFStandardStatus.Reading)
{
if (entity.ACCEPT_RESULTE == MS.Domain.Enums.SK.SKAcceptResultEnum.No)
{
if (entity.IMPLEMENT_USER_ID != null)
{
//驳回给整改落实人
entity.STATUS = PFStandardStatus.Rejected;
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.IMPLEMENT_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-驳回", entity.ID, entity.ORG_ID, (Guid)entity.IMPLEMENT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
}
else
{
//验收人确认
if (entity.ACCEPT_USER_ID != null)
{
entity.STATUS = PFStandardStatus.Sign;
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.ACCEPT_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + departName + DateTime.Now.ToShortDateString().Replace("/", "") + ")-验收", entity.ID, entity.ORG_ID, (Guid)entity.ACCEPT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
}
}
else if (entity.STATUS == PFStandardStatus.Sign)
{
@ -280,6 +249,56 @@ namespace APT.SK.WebApi.Controllers
});
return true;
});
}
/// <summary>
/// 识别人确认
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost, Route("IdentityUpdate")]
public JsonActionResult<bool> IdentityUpdate([FromBody] T_SK_HIDDEN_DANGER_RECTIFY_RECORD entity)
{
return SafeExecute(() =>
{
T_FM_NOTIFICATION_TASK task = null;
var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(entity.ID);
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
if (entity.TaskID != Guid.Empty)
{
var currTask = GetEntity<T_FM_NOTIFICATION_TASK>(t => t.ID == entity.TaskID);
if (currTask != null)
{
userId = currTask.USER_ID;
}
}
T_FM_NOTIFICATION_TASK notice = null;
//验收人确认
if (record.ACCEPT_USER_ID != null)
{
record.STATUS = PFStandardStatus.Sign;
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == record.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == record.ACCEPT_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录"+ DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0') + "-验收", record.ID, record.ORG_ID, (Guid)record.ACCEPT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
if (entity.TaskID != Guid.Empty)
{
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK006_SHOWPRINT";
}
UnifiedCommit(() =>
{
if (record != null)
this.UpdateEntityNoCommit(record);
if (notice != null)
this.UpdateEntityNoCommit(notice);
if (task != null)
this.UpdateEntityNoCommit(task);
});
return true;
});
}
[HttpPost, Route("FullUpdateYL")]
public JsonActionResult<bool> FullUpdateYL([FromBody] T_SK_HIDDEN_DANGER_RECTIFY_RECORD entity)
@ -565,11 +584,12 @@ namespace APT.SK.WebApi.Controllers
[HttpPost, Route("FullOrderPaged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> FullOrderPaged([FromBody] KeywordPageFilter pageFilter)
{
pageFilter.IgnoreDataRule = true;
var result = new PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>();
var areaList = this.GetEntities<T_SK_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
var contentList = this.GetEntities<T_SK_CHECK_CONTENTS>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
var records = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId), "Nav_RiskArea", "Nav_Contents");
var groupRecords = records.GroupBy(m => new { m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.HIDDEN_DESCRIPTION, m.HIDDEN_LEVEL })
//var areaList = this.GetEntities<T_SK_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
//var contentList = this.GetEntities<T_SK_CHECK_CONTENTS>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
var records = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.IS_DELETED == false, pageFilter, "Nav_ProductionUnit", "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckType");
var groupRecords = records.GroupBy(m => new { m.PRODUCTION_UNIT_ID,m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.CHECK_QUESTION_ID, m.HIDDEN_LEVEL })
.Select(m => m.FirstOrDefault()).ToList();
//.Select(m => new T_SK_HIDDEN_DANGER_RECTIFY_RECORD
//{
@ -586,9 +606,9 @@ namespace APT.SK.WebApi.Controllers
{
foreach (var record in groupRecords)
{
record.QTY = records.Count(p => p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.HIDDEN_DESCRIPTION == record.HIDDEN_DESCRIPTION && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL);
record.QTY = records.Count(p => p.PRODUCTION_UNIT_ID == record.PRODUCTION_UNIT_ID && p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.CHECK_QUESTION_ID == record.CHECK_QUESTION_ID && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL);
}
var data = groupRecords.OrderBy(t => t.RISK_AREA_ID).ThenBy(m => m.CHECK_CONTENTS_ID).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.RISK_AREA_ID).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
result.Data = data;
result.TotalCount = groupRecords.Count;
}

151
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -1,19 +1,20 @@
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.IServices.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.SK;
using APT.MS.Domain.Enums;
using APT.MS.Domain.Enums.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using NPOI.SS.Formula.Functions;
using System.Threading.Tasks;
using System;
using System.Collections.Generic;
using System.Linq;
using APT.MS.Domain.Enums.SK;
using System.Linq.Expressions;
using System.Threading.Tasks;
namespace APT.SK.WebApi.Controllers.Api
{
@ -808,6 +809,144 @@ namespace APT.SK.WebApi.Controllers.Api
return result;
});
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPagedSummary")]
public PagedActionResult<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY> OrderPagedSummary([FromBody] KeywordPageFilter pageFilter)
{
pageFilter.IgnoreDataRule = true;
var result = new PagedActionResult<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>();
var report = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(t => t.IS_DELETED == false, pageFilter, "Nav_CheckType", "Nav_ProductionUnit").ToList();
var handReportConfirm = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM>(t => t.IS_DELETED == false, pageFilter, "Nav_CheckType");
if (handReportConfirm != null && handReportConfirm.Any())
{
foreach (var entity in handReportConfirm)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY re = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY();
re.ORG_ID = entity.ORG_ID;
re.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
re.ID = entity.ID;
re.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
re.CHECK_TIME = entity.CREATE_TIME;
re.APPLY_USER_ID = entity.APPLY_USER_ID;
re.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
re.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
re.MineType = entity.MineType;
re.Nav_CheckType = entity.Nav_CheckType;
report.Add(re);
}
}
result.Data = report;
result.TotalCount = result.Data.Count();
return result;
}
[HttpPost, Route("GetSummary")]
public JsonActionResult<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY> GetSummary([FromBody] KeywordFilter filter)
{
return SafeExecute(() => {
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
this.ThrowError("030017");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType","Nav_ProductionUnit",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailReasons.Nav_Reason"
});
if (result == null)
{
var confirm = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_RiskArea","Nav_ProductionUnit",
"Nav_Contents","Nav_CheckType","Nav_Question","Nav_Reasons.Nav_Reason"});
if (confirm != null)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY report = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY();
report.ID = confirm.ID;
report.APPLY_DEPARTMENT_ID = confirm.APPLY_DEPARTMENT_ID;
report.ORG_ID = confirm.ORG_ID;
report.APPLY_USER_ID = confirm.APPLY_USER_ID;
report.Nav_ApplyUser = confirm.Nav_ApplyUser;
report.Nav_ApplyDepartment = confirm.Nav_ApplyDepartment;
report.MineType = confirm.MineType;
report.CHECK_TYPE_ID = confirm.CHECK_TYPE_ID;
report.Nav_CheckType = confirm.Nav_CheckType;
report.PLANCHECKFREQUENCY = confirm.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = confirm.DEPARTMENT_TYPE;
report.CHECK_TIME = confirm.CREATE_TIME;
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL detail = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL();
detail.ID = confirm.ID;
detail.ORG_ID = confirm.ORG_ID;
detail.RISK_AREA_ID = confirm.RISK_AREA_ID;
detail.Nav_RiskArea = confirm.Nav_RiskArea;
detail.CHECK_CONTENTS_ID = confirm.CHECK_CONTENTS_ID;
detail.Nav_Contents = confirm.Nav_Contents;
detail.Nav_Question = confirm.Nav_Question;
detail.CHECKPROOF = confirm.CHECKPROOF;
detail.CHECKSTANDARD = confirm.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = confirm.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = confirm.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = confirm.HIDDEN_PLACE;
detail.SECURITY_INSPECTION_RECORD_SUMMARY_ID = report.ID;
if (confirm.Nav_Reasons != null && confirm.Nav_Reasons.Any())
{
detail.Nav_CheckRecordDetailReasons = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>();
foreach (var reson in confirm.Nav_Reasons)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON re = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON();
re.REASON_ID = reson.REASON_ID;
re.Nav_Reason = reson.Nav_Reason;
detail.Nav_CheckRecordDetailReasons.Add(re);
}
}
report.Nav_CheckRecordDetails = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>();
report.Nav_CheckRecordDetails.Add(detail);
result = report;
}
}
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())
{
var noticeDetailIds = new List<Guid>();
var noticeDetails = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>();
var reportDetails = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL>();
var records = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>();
var dangerReport = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_ID ==result.ID, "Nav_ReportDetails");
if (dangerReport != null && dangerReport.Nav_ReportDetails !=null&& dangerReport.Nav_ReportDetails.Any())
{
reportDetails = dangerReport.Nav_ReportDetails.ToList();
var notice = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(t => t.HIDDEN_DANGER_REPORT_ID == dangerReport.ID, "Nav_RectifyDetails");
if (notice != null && notice.Nav_RectifyDetails != null && notice.Nav_RectifyDetails.Any())
{
noticeDetails = notice.Nav_RectifyDetails.ToList();
noticeDetailIds = notice.Nav_RectifyDetails.Select(t => t.ID).ToList();
records = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID!=null && noticeDetailIds.Contains((Guid)t.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID),filter).ToList();
}
}
foreach (var item in result.Nav_CheckRecordDetails)
{
var hidReport = reportDetails.FirstOrDefault(t => t.RISK_AREA_ID == item.RISK_AREA_ID && t.CHECK_CONTENTS_ID == item.CHECK_CONTENTS_ID && t.CHECK_QUESTION_ID == item.CHECK_QUESTION_ID);
var refyNotice = noticeDetails.FirstOrDefault(t => t.CHECK_CONTENTS_ID == item.CHECK_CONTENTS_ID && t.RISK_AREA_ID == item.RISK_AREA_ID && t.CHECK_QUESTION_ID == item.CHECK_QUESTION_ID);
var refyRecord = records.FirstOrDefault(t =>t.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID == refyNotice?.ID && t.CHECK_CONTENTS_ID == item.CHECK_CONTENTS_ID && t.RISK_AREA_ID == item.RISK_AREA_ID && t.CHECK_QUESTION_ID == item.CHECK_QUESTION_ID);
if (refyRecord != null)
{
item.STATUS = refyRecord.STATUS;
}
if (hidReport != null && hidReport.Nav_ReportDetailReasons != null && hidReport.Nav_ReportDetailReasons.Any())
{
item.Nav_CheckRecordDetailReasons = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>();
foreach (var reson in hidReport.Nav_ReportDetailReasons)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON re = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON();
re.REASON_ID = reson.REASON_ID;
re.Nav_Reason = reson.Nav_Reason;
item.Nav_CheckRecordDetailReasons.Add(re);
}
}
}
}
return result;
});
}
}
}

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

@ -2240,6 +2240,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region CheckSetUser-检查人
/// <summary>
/// 检查人
/// </summary>
[Route("api/SK/CheckSetUser")]
public partial class CheckSetUserController : AuthorizeApiController<T_SK_CHECK_SET_USER>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_CHECK_SET_USER>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_CHECK_SET_USER>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_CHECK_SET_USER> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_CHECK_SET_USER> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_CHECK_SET_USER entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_CHECK_SET_USER> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_CHECK_SET_USER> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -4571,6 +4682,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region EnterpriseLibraryDetailContentUser-检查人员
/// <summary>
/// 检查人员
/// </summary>
[Route("api/SK/EnterpriseLibraryDetailContentUser")]
public partial class EnterpriseLibraryDetailContentUserController : AuthorizeApiController<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion