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 2025-11-19 10:56:06 +08:00
commit 942c6d2413
40 changed files with 547325 additions and 797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1789
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

File diff suppressed because it is too large Load Diff

135538
APT.Data.Migrations/Migrations/20251116050010_hmr2025111601.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

156
APT.Data.Migrations/Migrations/20251116050010_hmr2025111601.cs Normal file
View File

@ -0,0 +1,156 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025111601 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_DEPART",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_POST",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_TYPE",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_DEPART",
table: "T_SK_RISK_EVALUATION_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_POST",
table: "T_SK_RISK_EVALUATION_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_TYPE",
table: "T_SK_RISK_EVALUATION_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "DEPARTMENT_TYPE",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_DEPART",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_DEPARTMENT",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_POST",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_TYPE",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "IDENTIFY_USER",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "MEASURE",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IDENTIFY_DEPART",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_POST",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_TYPE",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_DEPART",
table: "T_SK_RISK_EVALUATION_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_POST",
table: "T_SK_RISK_EVALUATION_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_TYPE",
table: "T_SK_RISK_EVALUATION_DETAIL");
migrationBuilder.DropColumn(
name: "DEPARTMENT_TYPE",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_DEPART",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_DEPARTMENT",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_POST",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_TYPE",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
migrationBuilder.DropColumn(
name: "IDENTIFY_USER",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
migrationBuilder.DropColumn(
name: "MEASURE",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
}
}
}

135623
APT.Data.Migrations/Migrations/20251116061801_hmr2025111602.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

74
APT.Data.Migrations/Migrations/20251116061801_hmr2025111602.cs Normal file
View File

@ -0,0 +1,74 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025111602 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IDENTIFY_EVALUATION_PLAN_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
EVALUATION_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_IDENTIFY_EVALUATION_PLAN_EVALUATION", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_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_IDENTIFY_EVALUATION_PLAN_EVALUATION_T_SK_EVALUATION_EVALUATION_ID",
column: x => x.EVALUATION_ID,
principalTable: "T_SK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_T_SK_IDENTIFY_EVALUATION_PLAN_IDENTIFY_EVALUATION_PLAN_ID",
column: x => x.IDENTIFY_EVALUATION_PLAN_ID,
principalTable: "T_SK_IDENTIFY_EVALUATION_PLAN",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_EVALUATION_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
column: "EVALUATION_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_IDENTIFY_EVALUATION_PLAN_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
column: "IDENTIFY_EVALUATION_PLAN_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_ORG_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
column: "ORG_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION");
}
}
}

135803
APT.Data.Migrations/Migrations/20251118024154_hmr2025111801.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

147
APT.Data.Migrations/Migrations/20251118024154_hmr2025111801.cs Normal file
View File

@ -0,0 +1,147 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025111801 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "PLACE",
table: "T_FO_LEADER_WELL_RECORD",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.CreateTable(
name: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
LEADER_WELL_RECORD_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
AFTER_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
AFTER_USER_DEAL_STATUS = table.Column<int>(type: "int", 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_FO_LEADER_WELL_RECORD_AFTERUSER", x => x.ID);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_AFTERUSER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_AFTERUSER_T_FM_USER_AFTER_USER_ID",
column: x => x.AFTER_USER_ID,
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_AFTERUSER_T_FO_LEADER_WELL_RECORD_LEADER_WELL_RECORD_ID",
column: x => x.LEADER_WELL_RECORD_ID,
principalTable: "T_FO_LEADER_WELL_RECORD",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_FO_LEADER_WELL_RECORD_PREUSER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
LEADER_WELL_RECORD_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PRE_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
PRE_USER_DEAL_STATUS = table.Column<int>(type: "int", 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_FO_LEADER_WELL_RECORD_PREUSER", x => x.ID);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_PREUSER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_PREUSER_T_FM_USER_PRE_USER_ID",
column: x => x.PRE_USER_ID,
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_PREUSER_T_FO_LEADER_WELL_RECORD_LEADER_WELL_RECORD_ID",
column: x => x.LEADER_WELL_RECORD_ID,
principalTable: "T_FO_LEADER_WELL_RECORD",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_AFTERUSER_AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
column: "AFTER_USER_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_AFTERUSER_LEADER_WELL_RECORD_ID",
table: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
column: "LEADER_WELL_RECORD_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_AFTERUSER_ORG_ID",
table: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_PREUSER_LEADER_WELL_RECORD_ID",
table: "T_FO_LEADER_WELL_RECORD_PREUSER",
column: "LEADER_WELL_RECORD_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_PREUSER_ORG_ID",
table: "T_FO_LEADER_WELL_RECORD_PREUSER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_PREUSER_PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_PREUSER",
column: "PRE_USER_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_FO_LEADER_WELL_RECORD_AFTERUSER");
migrationBuilder.DropTable(
name: "T_FO_LEADER_WELL_RECORD_PREUSER");
migrationBuilder.DropColumn(
name: "PLACE",
table: "T_FO_LEADER_WELL_RECORD");
}
}
}

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

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

@ -35598,6 +35598,10 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<string>("PLACE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("PRODUCTION_UNIT_ID")
.HasColumnType("uniqueidentifier");
@ -35621,6 +35625,66 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_FO_LEADER_WELL_RECORD");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_AFTERUSER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<int?>("AFTER_USER_DEAL_STATUS")
.HasColumnType("int");
b.Property<Guid?>("AFTER_USER_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>("LEADER_WELL_RECORD_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("AFTER_USER_ID");
b.HasIndex("LEADER_WELL_RECORD_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_FO_LEADER_WELL_RECORD_AFTERUSER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", b =>
{
b.Property<Guid>("ID")
@ -35998,6 +36062,66 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_FO_LEADER_WELL_RECORD_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_PREUSER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.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>("LEADER_WELL_RECORD_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<int?>("PRE_USER_DEAL_STATUS")
.HasColumnType("int");
b.Property<Guid?>("PRE_USER_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("LEADER_WELL_RECORD_ID");
b.HasIndex("ORG_ID");
b.HasIndex("PRE_USER_ID");
b.ToTable("T_FO_LEADER_WELL_RECORD_PREUSER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_USER", b =>
{
b.Property<Guid>("ID")
@ -76804,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")
@ -77004,6 +77185,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<string>("DEPARTMENT_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<Guid>("DOUBLE_PREVENT_MECHANISM_ID")
.HasColumnType("uniqueidentifier");
@ -77047,12 +77232,36 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("IDENTIFY_DEPART")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_DEPARTMENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_POST")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_USER")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<int>("MARK")
.HasColumnType("int");
b.Property<string>("MEASURE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -78350,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")
@ -81371,6 +81637,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.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?>("EVALUATION_ID")
.HasColumnType("uniqueidentifier");
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<Guid>("IDENTIFY_EVALUATION_PLAN_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.HasKey("ID");
b.HasIndex("EVALUATION_ID");
b.HasIndex("IDENTIFY_EVALUATION_PLAN_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_FILE", b =>
{
b.Property<Guid>("ID")
@ -82844,10 +83167,22 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("IDENTIFY_DEPART")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_DEPARTMENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_POST")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_USER")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
@ -83444,10 +83779,22 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("IDENTIFY_DEPART")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_DEPARTMENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_POST")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_USER")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
@ -108778,6 +109125,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_ProductionUnit");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_AFTERUSER", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_AfterUser")
.WithMany()
.HasForeignKey("AFTER_USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
.WithMany("Nav_AfterUsers")
.HasForeignKey("LEADER_WELL_RECORD_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_AfterUser");
b.Navigation("Nav_Org");
b.Navigation("Nav_Record");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
@ -108935,6 +109308,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Record");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_PREUSER", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
.WithMany("Nav_PreUsers")
.HasForeignKey("LEADER_WELL_RECORD_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_PreUser")
.WithMany()
.HasForeignKey("PRE_USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Org");
b.Navigation("Nav_PreUser");
b.Navigation("Nav_Record");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_USER", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
@ -124369,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")
@ -125025,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")
@ -126254,6 +126705,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_User");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_EVALUATION", "Nav_Evaluation")
.WithMany()
.HasForeignKey("EVALUATION_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", "Nav_Plan")
.WithMany("Nav_Evaluations")
.HasForeignKey("IDENTIFY_EVALUATION_PLAN_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Evaluation");
b.Navigation("Nav_Org");
b.Navigation("Nav_Plan");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_FILE", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", "Nav_Plan")
@ -133434,10 +133911,14 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", b =>
{
b.Navigation("Nav_AfterUsers");
b.Navigation("Nav_Details");
b.Navigation("Nav_Files");
b.Navigation("Nav_PreUsers");
b.Navigation("Nav_Users");
});
@ -134772,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 =>
@ -134859,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 =>
@ -134955,6 +135440,8 @@ namespace APT.Data.Migrations.Migrations
{
b.Navigation("Nav_Details");
b.Navigation("Nav_Evaluations");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");

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

@ -1720,6 +1720,18 @@ builder.HasOne(t => t.Nav_Company).WithMany().HasForeignKey(t => t.COMPANY_ID).O
builder.HasOne(t => t.Nav_ProductionUnit).WithMany().HasForeignKey(t => t.PRODUCTION_UNIT_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Class).WithMany().HasForeignKey(t => t.CLASS_ID).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.PUBLISH);
builder.Property(t => t.PLACE).HasMaxLength(50);
}
}
#endregion
#region LeaderWellRecordAfteruser
public partial class FOLeaderWellRecordAfteruserMap :APTEntityBaseMap<T_FO_LEADER_WELL_RECORD_AFTERUSER>
{
public override void Configure(EntityTypeBuilder<T_FO_LEADER_WELL_RECORD_AFTERUSER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Record).WithMany(t=>t.Nav_AfterUsers).HasForeignKey(t => t.LEADER_WELL_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_AfterUser).WithMany().HasForeignKey(t => t.AFTER_USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
@ -1792,6 +1804,17 @@ builder.HasOne(t => t.Nav_PreUser).WithMany().HasForeignKey(t => t.PRE_USER_ID).
builder.HasOne(t => t.Nav_Record).WithMany(t=>t.Nav_Files).HasForeignKey(t => t.LEADER_WELL_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region LeaderWellRecordPreuser
public partial class FOLeaderWellRecordPreuserMap :APTEntityBaseMap<T_FO_LEADER_WELL_RECORD_PREUSER>
{
public override void Configure(EntityTypeBuilder<T_FO_LEADER_WELL_RECORD_PREUSER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Record).WithMany(t=>t.Nav_PreUsers).HasForeignKey(t => t.LEADER_WELL_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_PreUser).WithMany().HasForeignKey(t => t.PRE_USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region LeaderWellRecordUser
@ -13086,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
@ -13141,6 +13175,13 @@ builder.HasOne(t => t.Nav_RiskName).WithMany().HasForeignKey(t => t.RISK_NAME_ID
builder.HasOne(t => t.Nav_SCOREL).WithMany().HasForeignKey(t => t.SCOREL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_SCOREE).WithMany().HasForeignKey(t => t.SCOREE_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_SCOREC).WithMany().HasForeignKey(t => t.SCOREC_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.MEASURE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPART).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_POST).HasMaxLength(500);
builder.Property(t => t.DEPARTMENT_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPARTMENT).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_USER).HasMaxLength(500);
}
}
#endregion
@ -13339,6 +13380,7 @@ builder.Property(t => t.CHECK_CONTENT).HasMaxLength(500);
builder.Property(t => t.CHECK_BASIC).HasMaxLength(500);
builder.Property(t => t.CHECK_STANDARD).HasMaxLength(500);
builder.Ignore(t => t.MineType);
builder.Ignore(t => t.PRODUCTION_UNIT_ID);
builder.Ignore(t => t.AREA_ID);
builder.Ignore(t => t.AREA_NAME);
builder.Ignore(t => t.Nav_Area);
@ -13402,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
@ -13983,6 +14036,17 @@ builder.Ignore(t => t.USERS);
builder.HasOne(t => t.Nav_PlanDetail).WithMany(t=>t.Nav_DetailUsers).HasForeignKey(t => t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region IdentifyEvaluationPlanEvaluation
public partial class SKIdentifyEvaluationPlanEvaluationMap :APTEntityBaseMap<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION>
{
public override void Configure(EntityTypeBuilder<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Plan).WithMany(t=>t.Nav_Evaluations).HasForeignKey(t => t.IDENTIFY_EVALUATION_PLAN_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Evaluation).WithMany().HasForeignKey(t => t.EVALUATION_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region IdentifyEvaluationPlanFile
@ -14285,6 +14349,9 @@ builder.Property(t => t.RISK_DESCRIPTION).HasMaxLength(500);
builder.HasOne(t => t.Nav_Type).WithMany().HasForeignKey(t => t.TYPE_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.MEASURE).HasMaxLength(500);
builder.Property(t => t.EMERGENCY).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPART).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_POST).HasMaxLength(500);
builder.Property(t => t.DEPARTMENT_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPARTMENT).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_USER).HasMaxLength(500);
@ -14395,6 +14462,9 @@ builder.Property(t => t.RISK_DESCRIPTION).HasMaxLength(500);
builder.HasOne(t => t.Nav_Type).WithMany().HasForeignKey(t => t.TYPE_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.MEASURE).HasMaxLength(500);
builder.Property(t => t.EMERGENCY).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPART).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_POST).HasMaxLength(500);
builder.Property(t => t.DEPARTMENT_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPARTMENT).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_USER).HasMaxLength(500);
@ -14991,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

13
APT.MS.Domain/Entities/FO/T_FO_LEADER_WELL_RECORD.cs
View File

@ -86,5 +86,18 @@ namespace APT.MS.Domain.Entities.FO
[Description("提交并通知")]
[DataFieldIngore]
public string PUBLISH { get; set; }
[Description("交接地点")]
[FormFieldEdit]
[DataFieldLength(50)]
public string PLACE { get; set; }
[Description("导航属性：交班人")]
[FormFieldEdit]
public ICollection<T_FO_LEADER_WELL_RECORD_PREUSER> Nav_PreUsers { get; set; }
[Description("导航属性：接班人")]
[FormFieldEdit]
public ICollection<T_FO_LEADER_WELL_RECORD_AFTERUSER> Nav_AfterUsers { get; set; }
}
}

33
APT.MS.Domain/Entities/FO/T_FO_LEADER_WELL_RECORD_AFTERUSER.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Enums;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("接班人")]
public class T_FO_LEADER_WELL_RECORD_AFTERUSER : MesEntityBase
{
[Description("主表ID")]
[DataFieldForeignKey("Nav_Record", "Nav_AfterUsers")]
public Guid LEADER_WELL_RECORD_ID { get; set; }
[Description("导航属性：主表")]
public virtual T_FO_LEADER_WELL_RECORD Nav_Record { get; set; }
[Description("接班人")]
[DataFieldForeignKey("Nav_AfterUser")]
[FormFieldEdit]
public Guid? AFTER_USER_ID { get; set; }
[Description("导航属性：接班人")]
public T_FM_USER Nav_AfterUser { get; set; }
[EnumName("FOUserShiftStatusEnum")] //为枚举（0待处理 1已处理）
public FOUserShiftStatusEnum? AFTER_USER_DEAL_STATUS { get; set; }
}
}

33
APT.MS.Domain/Entities/FO/T_FO_LEADER_WELL_RECORD_PREUSER.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Enums;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("交班人")]
public class T_FO_LEADER_WELL_RECORD_PREUSER : MesEntityBase
{
[Description("主表ID")]
[DataFieldForeignKey("Nav_Record", "Nav_PreUsers")]
public Guid LEADER_WELL_RECORD_ID { get; set; }
[Description("导航属性：主表")]
public virtual T_FO_LEADER_WELL_RECORD Nav_Record { get; set; }
[Description("交班人")]
[DataFieldForeignKey("Nav_PreUser")]
[FormFieldEdit]
public Guid? PRE_USER_ID { get; set; }
[Description("导航属性：交班人")]
public T_FM_USER Nav_PreUser { get; set; }
[Description("处理状态")]
[EnumName("FOUserShiftStatusEnum")] //为枚举（0待处理 1已处理）
public FOUserShiftStatusEnum? PRE_USER_DEAL_STATUS { get; set; }
}
}

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

19
APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs
View File

@ -160,6 +160,23 @@ namespace APT.MS.Domain.Entities.SK
[Description("企业库ID")]
public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
[Description("管控措施")]
public string MEASURE { get; set; }
[Description("辨识层级")]
public string IDENTIFY_TYPE { get; set; }
[Description("辨识部门")]
public string IDENTIFY_DEPART { get; set; }
[Description("辨识岗位")]
public string IDENTIFY_POST { get; set; }
[Description("管控层级")]
public string DEPARTMENT_TYPE { get; set; }
[Description("管控部门")]
public string IDENTIFY_DEPARTMENT { get; set; }
[Description("管控责任人")]
public string IDENTIFY_USER { get; set; }
}
}

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

@ -79,7 +79,10 @@ namespace APT.MS.Domain.Entities.SK
/// 生产单元
/// </summary>
[DataFieldIngore]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[DataFieldIngore]
public Guid? PRODUCTION_UNIT_ID { get; set; }
/// <summary>
/// 辨识区域
/// </summary>

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_IDENTIFY_EVALUATION_PLAN.cs
View File

@ -87,6 +87,9 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyPostName { get; set; }
[Description("导航：辨识要求表")]
public virtual ICollection<T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE> Nav_Requires { get; set; }
public virtual ICollection<T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE> Nav_Requires { get; set; }
[Description("导航：评价要求表")]
public virtual ICollection<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION> Nav_Evaluations { get; set; }
}
}

32
APT.MS.Domain/Entities/SK/T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION.cs Normal file
View File

@ -0,0 +1,32 @@
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_IDENTIFY_EVALUATION_PLAN_EVALUATION : MesEntityBase
{
/// <summary>
/// 辨识评估计划
/// </summary>
[Description("辨识评估计划")]
[DataFieldForeignKey("Nav_Plan", "Nav_Evaluations")]
public Guid IDENTIFY_EVALUATION_PLAN_ID { get; set; }
/// <summary>
/// 导航：辨识评估计划
/// </summary>
[Description("导航：辨识评估计划")]
public virtual T_SK_IDENTIFY_EVALUATION_PLAN Nav_Plan { get; set; }
[Description("评价要求")]
[DataFieldForeignKey("Nav_Evaluation")]
public Guid? EVALUATION_ID { get; set; }
[Description("导航属性：评价要求")]
public virtual T_SK_EVALUATION Nav_Evaluation { get; set; }
}
}

12
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs
View File

@ -111,13 +111,21 @@ namespace APT.MS.Domain.Entities.SK
[Description("管控措施")]
public string MEASURE { get; set; }
[Description("应急处置")]
public string EMERGENCY { get; set; }
public string EMERGENCY { get; set; }
[Description("辨识层级")]
public string IDENTIFY_TYPE { get; set; }
[Description("辨识部门")]
public string IDENTIFY_DEPART { get; set; }
[Description("辨识岗位")]
public string IDENTIFY_POST { get; set; }
[Description("管控层级")]
public string DEPARTMENT_TYPE { get; set; }
[Description("管控部门")]
public string IDENTIFY_DEPARTMENT { get; set; }
[Description("管控责任人")]
public string IDENTIFY_USER { get; set; }
public string IDENTIFY_USER { get; set; }
[Description("风险名称")]
[DataFieldForeignKey("Nav_RiskName")]

10
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs
View File

@ -112,7 +112,15 @@ namespace APT.MS.Domain.Entities.SK
[Description("管控措施")]
public string MEASURE { get; set; }
[Description("应急处置")]
public string EMERGENCY { get; set; }
public string EMERGENCY { get; set; }
[Description("辨识层级")]
public string IDENTIFY_TYPE { get; set; }
[Description("辨识部门")]
public string IDENTIFY_DEPART { get; set; }
[Description("辨识岗位")]
public string IDENTIFY_POST { get; set; }
[Description("管控层级")]
public string DEPARTMENT_TYPE { get; set; }
[Description("管控部门")]

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

2
APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
View File

@ -507,7 +507,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (!string.IsNullOrEmpty(id))
{
var entity = this.GetEntity<T_FM_DEPARTMENT>(id, false, "Nav_SafeUser", "Nav_DepartmentUser", "Nav_Parent", "Nav_ChargeUser",
var entity = this.GetEntity<T_FM_DEPARTMENT>(id, false, "Nav_SafeUser", "Nav_DepartmentUser", "Nav_Parent", "Nav_ChargeUser", "Nav_Unit",
"Nav_SafeUser.Nav_User", "Nav_DepartmentUser.Nav_User", "Nav_DepartmentUser.Nav_User.Nav_ApproveRole", "Nav_User", "Nav_Person", "Nav_Person.Nav_Post", "Nav_ProdutionUnit.Nav_Enums");
if (entity != null)
{

2
APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs
View File

@ -38,7 +38,7 @@ namespace APT.FO.WebApi.Controllers
"Nav_Files.Nav_ImgFile.Nav_File");
if (entity != null)
{
var details = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL>(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File", "Nav_User", "Nav_PreUser", "Nav_AfterUser", "Nav_DetailAreas.Nav_Area").ToList();
var details = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL>(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File", "Nav_User", "Nav_PreUsers.Nav_PreUser", "Nav_AfterUsers.Nav_AfterUser", "Nav_DetailAreas.Nav_Area").ToList();
entity.Nav_Details = details.OrderByDescending(t => t.START_DATE).ToList();
}
return entity;

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

@ -6791,6 +6791,117 @@ namespace APT.FO.WebApi.Controllers.Api
}
}
#endregion
#region LeaderWellRecordAfteruser-接班人
/// <summary>
/// 接班人
/// </summary>
[Route("api/FO/LeaderWellRecordAfteruser")]
public partial class LeaderWellRecordAfteruserController : AuthorizeApiController<T_FO_LEADER_WELL_RECORD_AFTERUSER>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_AFTERUSER>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_AFTERUSER>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_FO_LEADER_WELL_RECORD_AFTERUSER> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_FO_LEADER_WELL_RECORD_AFTERUSER> 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_FO_LEADER_WELL_RECORD_AFTERUSER entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_FO_LEADER_WELL_RECORD_AFTERUSER> 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_FO_LEADER_WELL_RECORD_AFTERUSER> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion
@ -7457,6 +7568,117 @@ namespace APT.FO.WebApi.Controllers.Api
}
}
#endregion
#region LeaderWellRecordPreuser-交班人
/// <summary>
/// 交班人
/// </summary>
[Route("api/FO/LeaderWellRecordPreuser")]
public partial class LeaderWellRecordPreuserController : AuthorizeApiController<T_FO_LEADER_WELL_RECORD_PREUSER>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_PREUSER>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_PREUSER>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_FO_LEADER_WELL_RECORD_PREUSER> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_FO_LEADER_WELL_RECORD_PREUSER> 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_FO_LEADER_WELL_RECORD_PREUSER entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_FO_LEADER_WELL_RECORD_PREUSER> 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_FO_LEADER_WELL_RECORD_PREUSER> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion

9
APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs
View File

@ -91,10 +91,9 @@ namespace APT.FO.WebApi.Controllers
{
entity.FORM_STATUS = (int)FOTeamActivityState.草稿;
var persons = entity.Nav_Person;
var deleteIds = new List<Guid>();
var deleteIds = this.GetEntities<T_FO_TECH_DISCLOSURE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == entity.ID,new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
if (persons != null && persons.Any())
{
deleteIds = persons.Where(t => t.IS_DELETED).Select(m => m.ID).ToList();
persons = persons.Where(t => !t.IS_DELETED && t.USER_ID != null).ToList();
}
entity.Nav_Person = null;
@ -384,7 +383,9 @@ namespace APT.FO.WebApi.Controllers
}
this.UnifiedCommit(() =>
{
{
if (deleteIds != null && deleteIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_TECH_DISCLOSURE_PERSON>(deleteIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (persons != null && persons.Any())
@ -403,8 +404,6 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(flowList);
if (measureList != null && measureList.Any())
this.BantchSaveEntityNoCommit(measureList);
if (deleteIds != null && deleteIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_TECH_DISCLOSURE_PERSON>(deleteIds);
});
return true;
});

346
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -6,6 +6,7 @@ using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.IServices;
using APT.BaseData.Domain.IServices.FM;
using APT.Infrastructure.Core;
using APT.MS.Data.Mapping;
using APT.MS.Domain.Entities.BS;
using APT.MS.Domain.Entities.LR;
using APT.MS.Domain.Entities.SC.PT;
@ -22,6 +23,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyModel;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.Web.CodeGeneration.Utils;
using MySqlX.XDevAPI.Common;
using NPOI.HSSF.UserModel;
using NPOI.POIFS.FileSystem;
@ -592,7 +594,7 @@ namespace APT.PP.WebApi.Controllers.Api
baseFilter.SelectField = new string[] { "ID", "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON",
"Nav_CheckNoticeDetails.RISK_AREA_ID","Nav_CheckNoticeDetails.CHECK_CONTENTS_ID","Nav_CheckNoticeDetails.CHECKCONTENT","Nav_CheckNoticeDetails.CHECKPROOF","Nav_CheckNoticeDetails.CHECKSTANDARD",
"Nav_CheckNoticeFiles.IMG_FILE_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.USER_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.LAW_ID" }; //指定字段，包括导航属性
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CHECK_TIME != null && i.CHECK_TIME.Value.Date == DateTime.Now.Date && i.CHECK_TIME.Value.Hour == dtNow.Hour;
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CHECK_TIME != null && i.CHECK_TIME.Value.Date == DateTime.Now.Date && i.CHECK_TIME.Value.Hour == dtNow.Hour && i.STATUS != 0;
List<T_SK_SECURITY_INSPECTION_NOTICE> notices = this.GetOrderEntities(expression, baseFilter).ToList();
var noticeExsisIds = notices.Select(t => t.ID).ToList();
baseFilter.SelectField = new string[] { "ID", "SECURITY_INSPECTION_NOTICE_ID" }; //指定字段，包括导航属性
@ -1124,14 +1126,14 @@ namespace APT.PP.WebApi.Controllers.Api
var i = 1;
foreach (var ite in measuresTemp)
{
var temp2 = i + "、" + ite;
var temp2 = i + "、" + ite +"；";
if (i == 1)
{
ideDetail.MEASURE = temp2;
}
else
{
ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2;
ideDetail.MEASURE = ideDetail.MEASURE + temp2;
}
i++;
}
@ -1209,11 +1211,12 @@ namespace APT.PP.WebApi.Controllers.Api
var week = dtNow.DayOfWeek;
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
List<T_SK_RISK_IDENTIFY> identitys = new List<T_SK_RISK_IDENTIFY>();
List<T_SK_RISK_IDENTIFY_FILE> files = new List<T_SK_RISK_IDENTIFY_FILE>();
List<T_SK_RISK_IDENTIFY_DETAIL> details = new List<T_SK_RISK_IDENTIFY_DETAIL>();
List<T_SK_RISK_IDENTIFY_DETAIL> details = new List<T_SK_RISK_IDENTIFY_DETAIL>();
List<T_SK_RISK_IDENTIFY_REQUIRE> requires = new List<T_SK_RISK_IDENTIFY_REQUIRE>();
//List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE> mesList = new List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>();
filter.IgnoreDataRule = true;
Expression<Func<T_SK_IDENTIFY_EVALUATION_PLAN, bool>> expression = t => t.IS_DELETED == false && t.ISSEND == false && t.START_DATE.Value.Date == dtNow.Date && t.STATUS == PFStandardStatus.Archived;
List<T_SK_IDENTIFY_EVALUATION_PLAN> plans = this.GetOrderEntities(expression, filter, new string[] { "Nav_Details.Nav_DetailUsers" }).ToList();
List<T_SK_IDENTIFY_EVALUATION_PLAN> plans = this.GetOrderEntities(expression, filter, new string[] { "Nav_Details.Nav_DetailUsers", "Nav_Requires" }).ToList();
//var plans = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.ISSEND == false && t.START_DATE.Value.Date == dtNow.Date && t.STATUS == PFStandardStatus.Archived, new BaseFilter(filter.OrgId), "Nav_Details.Nav_DetailUsers");
if (plans != null && plans.Any())
{
@ -1340,6 +1343,17 @@ namespace APT.PP.WebApi.Controllers.Api
ide.END_DATE = plan.END_DATE;
ide.REQUIRE_ID = requre?.ID;
identitys.Add(ide);
if (plan != null && plan.Nav_Requires != null && plan.Nav_Requires.Any())
{
foreach (var itemReq in plan.Nav_Requires)
{
T_SK_RISK_IDENTIFY_REQUIRE re = new T_SK_RISK_IDENTIFY_REQUIRE();
re.ORG_ID = itemReq.ORG_ID;
re.RISK_IDENTIFY_ID = ide.ID;
re.REQUIRE_ID = itemReq.REQUIRE_ID;
requires.Add(re);
}
}
if (user.Nav_Person != null)
{
var postDetailIds = libraryPostDetails.Where(t => t.POST_ID == user.Nav_Person.POST_ID).Select(m => m.ENTERPRISE_LIBRARY_POST_ID).Distinct().ToList();
@ -1367,42 +1381,17 @@ namespace APT.PP.WebApi.Controllers.Api
var detailList = detailss.Where(t => t.ENTERPRISE_LIBRARY_ID == library.ID).OrderBy(t => t.NUM).ToList();
if (detailList.Any())
{
var measuresTemp = detailList.Select(t => t.MEASURES_NAME).Distinct().ToList();
if (measuresTemp.Any())
foreach (var detais in detailList)
{
if (measuresTemp.Count == 1)
{
ideDetail.MEASURE = measuresTemp.FirstOrDefault();
}
else
{
var i = 1;
foreach (var ite in measuresTemp)
{
var temp2 = i + "、" + ite;
if (i == 1)
{
ideDetail.MEASURE = temp2;
}
else
{
ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2;
}
i++;
}
}
//T_SK_RISK_IDENTIFY_DETAIL_MEASURE mes = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE();
//mes.ORG_ID = library.ORG_ID;
//mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID;
//mes.NUM = detais.NUM;
//mes.MEASURE = detais.MEASURES_NAME;
//mesList.Add(mes);
var temp = (detais.NUM == null || detais.NUM == 0) ? "1" : detais.NUM + "、" + detais.MEASURES_NAME +"；";
ideDetail.MEASURE = ideDetail.MEASURE + temp;
}
//var emergencysTemp = detailList.Select(t => t.EMERGENCY).Distinct().ToList();
//if (emergencysTemp.Any())
//{
// var i = 1;
// foreach (var ite in emergencysTemp)
// {
// var temp2 = i == 1 ? i + "、" + ite + "；" : i + "、" + ite + "；";
// ideDetail.EMERGENCY = ideDetail.EMERGENCY + temp2;
// i++;
// }
//}
}
details.Add(ideDetail);
}
@ -1432,11 +1421,13 @@ namespace APT.PP.WebApi.Controllers.Api
if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices);
if (identitys != null && identitys.Any())
BantchSaveEntityNoCommit(identitys);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
BantchSaveEntityNoCommit(identitys);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
BantchSaveEntityNoCommit(details);
//if (mesList != null && mesList.Any())
// BantchSaveEntityNoCommit(mesList);
});
}
catch (Exception ex)
@ -1469,10 +1460,11 @@ namespace APT.PP.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
List<T_FM_NOTIFICATION_TASK> tasks = new List<T_FM_NOTIFICATION_TASK>();
//List<T_SK_IDENTIFY_EVALUATION_PLAN> plans = new List<T_SK_IDENTIFY_EVALUATION_PLAN>();
List<T_SK_RISK_IDENTIFY> identitys = new List<T_SK_RISK_IDENTIFY>();
List<T_SK_RISK_IDENTIFY_RESULT> results = new List<T_SK_RISK_IDENTIFY_RESULT>();
List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> resultDetails = new List<T_SK_RISK_IDENTIFY_RESULT_DETAIL>();
List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> resultDetails = new List<T_SK_RISK_IDENTIFY_RESULT_DETAIL>();
List<T_SK_RISK_IDENTIFY_RESULT_REQUIRE> resultRequires = new List<T_SK_RISK_IDENTIFY_RESULT_REQUIRE>();
//List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE> resultDetailMes = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>();
var requre = this.GetEntity<T_SK_REQUEST>(t => !t.IS_DELETED);
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(filter.OrgId), "Nav_ApproveRole", "Nav_Person");
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
@ -1481,7 +1473,7 @@ namespace APT.PP.WebApi.Controllers.Api
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "ID" }; //指定字段，包括导航属性
Expression<Func<T_SK_IDENTIFY_EVALUATION_PLAN, bool>> expression = i => i.END_DATE.Value.Date == DateTime.Now.Date && i.STATUS == PFStandardStatus.Archived;
List<T_SK_IDENTIFY_EVALUATION_PLAN> planTemps = this.GetOrderEntities(expression, baseFilter).ToList();
List<T_SK_IDENTIFY_EVALUATION_PLAN> planTemps = this.GetOrderEntities(expression, baseFilter, "Nav_Requires").ToList();
var planIds = planTemps.Select(t => t.ID).ToList();
var newFilter = new BaseFilter(filter.GetOrgId());
newFilter.IgnoreDataRule = true;
@ -1496,14 +1488,18 @@ namespace APT.PP.WebApi.Controllers.Api
var identityIds = identitys.Select(i => i.ID).ToList();
tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => identityIds.Contains((Guid)t.SOURCE_DATA_ID) && t.NOTICE_STATUS == 0, new BaseFilter(filter.OrgId)).ToList();
var identityTempIds = identityTemps.Select(t => t.ID).ToList();
var details = GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(i => identityTempIds.Contains(i.RISK_IDENTIFY_ID), new BaseFilter(filter.OrgId)).ToList();
if (planIds != null && planIds.Any() && dtNow.Hour <= 20)//&& dtNow.Hour >= 16
var details = GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(i => identityTempIds.Contains(i.RISK_IDENTIFY_ID), new BaseFilter(filter.OrgId)).ToList();
var identityDetailIds = details.Select(t => t.ID).ToList();
var identityDetailMes = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(i => identityDetailIds.Contains(i.RISK_IDENTIFY_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
var libIds = details.Select(t => t.ENTERPRISE_LIBRARY_ID).ToList();
var libPosts = GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(i => libIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
var libPostIds = libPosts.Select(t => t.ID).ToList();
var libPostDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>(i => libPostIds.Contains(i.ENTERPRISE_LIBRARY_POST_ID), new BaseFilter(filter.OrgId)).ToList();
if (planIds != null && planIds.Any())//&& dtNow.Hour >= 16 && dtNow.Hour <= 20
{
//plans.ForEach(t => t.STATUS = PFStandardStatus.Close);
identitys.ForEach(m => m.STATUS = PFStandardStatus.Close);
identitys.ForEach(m => m.END_DATE = DateTime.Now);
tasks.ForEach(t => t.NOTICE_STATUS = 4);
tasks.ForEach(t => t.SOURCE_FORMCODE = "SK033_SHOWPRINT");
identitys.ForEach(m => { m.STATUS = PFStandardStatus.Close; m.END_DATE = DateTime.Now; });
tasks.ForEach(t => { t.NOTICE_STATUS = 4; t.SOURCE_FORMCODE = "SK033_SHOWPRINT"; });
foreach (var plan in planIds)
{
var ides = identityTemps.Where(t => t.IDENTIFY_EVALUATION_PLAN_ID == plan).ToList();
@ -1551,21 +1547,29 @@ namespace APT.PP.WebApi.Controllers.Api
result.START_DATE = DateTime.Now;
result.END_DATE = DateTime.Now;
result.REQUIRE_ID = requre?.ID;
results.Add(result);
results.Add(result);
var planTemp = planTemps.FirstOrDefault(t => t.ID == plan);
if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any())
{
foreach (var itemReq in planTemp.Nav_Requires)
{
T_SK_RISK_IDENTIFY_RESULT_REQUIRE re = new T_SK_RISK_IDENTIFY_RESULT_REQUIRE();
re.ORG_ID = itemReq.ORG_ID;
re.RISK_IDENTIFY_RESULT_ID = result.ID;
re.REQUIRE_ID = itemReq.REQUIRE_ID;
resultRequires.Add(re);
}
}
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
@ -1574,9 +1578,46 @@ namespace APT.PP.WebApi.Controllers.Api
ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.MEASURE = item.MEASURE;
ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//ideDetail.MEASURE = item.MEASURE;
//ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//汇总去重
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//管控措施
var identifyDetailIds = temp.Select(t => t.ID).ToList();
var mesTemps = identityDetailMes.Where(t => identifyDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID)).OrderBy(n=>n.NUM).Select(m=>m.MEASURE).Distinct().ToList();
if (mesTemps != null && mesTemps.Any())
{
var i = 1;
foreach (var mm in mesTemps)
{
//T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE mes = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE();
//mes.ORG_ID = filter.OrgId;
//mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
//mes.NUM = i;
//mes.MEASURE = mm;
//resultDetailMes.Add(mes);
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
}
//应急处置
var emergeTemps = temp.OrderBy(t => t.NUM).Select(m => m.EMERGENCY).Distinct().ToList();
if (emergeTemps != null && emergeTemps.Any())
{
var i = 1;
foreach (var mm in emergeTemps)
{
var mtemp = i + "、" + mm +"；";
ideDetail.EMERGENCY = ideDetail.EMERGENCY + mtemp;
i++;
}
}
//辨识部门
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
if (departIdss.Any())
{
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).Select(m => m.DEPARTMENT_TYPE).Distinct().ToList();
@ -1612,23 +1653,10 @@ namespace APT.PP.WebApi.Controllers.Api
var tempPosts = string.Join("；", postTemps);
var temp4 = i == 1 ? i + "、" + tempPosts + "；" : i + "、" + tempPosts + "；";
ideDetail.IDENTIFY_POST = ideDetail.IDENTIFY_POST + temp4;
//ideDetail.IDENTIFY_POST = string.Join(";", postTemps);
}
i++;
}
//ideDetail.IDENTIFY_DEPARTMENT = string.Join(";", departTemps);
}
//if (postTemps.Any())
//{
// var i = 1;
// foreach (var ite in postTemps)
// {
// var temp2 = i == 1 ? i + "、" + ite + "；" : i + "、" + ite + "；";
// ideDetail.IDENTIFY_POST = ideDetail.IDENTIFY_POST + temp2;
// i++;
// }
// //ideDetail.IDENTIFY_POST = string.Join(";", postTemps);
//}
}
resultDetails.Add(ideDetail);
}
@ -1692,23 +1720,31 @@ namespace APT.PP.WebApi.Controllers.Api
result.START_DATE = DateTime.Now;
result.END_DATE = DateTime.Now;
result.REQUIRE_ID = requre?.ID;
results.Add(result);
results.Add(result);
var planTemp = planTemps.FirstOrDefault(t => t.ID == plan);
if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any())
{
foreach (var itemReq in planTemp.Nav_Requires)
{
T_SK_RISK_IDENTIFY_RESULT_REQUIRE re = new T_SK_RISK_IDENTIFY_RESULT_REQUIRE();
re.ORG_ID = itemReq.ORG_ID;
re.RISK_IDENTIFY_RESULT_ID = result.ID;
re.REQUIRE_ID = itemReq.REQUIRE_ID;
resultRequires.Add(re);
}
}
//只汇总部门级所有人的明细
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
@ -1717,10 +1753,46 @@ namespace APT.PP.WebApi.Controllers.Api
ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.MEASURE = item.MEASURE;
ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//ideDetail.DEPARTMENT_TYPE = "岗位级";
//ideDetail.MEASURE = item.MEASURE;
//ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//汇总去重
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//管控措施
var identifyDetailIds = temp.Select(t => t.ID).ToList();
var mesTemps = identityDetailMes.Where(t => identifyDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID)).OrderBy(n => n.NUM).Select(m => m.MEASURE).Distinct().ToList();
if (mesTemps != null && mesTemps.Any())
{
var i = 1;
foreach (var mm in mesTemps)
{
//T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE mes = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE();
//mes.ORG_ID = filter.OrgId;
//mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
//mes.NUM = i;
//mes.MEASURE = mm;
//resultDetailMes.Add(mes);
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
}
//应急处置
var emergeTemps = temp.OrderBy(t => t.NUM).Select(m => m.EMERGENCY).Distinct().ToList();
if (emergeTemps != null && emergeTemps.Any())
{
var i = 1;
foreach (var mm in emergeTemps)
{
var mtemp = i + "、" + mm + "；";
ideDetail.EMERGENCY = ideDetail.EMERGENCY + mtemp;
i++;
}
}
//辨识部门
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
if (departIdss.Any())
{
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).Select(m => m.DEPARTMENT_TYPE).Distinct().ToList();
@ -1746,7 +1818,7 @@ namespace APT.PP.WebApi.Controllers.Api
ideDetail.DEPARTMENT_TYPE = ideDetail.DEPARTMENT_TYPE + temp2;
var deTemps = departs.Where(t => departIdss.Contains(t.ID) && t.DEPARTMENT_TYPE == ite).Select(m => m.NAME).ToList();
var deTempIds = departs.Where(t => departIdss.Contains(t.ID) && t.DEPARTMENT_TYPE == ite).Select(m => m.ID).ToList();
var temp3 = i == 1 ? i + "、" + string.Join(",", deTemps) + "；" : i + "、" + string.Join(",", deTemps) + "；";
var temp3 = i == 1 ? i + "、" + string.Join(",", deTemps) + "；" : i + "、" + string.Join(",", deTemps) + "；" ;
ideDetail.IDENTIFY_DEPARTMENT = ideDetail.IDENTIFY_DEPARTMENT + temp3;
var postIdss = users.Where(t => t.DEPARTMENT_ID != null && deTempIds.Contains((Guid)t.DEPARTMENT_ID) && userIdss.Contains(t.ID) && t.Nav_Person != null).ToList();
var postIds = postIdss.Where(t => t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person.POST_ID).ToList();
@ -1756,23 +1828,10 @@ namespace APT.PP.WebApi.Controllers.Api
var tempPosts = string.Join("；", postTemps);
var temp4 = i == 1 ? i + "、" + tempPosts + "；" : i + "、" + tempPosts + "；";
ideDetail.IDENTIFY_POST = ideDetail.IDENTIFY_POST + temp4;
//ideDetail.IDENTIFY_POST = string.Join(";", postTemps);
}
i++;
}
//ideDetail.IDENTIFY_DEPARTMENT = string.Join(";", departTemps);
}
//if (postTemps.Any())
//{
// var i = 1;
// foreach (var ite in postTemps)
// {
// var temp2 = i == 1 ? i + "、" + ite + "；" : i + "、" + ite + "；";
// ideDetail.IDENTIFY_POST = ideDetail.IDENTIFY_POST + temp2;
// i++;
// }
// //ideDetail.IDENTIFY_POST = string.Join(";", postTemps);
//}
}
resultDetails.Add(ideDetail);
}
@ -1865,22 +1924,30 @@ namespace APT.PP.WebApi.Controllers.Api
result.START_DATE = DateTime.Now;
result.END_DATE = DateTime.Now;
result.REQUIRE_ID = requre?.ID;
results.Add(result);
results.Add(result);
var planTemp = planTemps.FirstOrDefault(t => t.ID == plan);
if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any())
{
foreach (var itemReq in planTemp.Nav_Requires)
{
T_SK_RISK_IDENTIFY_RESULT_REQUIRE re = new T_SK_RISK_IDENTIFY_RESULT_REQUIRE();
re.ORG_ID = itemReq.ORG_ID;
re.RISK_IDENTIFY_RESULT_ID = result.ID;
re.REQUIRE_ID = itemReq.REQUIRE_ID;
resultRequires.Add(re);
}
}
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de || classIds.Contains((Guid)m.APPLY_DEPARTMENT_ID)).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_NAME_ID == item.RISK_NAME_ID && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.MineType;
ideDetail.AREA_ID = item.AREA_ID;
@ -1889,10 +1956,46 @@ namespace APT.PP.WebApi.Controllers.Api
ideDetail.RISK_NAME_ID = item.RISK_NAME_ID;
ideDetail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
ideDetail.TYPE_ID = item.TYPE_ID;
ideDetail.MEASURE = item.MEASURE;
ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//ideDetail.DEPARTMENT_TYPE = "岗位级";
//ideDetail.MEASURE = item.MEASURE;
//ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
//汇总去重
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
//管控措施
var identifyDetailIds = temp.Select(t => t.ID).ToList();
var mesTemps = identityDetailMes.Where(t => identifyDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID)).OrderBy(n => n.NUM).Select(m => m.MEASURE).Distinct().ToList();
if (mesTemps != null && mesTemps.Any())
{
var i = 1;
foreach (var mm in mesTemps)
{
//T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE mes = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE();
//mes.ORG_ID = filter.OrgId;
//mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
//mes.NUM = i;
//mes.MEASURE = mm;
//resultDetailMes.Add(mes);
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
}
//应急处置
var emergeTemps = temp.OrderBy(t => t.NUM).Select(m => m.EMERGENCY).Distinct().ToList();
if (emergeTemps != null && emergeTemps.Any())
{
var i = 1;
foreach (var mm in emergeTemps)
{
var mtemp = i + "、" + mm + "；";
ideDetail.EMERGENCY = ideDetail.EMERGENCY + mtemp;
i++;
}
}
//辨识部门
var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
var departIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = identityTemps.Where(t => identifyIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
if (departIdss.Any())
{
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).Select(m => m.DEPARTMENT_TYPE).Distinct().ToList();
@ -1928,21 +2031,10 @@ namespace APT.PP.WebApi.Controllers.Api
var tempPosts = string.Join("；", postTemps);
var temp4 = i == 1 ? i + "、" + tempPosts + "；" : i + "、" + tempPosts + "；";
ideDetail.IDENTIFY_POST = ideDetail.IDENTIFY_POST + temp4;
//ideDetail.IDENTIFY_POST = string.Join(";", postTemps);
}
i++;
}
}
//if (postTemps.Any())
//{
// var i = 1;
// foreach (var ite in postTemps)
// {
// var temp2 = i == 1 ? i + "、" + ite + "；" : i + "、" + ite + "；";
// ideDetail.IDENTIFY_POST = ideDetail.IDENTIFY_POST + temp2;
// i++;
// }
//}
}
resultDetails.Add(ideDetail);
}
@ -1966,8 +2058,6 @@ namespace APT.PP.WebApi.Controllers.Api
}
UnifiedCommit(() =>
{
//if (plans != null && plans.Any())
// BantchSaveEntityNoCommit(plans);
if (identitys != null && identitys.Any())
BantchSaveEntityNoCommit(identitys);
if (tasks != null && tasks.Any())
@ -1977,7 +2067,11 @@ namespace APT.PP.WebApi.Controllers.Api
if (results != null && results.Any())
BantchSaveEntityNoCommit(results);
if (resultDetails != null && resultDetails.Any())
BantchSaveEntityNoCommit(resultDetails);
BantchSaveEntityNoCommit(resultDetails);
if (resultRequires != null && resultRequires.Any())
BantchSaveEntityNoCommit(resultRequires);
//if (resultDetailMes != null && resultDetailMes.Any())
// BantchSaveEntityNoCommit(resultDetailMes);
});
}
catch (Exception ex)

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

@ -36,10 +36,23 @@ namespace APT.SK.WebApi.Controllers
return SafeExecute<bool>(() =>
{
var details = entity.Nav_Details;
entity.Nav_Details = null;
entity.Nav_Details = null;
if (details != null && details.Any())
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
var deleteBasDetailIds = this.GetEntities<T_SK_BASIC_LIBRARY_DETAIL>(t =>t.BASIC_LIBRARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
var deleteBasConttentIds = this.GetEntities<T_SK_BASIC_LIBRARY_DETAIL_CONTENT>(t => deleteBasDetailIds.Contains(t.BASIC_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
var deleteBasBasicIds = this.GetEntities<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC>(t => deleteBasConttentIds.Contains(t.BASIC_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
var deleteBasHiddenIds=this.GetEntities< T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN >(t=> deleteBasConttentIds.Contains(t.BASIC_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
List<T_SK_BASIC_LIBRARY_DETAIL_CONTENT> contentList = new List<T_SK_BASIC_LIBRARY_DETAIL_CONTENT>();
List<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN> hiddenList = new List<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN>();
List<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC> basicList = new List<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC>();
var numIsNull = details.FirstOrDefault(t => t.NUM == null || t.NUM == 0);
if (numIsNull != null)
{
throw new Exception("管控措施的顺序必须填写");
}
if (details != null && details.Any())
{
foreach (var item in details)
@ -195,6 +208,14 @@ namespace APT.SK.WebApi.Controllers
}
this.UnifiedCommit(() =>
{
if (deleteBasBasicIds != null && deleteBasBasicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_BASIC>(deleteBasBasicIds);
if (deleteBasHiddenIds != null && deleteBasHiddenIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN>(deleteBasHiddenIds);
if (deleteBasConttentIds != null && deleteBasConttentIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL_CONTENT>(deleteBasConttentIds);
if (deleteBasDetailIds != null && deleteBasDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_BASIC_LIBRARY_DETAIL>(deleteBasDetailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
@ -539,7 +560,7 @@ namespace APT.SK.WebApi.Controllers
}
}
}
result.Nav_Details = details.ToList();
result.Nav_Details = details.OrderBy(t => t.NUM).ToList();
}
return result;
});

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())

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

@ -110,10 +110,22 @@ namespace APT.SK.WebApi.Controllers.Api
{
var details = entity.Nav_Details;
entity.Nav_Details = null;
if (details != null && details.Any())
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
var departs = entity.Nav_Departs;
entity.Nav_Departs = null;
entity.Nav_Departs = null;
if (departs != null && departs.Any())
{
departs = departs.Where(t => !t.IS_DELETED).ToList();
}
var posts = entity.Nav_Posts;
entity.Nav_Posts = null;
entity.Nav_Posts = null;
if (posts != null && posts.Any())
{
posts = posts.Where(t => !t.IS_DELETED).ToList();
}
List<Guid> libraryDepartIds = new List<Guid>();
List<Guid> libraryPostIds = new List<Guid>();
List<Guid> libraryPostDetailIds = new List<Guid>();
@ -122,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>();
@ -131,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())
{
@ -184,13 +198,19 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
if (details != null && details.Any())
{
{
var numIsNull = details.FirstOrDefault(t => t.NUM == null || t.NUM == 0);
if (numIsNull != null)
{
throw new Exception("管控措施的顺序必须填写");
}
detailIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => t.ENTERPRISE_LIBRARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
contentIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
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();
@ -270,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);
}
}
}
}
@ -548,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())
@ -583,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())
@ -1088,14 +1123,15 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
var checkList = new JsonActionResult<List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>>();
var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_DetailContent.Nav_LibraryDetail.Nav_Library", "Nav_CheckType").ToList();
var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_DetailContent.Nav_LibraryDetail.Nav_Library.Nav_ProductionUnit", "Nav_CheckType").ToList();
if (detailContents != null && detailContents.Any())
{
foreach (var item in detailContents)
{
item.MineType = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.MineType;
item.PRODUCTION_UNIT_ID = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.PRODUCTION_UNIT_ID;
item.MINE_NAME = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.Nav_ProductionUnit.NAME;
}
checkList.Data = detailContents.GroupBy(t => new { t.MineType, t.CHECK_TYPE_ID, t.CHECK_CYCLE, t.CHECK_TYPE }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.CHECK_TYPE).ThenBy(y => y.CHECK_TYPE_ID).ToList();
checkList.Data = detailContents.GroupBy(t => new { t.PRODUCTION_UNIT_ID,t.MINE_NAME, t.CHECK_TYPE_ID, t.CHECK_CYCLE, t.CHECK_TYPE }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.CHECK_TYPE).ThenBy(y => y.CHECK_TYPE_ID).ToList();
checkList.TotalCount = checkList.Data.Count;
}
return checkList;
@ -1123,11 +1159,11 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item in detailContents)
{
item.MineType = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.MineType;
item.PRODUCTION_UNIT_ID = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.PRODUCTION_UNIT_ID;
}
if (!string.IsNullOrEmpty(filter.Keyword))
{
detailContents = detailContents.Where(t => t.MineType == (SKProductionUnit)int.Parse(filter.Keyword)).ToList();
detailContents = detailContents.Where(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Keyword)).ToList();
}
if (!string.IsNullOrEmpty(filter.Parameter1))
{
@ -1147,7 +1183,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item in contentList)
{
item.MineType = item.Nav_LibraryDetail.Nav_Library.MineType;
item.PRODUCTION_UNIT_ID = item.Nav_LibraryDetail.Nav_Library.PRODUCTION_UNIT_ID;
item.AREA_NAME = item.Nav_LibraryDetail.Nav_Library.AREA_NAME;
item.AREA_ID = item.Nav_LibraryDetail.Nav_Library.AREA_ID;
item.Nav_Contents = item.Nav_Contents;
@ -1167,7 +1203,7 @@ namespace APT.SK.WebApi.Controllers.Api
item2.POST_NAME = userPosts.FirstOrDefault(t => t.ID == item.POST_ID)?.NAME;
var tempIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Nav_DetailDepart.DEPARTMENT_ID).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var contentTemps = contentList.Where(t => tempIds.Contains(t.ID)).ToList();
item2.Nav_ContentDatas = contentTemps.GroupBy(t => new { t.MineType, t.AREA_NAME, t.Nav_Contents?.CHECKCONTENT }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.AREA_NAME).ToList();
item2.Nav_ContentDatas = contentTemps.GroupBy(t => new { t.PRODUCTION_UNIT_ID, t.AREA_NAME, t.Nav_Contents?.CHECKCONTENT }).Select(m => m.FirstOrDefault()).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.AREA_NAME).ToList();
checkTempList.Add(item2);
}
checkList.Data = checkTempList;
@ -2292,8 +2328,8 @@ namespace APT.SK.WebApi.Controllers.Api
}
return checkList;
}
[HttpPost, Route("GetCheckListNew")]
public JsonActionResult<List<CheckListNew>> GetCheckListNew([FromBody] KeywordFilter filter)
[HttpPost, Route("GetCheckListNewX")]
public JsonActionResult<List<CheckListNew>> GetCheckListNewX([FromBody] KeywordFilter filter)
{
var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
@ -2494,6 +2530,191 @@ namespace APT.SK.WebApi.Controllers.Api
checkList.TotalCount = checkList.Data.Count;
}
return checkList;
}
[HttpPost, Route("GetCheckListNew")]
public JsonActionResult<List<CheckListNew>> GetCheckListNew([FromBody] KeywordFilter filter)
{
var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
List<Guid> selectMinetype = new List<Guid>();
var users = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Person" ,"Nav_ProdutionUnit").ToList();
var userInfoTemp = users.FirstOrDefault(t => t.ID == loginUser);
if (userInfoTemp != null && userInfoTemp.Nav_ProdutionUnit != null && userInfoTemp.Nav_ProdutionUnit.Any())
{
selectMinetype = userInfoTemp.Nav_ProdutionUnit.Where(m=>m.PRODUCTION_UNIT_ID!=null).Select(t => (Guid)t.PRODUCTION_UNIT_ID).Distinct().ToList();
}
//List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
//DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
var checkList = new JsonActionResult<List<CheckListNew>>();
List<CheckListNew> list = new List<CheckListNew>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> conDepartlist = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
//企业库
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED && t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_ProductionUnit").ToList();
var libIds = librarys.Select(t => t.ID).ToList();
//管控层级
var libraryDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => !t.IS_DELETED && libIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
//管控措施
var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => !t.IS_DELETED && libIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
var libDetailIds = libraryDetails.Select(t => t.ID).ToList();
//检查内容
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED && libDetailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
var libContentIds = contents.Select(t => t.ID).ToList();
//检查层级
var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED && libContentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
//隐患描述
//var contentHiddens = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
//辨识岗位
var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => !t.IS_DELETED && libIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId), "Nav_PostDetails.Nav_Post").ToList();
//岗位排查
var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME == "岗位排查", new BaseFilter(filter.OrgId)).Select(x => x.ID).ToList();
//检查清单（生产单元+检查层级+检查类型+检查周期+检查部门：取辨识部门+检查对象：取辨识岗位）
if (contentDeparts != null && contentDeparts.Any())
{
foreach (var item in contentDeparts)
{
var conFirst = contents.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID);
var detailFirst = libraryDetails.FirstOrDefault(t => t.ID == conFirst?.ENTERPRISE_LIBRARY_DETAIL_ID);
var libFirst = librarys.FirstOrDefault(t => t.ID == detailFirst?.ENTERPRISE_LIBRARY_ID);
if (item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID))
{
var postFirst = posts.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == libFirst?.ID && t.DEPARTMENT_ID == item.DEPARTMENT_ID);
if (postFirst != null && postFirst.Nav_PostDetails != null && postFirst.Nav_PostDetails.Any())
{
foreach (var item2 in postFirst.Nav_PostDetails)
{
//去除有审批角色的人
var userCharge = users.FirstOrDefault(t => t.Nav_Person != null && t.Nav_Person.POST_ID == item2.POST_ID && t.APPROVE_ROLE_ID != null);
if (userCharge == null)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.MineType = libFirst != null ? libFirst.MineType : SKProductionUnit.All;
de.PRODUCTION_UNIT_ID = libFirst?.PRODUCTION_UNIT_ID;
de.MINE_NAME = libFirst?.Nav_ProductionUnit?.NAME;
de.AREA_NAME = libFirst?.Nav_Area?.NAME;
de.CHECK_TYPE_ID = item.CHECK_TYPE_ID;
de.TYPE_NAME = item.Nav_CheckType?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = item.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
de.CHECK_CYCLE = item.CHECK_CYCLE;
de.CHECK_TYPE = item.CHECK_TYPE;
de.DEPARTMENT_ID = item.DEPARTMENT_ID;
de.DEPART_NAME = item.Nav_Department?.NAME;
de.POST_ID = item2.POST_ID;
de.POST_NAME = item2.Nav_Post?.NAME;
conDepartlist.Add(de);
}
}
}
}
else
{
var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (userInfo == null)
{
var depart = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID);
if (depart != null && depart.USER_ID != null)
{
userInfo = users.FirstOrDefault(t => t.ID == depart.USER_ID);
}
}
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.MineType = libFirst != null ? libFirst.MineType : SKProductionUnit.All;
de.PRODUCTION_UNIT_ID = libFirst?.PRODUCTION_UNIT_ID;
de.MINE_NAME = libFirst?.Nav_ProductionUnit?.NAME;
de.AREA_NAME = libFirst?.Nav_Area?.NAME;
de.CHECK_TYPE_ID = item.CHECK_TYPE_ID;
de.TYPE_NAME = item.Nav_CheckType?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = item.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
de.CHECK_CYCLE = item.CHECK_CYCLE;
de.CHECK_TYPE = item.CHECK_TYPE;
de.DEPARTMENT_ID = item.DEPARTMENT_ID;
de.DEPART_NAME = item.Nav_Department?.NAME;
de.POST_ID = userInfo?.Nav_Person?.POST_ID;
de.POST_NAME = userInfo?.Nav_ApproveRole?.NAME;
conDepartlist.Add(de);
}
}
}
if (conDepartlist != null && conDepartlist.Any())
{
foreach (var item in conDepartlist)
{
if (checkTypeIds != null && checkTypeIds.Any() && item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID))
{
}
else
{
if (item.CHECK_TYPE == SKDepartmentTypeEnum.班组级)
{
item.POST_NAME = "班组负责人";
}
else if (item.CHECK_TYPE == SKDepartmentTypeEnum.车间级)
{
item.POST_NAME = "车间安全员";
}
else if (item.CHECK_TYPE == SKDepartmentTypeEnum.部门级)
{
item.POST_NAME = "部门安全员";
}
else
{
item.POST_NAME = "安环部安全员";
}
}
}
var group = conDepartlist.GroupBy(t => new { t.PRODUCTION_UNIT_ID,t.MINE_NAME, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME }).ToList();
foreach (var item in group)
{
CheckListNew listNew = new CheckListNew();
listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
listNew.MineType = item.Key.MINE_NAME;
listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
listNew.Num = (int)item.Key.CHECK_TYPE;
listNew.CheckDepart = item.Key.DEPART_NAME;
listNew.CheckPost = item.Key.POST_NAME;
var depathaveIds = conDepartlist.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && t.POST_NAME == item.Key.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList();
var temps = contents.Where(t => depathaveIds.Contains(t.ID)).Distinct().ToList();
if (temps.Any())
{
List<CheckListDetail> listDetail = new List<CheckListDetail>();
foreach (var tem in temps)
{
var detailFirst = libraryDetails.FirstOrDefault(t => t.ID == tem.ENTERPRISE_LIBRARY_DETAIL_ID);
var libFirst = librarys.FirstOrDefault(t => t.ID == detailFirst?.ENTERPRISE_LIBRARY_ID);
CheckListDetail checkListDetail = new CheckListDetail();
checkListDetail.CHECK_CONTENTS_ID = tem.CHECK_CONTENTS_ID;
checkListDetail.CHECK_CONTENTS_NAME = tem.Nav_Contents?.CHECKCONTENT;
checkListDetail.RISK_NAME = libFirst?.RISK_NAME;
checkListDetail.RISK_AREA_ID = libFirst?.AREA_ID;
checkListDetail.RISK_AREA_NAME = libFirst?.Nav_Area?.NAME;
checkListDetail.CHECKPROOF = tem.CHECK_BASIC;
checkListDetail.CHECKSTANDARD = tem.CHECK_STANDARD;
listDetail.Add(checkListDetail);
}
listNew.details = listDetail.GroupBy(n => new { n.RISK_AREA_ID, n.RISK_NAME, n.CHECK_CONTENTS_ID }).Select(g => g.FirstOrDefault()).OrderBy(t => t.RISK_AREA_NAME).ThenBy(m => m.RISK_NAME).ToList();
}
list.Add(listNew);
}
if (userInfoTemp != null && userInfoTemp.NAME.Contains("管理员"))
{
checkList.Data = list.OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
}
else
{
checkList.Data = list.Where(t => t.PRODUCTION_UNIT_ID != null && selectMinetype.Contains((Guid)t.PRODUCTION_UNIT_ID)).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
}
checkList.TotalCount = checkList.Data.Count;
}
return checkList;
}
}
}

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

17
APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs
View File

@ -52,6 +52,8 @@ namespace APT.SK.WebApi.Controllers.Api
entity.Nav_Files = null;
var requires = entity.Nav_Requires;
entity.Nav_Requires = null;
var evaluations = entity.Nav_Evaluations;
entity.Nav_Evaluations = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
if (entity.START_DATE.Value.Date < DateTime.Now.Date)
@ -110,6 +112,15 @@ namespace APT.SK.WebApi.Controllers.Api
item.Nav_Require = null;
}
}
if (evaluations != null && evaluations.Any())
{
foreach (var item in evaluations)
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
item.Nav_Evaluation = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
@ -142,6 +153,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (evaluations != null && evaluations.Any())
BantchSaveEntityNoCommit(evaluations);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
}, null, null, null, null, null, "SK031_SHOWPRINT", null, "安全风险辨识与评估计划审批");
@ -162,6 +175,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires);
if (evaluations != null && evaluations.Any())
BantchSaveEntityNoCommit(evaluations);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
});
@ -184,7 +199,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment",
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require","Nav_Evaluations.Nav_Evaluation"});
if (result != null)
{
var details = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(t => t.IDENTIFY_EVALUATION_PLAN_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Department");

15
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -65,15 +65,6 @@ namespace APT.SK.WebApi.Controllers.Api
{
deleteDetailIds = record.Nav_Details.Select(t => t.ID).ToList();
deleteMeasureIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
//record.Nav_Details.ForEach(t =>
//{
// if (t.Nav_DetailMeasures != null && t.Nav_DetailMeasures.Any())
// {
// var tempIds = t.Nav_DetailMeasures.Select(m => m.ID).ToList();
// deleteMeasureIds.AddRange(tempIds);
// }
// deleteDetailIds.Add(t.ID);
//});
foreach (var item in details)
{
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.MEASURE == item.MEASURE
@ -96,7 +87,9 @@ namespace APT.SK.WebApi.Controllers.Api
{
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_DETAIL_ID = item.ID;
measureList.Add(item2);
measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine;
item.MEASURE = item.MEASURE + temp;
}
}
item.Nav_DetailMeasures = null;
@ -224,7 +217,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{

556
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -16,10 +16,12 @@ using APT.Utility;
using Castle.Core.Internal;
using InfluxData.Net.InfluxDb.Models.Responses;
using Microsoft.AspNetCore.Mvc;
using MySqlX.XDevAPI.Common;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
@ -84,6 +86,30 @@ namespace APT.SK.WebApi.Controllers.Api
/// </summary>
[Description("是否按时")]
public bool? ISINTTIME { get; set; }
}
//全流程可视化（检查通知-检查记录-检查汇总-隐患上报-整改通知-整改记录）
public class OperateLog
{
[Description("表单名称")]
public string FORM_NAME { get; set; }
[Description("流程节点")]
public List<OperateLogList> logList { get; set; }
}
public class OperateLogList {
[Description("待办名称")]
public string NAME { get; set; }
[Description("待办人")]
public string USER_NAME { get; set; }
[Description("处理时间")]
public DateTime? DEAL_DATE { get; set; }
[Description("处理时间")]
public DateTime? CREATE_TIME { get; set; }
[Description("处理状态")]
public int STATUS { get; set; }
}
/// <summary>
/// 安全检查通知
@ -1000,7 +1026,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
approveDetails = GetEntities<T_PF_APPROVE_DETAIL>(e => approveIds.Contains(e.APPROVE_ID), null, null).ToList();
}
var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ToList();
var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.TASK_DT).ToList();
List<OperateLogDto> resultCheck1 = new List<OperateLogDto>();//检查任务
List<OperateLogDto> resultCheck2 = new List<OperateLogDto>();//检查记录
List<OperateLogDto> resultCheck3 = new List<OperateLogDto>();//检查记录汇总
@ -1568,19 +1594,25 @@ namespace APT.SK.WebApi.Controllers.Api
var dataList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
if (entity.PRODUCTION_UNIT_ID == null || entity.CHECK_TYPE_ID == null || entity.DEPARTMENT_TYPE == null || entity.PLANCHECKFREQUENCY == null)
{
throw new Exception("生产单元,检查层级,检查类型,检查周期都不能为空");
result.ErrorMessage = "生产单元,检查层级,检查类型,检查周期都不能为空";
return result;
//throw new Exception("生产单元,检查层级,检查类型,检查周期都不能为空");
}
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var postId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.Nav_Person != null, "Nav_Person")?.Nav_Person?.POST_ID;
if (postId == null)
{
throw new Exception("发起人岗位未配置，请到用户列表确认岗位");
result.ErrorMessage = "发起人岗位未配置，请到用户列表确认岗位";
return result;
//throw new Exception("发起人岗位未配置，请到用户列表确认岗位");
}
var checkSet = this.GetEntity<T_SK_CHECK_SET>(t => t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_CYCLE == entity.PLANCHECKFREQUENCY && t.CHECK_TYPE == entity.DEPARTMENT_TYPE && t.DEPARTMENT_ID == Guid.Parse(departId.ToString()) && t.POST_ID == postId);
if (checkSet == null)
{
throw new Exception("未找到对应的检查清单，请手动添加检查内容");
result.ErrorMessage = "未找到对应的检查清单，请手动添加检查内容";
return result;
//throw new Exception("未找到对应的检查清单，请手动添加检查内容");
}
var details = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => t.CHECK_SET_ID == checkSet.ID, new BaseFilter(entity.ORG_ID), "Nav_Area", "Nav_Contents", "Nav_ContentsBasics");
if (details != null && details.Any())
@ -1614,6 +1646,522 @@ namespace APT.SK.WebApi.Controllers.Api
result.Data = dataList;
}
return result;
}
[HttpPost, Route("OperateLogView")]
public JsonActionResult<List<OperateLog>> OperateLogView([FromBody] KeywordFilter filter)
{
return SafeExecute<List<OperateLog>>(() =>
{
var result = new List<OperateLog>();
if (string.IsNullOrEmpty(filter.Keyword))
{
return result;
}
else
{
Guid? safeNoticeId = null;
List<Guid> safeRecordIds = new List<Guid>();
Guid? safeRecordSumId = null;
Guid? dangerReportId = null;
Guid? rectifyNoticeId = null;
List<Guid> hidRectifyRecordIds = new List<Guid>();
Guid Keyword = new Guid(filter.Keyword);
var check = GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(Keyword);
if (check == null)
{
return result;
}
else
{
//ID
var sourceIds = new List<Guid>();
safeNoticeId = check.ID;
sourceIds.Add(check.ID);
T_SK_HIDDEN_DANGER_REPORT dangerReport = null;
var recordIds = GetEntities<T_SK_SECURITY_INSPECTION_RECORD>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID,new BaseFilter(check.ORG_ID)).Select(m=>m.ID).ToList();
sourceIds.AddRange(recordIds);
safeRecordIds.AddRange(recordIds);
var recordSum= GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID);
if (recordSum != null)
{
safeRecordSumId = recordSum.ID;
sourceIds.Add(recordSum.ID);
dangerReport = GetEntity<T_SK_HIDDEN_DANGER_REPORT>(e => e.SECURITY_INSPECTION_RECORD_SUMMARY_ID != null && e.SECURITY_INSPECTION_RECORD_SUMMARY_ID == recordSum.ID);
if (dangerReport != null)
{
dangerReportId = dangerReport.ID;
sourceIds.Add(dangerReport.ID);
var rectifyNotice = GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID);
if (rectifyNotice != null)
{
rectifyNoticeId = rectifyNotice.ID;
sourceIds.Add(rectifyNotice.ID);
var rectifyRecordIds = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(e => e.HIDDEN_DANGER_RECTIFY_NOTICE_ID != null && e.HIDDEN_DANGER_RECTIFY_NOTICE_ID == rectifyNotice.ID,new BaseFilter(dangerReport.ORG_ID)).Select(m => m.ID).ToList();
rectifyRecordIds.AddRange(rectifyRecordIds);
sourceIds.AddRange(rectifyRecordIds);
}
else
{
var rectifyRecordIds = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID,new BaseFilter(dangerReport.ORG_ID)).Select(m=>m.ID).ToList();
sourceIds.AddRange(rectifyRecordIds);
rectifyRecordIds.AddRange(rectifyRecordIds);
}
}
}
var approveIds = new List<Guid>();
var approves = new List<T_PF_APPROVE>();
if (sourceIds != null && sourceIds.Any())
{
approves = GetEntities<T_PF_APPROVE>(e => sourceIds.Contains(e.DATA_ID), null, null).ToList();
approveIds = approves.Select(m => m.ID).ToList();
}
var approveDetails = new List<T_PF_APPROVE_DETAIL>();
if (approveIds != null && approveIds.Any())
{
approveDetails = GetEntities<T_PF_APPROVE_DETAIL>(e => approveIds.Contains(e.APPROVE_ID), new BaseFilter(check.ORG_ID), null).ToList();
}
var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList();
var users = GetEntities<T_FM_USER>(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList();
var checkUser = users.FirstOrDefault(t => t.ID == check.APPLY_USER_ID);
var departs = GetEntities<T_FM_DEPARTMENT>(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList();
List<string>formCodes=new List<string> { "SK006","SK014","SK018","SK022"};
var approveTemps = GetEntities<T_PF_APPROVE_TEMP>(e => formCodes.Contains(e.FORM_CODE), new BaseFilter(check.ORG_ID), "Nav_ApproveTempDetails.Nav_ApproveRole").ToList();
#region 安全检查通知
OperateLog noticeLog = new OperateLog();
noticeLog.FORM_NAME = "安全检查通知";
noticeLog.logList = new List<OperateLogList>();
if (safeNoticeId != null)
{
//发起
var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == safeNoticeId && !t.NOTICE_TITLE.Contains("确认"));
if (temp1 != null)
{
OperateLogList start = new OperateLogList();
start.USER_NAME = temp1.USER_NAME;
start.NAME = "安全检查通知";
start.DEAL_DATE = temp1.TASK_DT;
start.CREATE_TIME = temp1.CREATE_TIME;
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
noticeLog.logList.Add(start);
}
else
{
OperateLogList start = new OperateLogList();
start.USER_NAME = checkUser.NAME;
start.NAME = "安全检查通知";
start.DEAL_DATE = check.MODIFY_TIME;
start.CREATE_TIME = check.CREATE_TIME;
start.STATUS = 10;
noticeLog.logList.Add(start);
}
//审批
var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == safeNoticeId);
if (approveTemp == null)
{
//判断发起人层级，取审批模板
var departFirst = departs.FirstOrDefault(t => t.ID == check.APPLY_DEPARTMENT_ID);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE);
if (departFirst.DEPARTMENT_STATUS != 1)
{
param = "公司级";
}
var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK006");
if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any())
{
foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t=>t.NUM))
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.Nav_ApproveRole.NAME;
start1.NAME = "安全检查通知审批";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
noticeLog.logList.Add(start1);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "审批人";
start1.NAME = "安全检查通知审批";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
noticeLog.logList.Add(start1);
}
}
else
{
var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp?.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList();
if (tempApprove != null && tempApprove.Any())
{
foreach (var item in tempApprove)
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.USER_NAME;
start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "安全检查通知已被驳回" : item.SOURCE_FORMCODE == "PF119" ? "安全检查通知审批" : item.NOTICE_TITLE.Contains("确认") ? "安全检查通知确认" : "安全检查通知";
start1.DEAL_DATE = item.TASK_DT;
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
noticeLog.logList.Add(start1);
}
}
}
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeNoticeId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList();
if (temp2 != null && temp2.Any())
{
foreach (var item in temp2)
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.USER_NAME;
start1.NAME = "安全检查通知确认";
start1.DEAL_DATE = item.TASK_DT;
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
noticeLog.logList.Add(start1);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "检查人";
start1.NAME = "安全检查通知确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
noticeLog.logList.Add(start1);
}
}
result.Add(noticeLog);
#endregion
#region 安全检查记录
OperateLog recordLog = new OperateLog();
recordLog.FORM_NAME = "安全检查记录";
recordLog.logList = new List<OperateLogList>();
if (safeRecordIds != null && safeRecordIds.Any())
{
//发起
var itemps = tasks.Where(t => t.SOURCE_DATA_ID!=null && safeRecordIds.Contains((Guid)t.SOURCE_DATA_ID)).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList();
if (itemps != null && itemps.Any())
{
foreach (var temp1 in itemps)
{
OperateLogList start = new OperateLogList();
start.USER_NAME = temp1.USER_NAME;
start.NAME = "安全检查记录";
start.DEAL_DATE = temp1.TASK_DT;
start.CREATE_TIME = temp1.CREATE_TIME;
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
recordLog.logList.Add(start);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "检查人";
start1.NAME = "安全检查记录";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
recordLog.logList.Add(start1);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "检查人";
start1.NAME = "安全检查记录";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
recordLog.logList.Add(start1);
}
result.Add(recordLog);
#endregion
#region 安全检查记录汇总
OperateLog recordSumLog = new OperateLog();
recordSumLog.FORM_NAME = "安全检查记录汇总";
recordSumLog.logList = new List<OperateLogList>();
if (safeRecordSumId != null)
{
//发起
var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == safeRecordSumId && !t.NOTICE_TITLE.Contains("确认"));
OperateLogList start = new OperateLogList();
start.USER_NAME = temp1.USER_NAME;
start.NAME = "安全检查记录汇总";
start.DEAL_DATE = temp1.TASK_DT;
start.CREATE_TIME = temp1.CREATE_TIME;
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
recordSumLog.logList.Add(start);
//确认
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeRecordSumId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m => m.CREATE_TIME).ThenBy(n => n.MODIFY_TIME).ToList();
if (temp2 != null && temp2.Any())
{
foreach (var item in temp2)
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.USER_NAME;
start1.NAME = "安全检查记录汇总确认";
start1.DEAL_DATE = item.TASK_DT;
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
recordSumLog.logList.Add(start1);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "检查人";
start1.NAME = "安全检查记录汇总确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
recordSumLog.logList.Add(start1);
}
}
else
{
OperateLogList start = new OperateLogList();
start.USER_NAME = checkUser != null ? checkUser.NAME : "班长/安全员";
start.NAME = "安全检查记录汇总";
start.DEAL_DATE = null;
start.CREATE_TIME = null;
start.STATUS = 0;
recordSumLog.logList.Add(start);
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "检查人";
start1.NAME = "安全检查记录汇总确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
recordSumLog.logList.Add(start1);
}
result.Add(recordSumLog);
#endregion
#region 隐患上报
OperateLog hiddenReportLog = new OperateLog();
hiddenReportLog.FORM_NAME = "隐患上报";
hiddenReportLog.logList = new List<OperateLogList>();
if (dangerReportId != null)
{
//发起
var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == dangerReportId && !t.NOTICE_TITLE.Contains("确认"));
if (temp1 != null)
{
OperateLogList start = new OperateLogList();
start.USER_NAME = temp1.USER_NAME;
start.NAME = "隐患上报";
start.DEAL_DATE = temp1.TASK_DT;
start.CREATE_TIME = temp1.CREATE_TIME;
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
hiddenReportLog.logList.Add(start);
}
else
{
var reportUser = users.FirstOrDefault(t => t.ID == dangerReport.APPLY_USER_ID);
OperateLogList start = new OperateLogList();
start.USER_NAME = reportUser.NAME;
start.NAME = "隐患上报";
start.DEAL_DATE = dangerReport.MODIFY_TIME;
start.CREATE_TIME = dangerReport.CREATE_TIME;
start.STATUS = 10;
hiddenReportLog.logList.Add(start);
}
//审批
var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == dangerReportId);
if (approveTemp == null)
{
//判断发起人层级，取审批模板
var departFirst = departs.FirstOrDefault(t => t.ID == dangerReport.APPLY_DEPARTMENT_ID);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE);
if (departFirst.DEPARTMENT_STATUS != 1)
{
param = "公司级";
}
var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK014");
if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any())
{
foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t => t.NUM))
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.Nav_ApproveRole.NAME;
start1.NAME = "隐患上报审批";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
noticeLog.logList.Add(start1);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "审批人";
start1.NAME = "隐患上报审批";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
hiddenReportLog.logList.Add(start1);
}
}
else
{
var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp?.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m => m.MODIFY_TIME).ToList();
if (tempApprove != null && tempApprove.Any())
{
foreach (var item in tempApprove)
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.USER_NAME;
start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "隐患上报已被驳回" : item.SOURCE_FORMCODE == "PF119" ? "隐患上报审批" : item.NOTICE_TITLE.Contains("确认") ? "隐患上报确认" : "隐患上报";
start1.DEAL_DATE = item.TASK_DT;
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
hiddenReportLog.logList.Add(start1);
}
}
}
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == dangerReportId && t.NOTICE_TITLE.Contains("确认"));
if (temp2 != null && temp2.Any())
{
noticeLog.logList = new List<OperateLogList>();
foreach (var item in temp2)
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.USER_NAME;
start1.NAME = "隐患上报确认";
start1.DEAL_DATE = item.TASK_DT;
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
hiddenReportLog.logList.Add(start1);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "整改责任人";
start1.NAME = "隐患上报确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
hiddenReportLog.logList.Add(start1);
}
}
else
{
OperateLogList start = new OperateLogList();
start.USER_NAME = checkUser != null ? checkUser.NAME : "上报人";
start.NAME = "隐患上报";
start.DEAL_DATE = null;
start.CREATE_TIME = null;
start.STATUS = 0;
hiddenReportLog.logList.Add(start);
//判断发起人层级，取审批模板
var departFirst = departs.FirstOrDefault(t => t.ID == check.APPLY_DEPARTMENT_ID);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE);
if (departFirst.DEPARTMENT_STATUS != 1)
{
param = "公司级";
}
var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK014");
if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any())
{
foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t => t.NUM))
{
OperateLogList start2 = new OperateLogList();
start2.USER_NAME = item.Nav_ApproveRole.NAME;
start2.NAME = "隐患上报审批";
start2.DEAL_DATE = null;
start2.CREATE_TIME = null;
start2.STATUS = 0;
hiddenReportLog.logList.Add(start2);
}
}
else
{
OperateLogList start2 = new OperateLogList();
start2.USER_NAME = "审批人";
start2.NAME = "隐患上报审批";
start2.DEAL_DATE = null;
start2.CREATE_TIME = null;
start2.STATUS = 0;
hiddenReportLog.logList.Add(start2);
}
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "整改责任人";
start1.NAME = "隐患上报确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
hiddenReportLog.logList.Add(start1);
}
result.Add(hiddenReportLog);
#endregion
#region 隐患整改通知
OperateLog rectifyNoticeLog = new OperateLog();
rectifyNoticeLog.FORM_NAME = "隐患整改通知";
rectifyNoticeLog.logList = new List<OperateLogList>();
if (rectifyNoticeId != null)
{
//发起
var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == rectifyNoticeId && !t.NOTICE_TITLE.Contains("确认"));
OperateLogList start = new OperateLogList();
start.USER_NAME = temp1.USER_NAME;
start.NAME = "隐患整改通知";
start.DEAL_DATE = temp1.TASK_DT;
start.CREATE_TIME = temp1.CREATE_TIME;
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
rectifyNoticeLog.logList.Add(start);
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == rectifyNoticeId && t.NOTICE_TITLE.Contains("确认"));
if (temp2 != null && temp2.Any())
{
foreach (var item in temp2)
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = item.USER_NAME;
start1.NAME = "隐患整改通知确认";
start1.DEAL_DATE = item.TASK_DT;
start1.CREATE_TIME = item.CREATE_TIME;
start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
rectifyNoticeLog.logList.Add(start1);
}
}
else
{
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "整改责任人";
start1.NAME = "隐患整改通知确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
rectifyNoticeLog.logList.Add(start1);
}
}
else {
OperateLogList start = new OperateLogList();
start.USER_NAME = "安全员";
start.NAME = "隐患整改通知";
start.DEAL_DATE = null;
start.CREATE_TIME = null;
start.STATUS = 0;
rectifyNoticeLog.logList.Add(start);
OperateLogList start1 = new OperateLogList();
start1.USER_NAME = "整改责任人";
start1.NAME = "隐患整改通知确认";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
rectifyNoticeLog.logList.Add(start1);
}
result.Add(rectifyNoticeLog);
#endregion
}
return result;
}
});
}
}
}

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

333
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
@ -9011,6 +9233,117 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
#endregion
#region IdentifyEvaluationPlanEvaluation-评价要求
/// <summary>
/// 评价要求
/// </summary>
[Route("api/SK/IdentifyEvaluationPlanEvaluation")]
public partial class IdentifyEvaluationPlanEvaluationController : AuthorizeApiController<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION> 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_IDENTIFY_EVALUATION_PLAN_EVALUATION entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION> 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_IDENTIFY_EVALUATION_PLAN_EVALUATION> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
}
#endregion