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

冲突

Browse Source
This commit is contained in:
何美荣 2025-11-21 19:30:19 +08:00
commit fa4bc55e00
71 changed files with 331172 additions and 2920798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs
View File

@ -192,10 +192,10 @@ namespace APT.BaseData.Services.DomainServices
trainNotify.TRAIN_TEACHER = plan.TEACHER; trainNotify.TRAIN_TEACHER = plan.TEACHER;
trainNotify.TRAIN_MODEL = plan.TRAIN_MODEL; trainNotify.TRAIN_MODEL = plan.TRAIN_MODEL;
if (plan.CHECK_TYPE_ID != null) //if (plan.CHECK_TYPE_ID != null)
{ //{
trainNotify.CHECK_TYPE_ID = plan.CHECK_TYPE_ID.Value; // trainNotify.CHECK_TYPE_ID = plan.CHECK_TYPE_ID.Value;
} //}
trainNotify.STATUS = SETrainNotifyStatus.草稿; trainNotify.STATUS = SETrainNotifyStatus.草稿;
trainNotify.ORG_ID = orgId; trainNotify.ORG_ID = orgId;
trainNotify.CODE = DateTime.Now.ToString("yyyyMMddHHmmss"); trainNotify.CODE = DateTime.Now.ToString("yyyyMMddHHmmss");

128475
APT.Data.Migrations/Migrations/20250922013829_wyw2025092201.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

25
APT.Data.Migrations/Migrations/20250922013829_wyw2025092201.cs
View File

@ -1,25 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025092201 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ZDEX",
table: "T_PC_INFO",
type: "int",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ZDEX",
table: "T_PC_INFO");
}
}
}

128550
APT.Data.Migrations/Migrations/20250922023123_wyw2025092202.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

55
APT.Data.Migrations/Migrations/20250922023123_wyw2025092202.cs
View File

@ -1,55 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025092202 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_PF_HOME_TITLE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TITLE = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
ISHEAD = table.Column<bool>(type: "bit", nullable: false),
SECOND = table.Column<int>(type: "int", nullable: false),
COCOR = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
FONTSIZE = table.Column<int>(type: "int", nullable: false),
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_PF_HOME_TITLE", x => x.ID);
table.ForeignKey(
name: "FK_T_PF_HOME_TITLE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_PF_HOME_TITLE_ORG_ID",
table: "T_PF_HOME_TITLE",
column: "ORG_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_PF_HOME_TITLE");
}
}
}

128553
APT.Data.Migrations/Migrations/20250922031446_wyw2025092203.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20250922031446_wyw2025092203.cs
View File

@ -1,24 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025092203 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "ISTOCHILE",
table: "T_PF_HOME_TITLE",
type: "bit",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ISTOCHILE",
table: "T_PF_HOME_TITLE");
}
}
}

128725
APT.Data.Migrations/Migrations/20250923014551_wyw2025092301.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

117
APT.Data.Migrations/Migrations/20250923014551_wyw2025092301.cs
View File

@ -1,117 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025092301 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_PF_NOTICE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
TITLE = table.Column<string>(type: "nvarchar(300)", maxLength: 300, nullable: true),
CONTENT = table.Column<string>(type: "nvarchar(2000)", maxLength: 2000, nullable: true),
CREATE_NAME = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
CREATE_DEPARTMENT = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
DEPARTMENT_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
ISHEAD = table.Column<bool>(type: "bit", nullable: false),
ISTOCHILE = table.Column<bool>(type: "bit", nullable: false),
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_PF_NOTICE", x => x.ID);
table.ForeignKey(
name: "FK_T_PF_NOTICE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_PF_NOTICE_FILE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
NOTICE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IMG_FILE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
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_PF_NOTICE_FILE", x => x.ID);
table.ForeignKey(
name: "FK_T_PF_NOTICE_FILE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_PF_NOTICE_FILE_T_PF_IMG_FILE_IMG_FILE_ID",
column: x => x.IMG_FILE_ID,
principalTable: "T_PF_IMG_FILE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_PF_NOTICE_FILE_T_PF_NOTICE_NOTICE_ID",
column: x => x.NOTICE_ID,
principalTable: "T_PF_NOTICE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_PF_NOTICE_ORG_ID",
table: "T_PF_NOTICE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_PF_NOTICE_FILE_IMG_FILE_ID",
table: "T_PF_NOTICE_FILE",
column: "IMG_FILE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_PF_NOTICE_FILE_NOTICE_ID",
table: "T_PF_NOTICE_FILE",
column: "NOTICE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_PF_NOTICE_FILE_ORG_ID",
table: "T_PF_NOTICE_FILE",
column: "ORG_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_PF_NOTICE_FILE");
migrationBuilder.DropTable(
name: "T_PF_NOTICE");
}
}
}

128728
APT.Data.Migrations/Migrations/20250923024624_wyw2025092302.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20250923024624_wyw2025092302.cs
View File

@ -1,24 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025092302 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "STATUS",
table: "T_PF_NOTICE",
type: "int",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "STATUS",
table: "T_PF_NOTICE");
}
}
}

129132
APT.Data.Migrations/Migrations/20250924235748_hmr2025092501.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1079
APT.Data.Migrations/Migrations/20250924235748_hmr2025092501.cs
View File

File diff suppressed because it is too large Load Diff

129141
APT.Data.Migrations/Migrations/20251009075846_hmr2025100901.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

46
APT.Data.Migrations/Migrations/20251009075846_hmr2025100901.cs
View File

@ -1,46 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025100901 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "MARK",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "MARK",
table: "T_SK_RISK_EVALUATION_DETAIL",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "MARK",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
type: "int",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "MARK",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "MARK",
table: "T_SK_RISK_EVALUATION_DETAIL");
migrationBuilder.DropColumn(
name: "MARK",
table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
}
}
}

129150
APT.Data.Migrations/Migrations/20251020094230_hmr2025102001.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

43
APT.Data.Migrations/Migrations/20251020094230_hmr2025102001.cs
View File

@ -1,43 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL",
type: "int",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_ENTERPRISE_LIBRARY_DETAIL");
}
}
}

129159
APT.Data.Migrations/Migrations/20251020095534_hmr2025102002.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

43
APT.Data.Migrations/Migrations/20251020095534_hmr2025102002.cs
View File

@ -1,43 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102002 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL",
type: "int",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT_HIDDEN");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL_CONTENT");
migrationBuilder.DropColumn(
name: "ROW_NO",
table: "T_SK_BASIC_LIBRARY_DETAIL");
}
}
}

129669
APT.Data.Migrations/Migrations/20251021064221_hmr2025102101.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

374
APT.Data.Migrations/Migrations/20251021064221_hmr2025102101.cs
View File

@ -1,374 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102101 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IDENTIFY_EVALUATION_PLAN_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_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_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_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_REQUIRE_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);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_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_RISK_EVALUATION_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_REQUIRE_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_RISK_EVALUATION_REQUIRE_T_SK_EVALUATION_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_REQUIRE_T_SK_RISK_EVALUATION_RISK_EVALUATION_ID",
column: x => x.RISK_EVALUATION_ID,
principalTable: "T_SK_RISK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_SUMMARY_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_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_RISK_EVALUATION_SUMMARY_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_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_RISK_EVALUATION_SUMMARY_REQUIRE_T_SK_EVALUATION_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_T_SK_RISK_EVALUATION_SUMMARY_RISK_EVALUATION_SUMMARY_ID",
column: x => x.RISK_EVALUATION_SUMMARY_ID,
principalTable: "T_SK_RISK_EVALUATION_SUMMARY",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_IDENTIFY_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_IDENTIFY_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_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_RISK_IDENTIFY_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_REQUIRE_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_RISK_IDENTIFY_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_REQUIRE_T_SK_RISK_IDENTIFY_RISK_IDENTIFY_ID",
column: x => x.RISK_IDENTIFY_ID,
principalTable: "T_SK_RISK_IDENTIFY",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_IDENTIFY_RESULT_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_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_RISK_IDENTIFY_RESULT_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_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_RISK_IDENTIFY_RESULT_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_T_SK_RISK_IDENTIFY_RESULT_RISK_IDENTIFY_RESULT_ID",
column: x => x.RISK_IDENTIFY_RESULT_ID,
principalTable: "T_SK_RISK_IDENTIFY_RESULT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IDENTIFY_RESULT_SUMMARY_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REQUIRE_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_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_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_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_T_SK_REQUEST_REQUIRE_ID",
column: x => x.REQUIRE_ID,
principalTable: "T_SK_REQUEST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_IDENTIFY_RESULT_SUMMARY_ID",
column: x => x.IDENTIFY_RESULT_SUMMARY_ID,
principalTable: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_IDENTIFY_EVALUATION_PLAN_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
column: "IDENTIFY_EVALUATION_PLAN_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_ORG_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE_REQUIRE_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_REQUIRE_ORG_ID",
table: "T_SK_RISK_EVALUATION_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_EVALUATION_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_REQUIRE_RISK_EVALUATION_ID",
table: "T_SK_RISK_EVALUATION_REQUIRE",
column: "RISK_EVALUATION_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_ORG_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_REQUIRE_RISK_EVALUATION_SUMMARY_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE",
column: "RISK_EVALUATION_SUMMARY_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_REQUIRE_ORG_ID",
table: "T_SK_RISK_IDENTIFY_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_IDENTIFY_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_REQUIRE_RISK_IDENTIFY_ID",
table: "T_SK_RISK_IDENTIFY_REQUIRE",
column: "RISK_IDENTIFY_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_ORG_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
column: "REQUIRE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_REQUIRE_RISK_IDENTIFY_RESULT_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE",
column: "RISK_IDENTIFY_RESULT_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_IDENTIFY_RESULT_SUMMARY_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
column: "IDENTIFY_RESULT_SUMMARY_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_ORG_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE_REQUIRE_ID",
table: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE",
column: "REQUIRE_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_IDENTIFY_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_IDENTIFY_RESULT_REQUIRE");
migrationBuilder.DropTable(
name: "T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE");
}
}
}

129162
APT.Data.Migrations/Migrations/20251021094627_wyw2025102101.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20251021094627_wyw2025102101.cs
View File

@ -1,24 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025102101 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "ISHEAD",
table: "T_PF_APPROVAL_ROLE",
type: "bit",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ISHEAD",
table: "T_PF_APPROVAL_ROLE");
}
}
}

129165
APT.Data.Migrations/Migrations/20251022074708_wyw2025102201.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20251022074708_wyw2025102201.cs
View File

@ -1,24 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025102201 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "ISHEAD",
table: "T_PF_APPROVE_DETAIL",
type: "bit",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ISHEAD",
table: "T_PF_APPROVE_DETAIL");
}
}
}

129845
APT.Data.Migrations/Migrations/20251023024405_hmr2025102301.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

222
APT.Data.Migrations/Migrations/20251023024405_hmr2025102301.cs
View File

@ -1,222 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102301 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST");
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
migrationBuilder.RenameColumn(
name: "POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "DEPARTMENT_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DEPARTMENT_ID");
migrationBuilder.RenameColumn(
name: "POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "DEPARTMENT_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DEPARTMENT_ID");
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_DETAIL_POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
POST_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_RISK_EVALUATION_DETAIL_POST_DETAIL", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_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_RISK_EVALUATION_DETAIL_POST_DETAIL_T_FM_USER_POST_POST_ID",
column: x => x.POST_ID,
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_T_SK_RISK_EVALUATION_DETAIL_POST_RISK_EVALUATION_DETAIL_POST_ID",
column: x => x.RISK_EVALUATION_DETAIL_POST_ID,
principalTable: "T_SK_RISK_EVALUATION_DETAIL_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
POST_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_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_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_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_FM_USER_POST_POST_ID",
column: x => x.POST_ID,
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_RISK_EVALUATION_SUMMARY_DETAIL_POST~",
column: x => x.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID,
principalTable: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_ORG_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
column: "POST_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_RISK_EVALUATION_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
column: "RISK_EVALUATION_DETAIL_POST_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_ORG_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
column: "POST_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_RISK_EVALUATION_SUMMARY_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
column: "RISK_EVALUATION_SUMMARY_DETAIL_POST_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
column: "DEPARTMENT_ID",
principalTable: "T_FM_DEPARTMENT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
column: "DEPARTMENT_ID",
principalTable: "T_FM_DEPARTMENT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST");
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL");
migrationBuilder.RenameColumn(
name: "DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "POST_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_POST_ID");
migrationBuilder.RenameColumn(
name: "DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "POST_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_POST_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
column: "POST_ID",
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
column: "POST_ID",
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
}
}

129853
APT.Data.Migrations/Migrations/20251023030919_hmr2025102302.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

35
APT.Data.Migrations/Migrations/20251023030919_hmr2025102302.cs
View File

@ -1,35 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102302 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "EVALUATION_DEPARTMENT",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "EVALUATION_POST",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "EVALUATION_DEPARTMENT",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "EVALUATION_POST",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
}
}
}

129873
APT.Data.Migrations/Migrations/20251023072119_hmr2025102303.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

55
APT.Data.Migrations/Migrations/20251023072119_hmr2025102303.cs
View File

@ -1,55 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102303 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "Nav_UnitID",
table: "T_FM_DEPARTMENT",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "PRODUCTION_UNIT_ID",
table: "T_FM_DEPARTMENT",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_FM_DEPARTMENT_Nav_UnitID",
table: "T_FM_DEPARTMENT",
column: "Nav_UnitID");
migrationBuilder.AddForeignKey(
name: "FK_T_FM_DEPARTMENT_T_FM_USER_PRODUCTION_UNIT_SET_Nav_UnitID",
table: "T_FM_DEPARTMENT",
column: "Nav_UnitID",
principalTable: "T_FM_USER_PRODUCTION_UNIT_SET",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_FM_DEPARTMENT_T_FM_USER_PRODUCTION_UNIT_SET_Nav_UnitID",
table: "T_FM_DEPARTMENT");
migrationBuilder.DropIndex(
name: "IX_T_FM_DEPARTMENT_Nav_UnitID",
table: "T_FM_DEPARTMENT");
migrationBuilder.DropColumn(
name: "Nav_UnitID",
table: "T_FM_DEPARTMENT");
migrationBuilder.DropColumn(
name: "PRODUCTION_UNIT_ID",
table: "T_FM_DEPARTMENT");
}
}
}

129897
APT.Data.Migrations/Migrations/20251023121339_hmr2025102304.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

79
APT.Data.Migrations/Migrations/20251023121339_hmr2025102304.cs
View File

@ -1,79 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102304 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_CONFIRM",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL");
migrationBuilder.DropColumn(
name: "HIDDEN_REASON",
table: "T_SK_HIDDEN_DANGER_CONFIRM");
}
}
}

129880
APT.Data.Migrations/Migrations/20251024013621_wyw2025102401.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

35
APT.Data.Migrations/Migrations/20251024013621_wyw2025102401.cs
View File

@ -1,35 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025102401 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "ISHEAD",
table: "T_PF_APPROVE_TEMP_DETAIL",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "REJECT_INTERFACE",
table: "T_PF_APPROVE",
type: "nvarchar(100)",
maxLength: 100,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ISHEAD",
table: "T_PF_APPROVE_TEMP_DETAIL");
migrationBuilder.DropColumn(
name: "REJECT_INTERFACE",
table: "T_PF_APPROVE");
}
}
}

130473
APT.Data.Migrations/Migrations/20251024022928_hmr2025102401.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

412
APT.Data.Migrations/Migrations/20251024022928_hmr2025102401.cs
View File

@ -1,412 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102401 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CODE = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
NAME = table.Column<string>(type: "nvarchar(100)", maxLength: 100, 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_HIDDEN_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_REASON_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_CONFIRM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_HIDDEN_DANGER_CONFIRM_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_CONFIRM_REASON_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_HIDDEN_DANGER_CONFIRM_REASON_T_SK_HIDDEN_DANGER_CONFIRM_HIDDEN_DANGER_CONFIRM_ID",
column: x => x.HIDDEN_DANGER_CONFIRM_ID,
principalTable: "T_SK_HIDDEN_DANGER_CONFIRM",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_CONFIRM_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_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_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL~",
column: x => x.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID,
principalTable: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_RECTIFY_RECORD_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_HIDDEN_DANGER_RECTIFY_RECORD_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_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_HIDDEN_DANGER_RECTIFY_RECORD_REASON_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_HIDDEN_DANGER_RECTIFY_RECORD_ID",
column: x => x.HIDDEN_DANGER_RECTIFY_RECORD_ID,
principalTable: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
HIDDEN_DANGER_REPORT_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_HIDDEN_DANGER_REPORT_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_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_HIDDEN_DANGER_REPORT_DETAIL_REASON_T_SK_HIDDEN_DANGER_REPORT_DETAIL_HIDDEN_DANGER_REPORT_DETAIL_ID",
column: x => x.HIDDEN_DANGER_REPORT_DETAIL_ID,
principalTable: "T_SK_HIDDEN_DANGER_REPORT_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SECURITY_INSPECTION_RECORD_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SECURITY_INSPECTION_RECORD_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_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_SECURITY_INSPECTION_RECORD_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_SECURITY_INSPECTION_RECORD_DETAIL_ID",
column: x => x.SECURITY_INSPECTION_RECORD_DETAIL_ID,
principalTable: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
REASON_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_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_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_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_T_SK_HIDDEN_REASON_REASON_ID",
column: x => x.REASON_ID,
principalTable: "T_SK_HIDDEN_REASON",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_SECURITY_INSPECTION_REC~",
column: x => x.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID,
principalTable: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_CONFIRM_REASON_HIDDEN_DANGER_CONFIRM_ID",
table: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
column: "HIDDEN_DANGER_CONFIRM_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_CONFIRM_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_CONFIRM_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_CONFIRM_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
column: "HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_HIDDEN_DANGER_RECTIFY_RECORD_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
column: "HIDDEN_DANGER_RECTIFY_RECORD_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_HIDDEN_DANGER_REPORT_DETAIL_ID",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
column: "HIDDEN_DANGER_REPORT_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_ORG_ID",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON_REASON_ID",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_HIDDEN_REASON_ORG_ID",
table: "T_SK_HIDDEN_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_ORG_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_REASON_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON_SECURITY_INSPECTION_RECORD_DETAIL_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON",
column: "SECURITY_INSPECTION_RECORD_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_ORG_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_REASON_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
column: "REASON_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON",
column: "SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_CONFIRM_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON");
migrationBuilder.DropTable(
name: "T_SK_HIDDEN_REASON");
}
}
}

130902
APT.Data.Migrations/Migrations/20251104072719_wyw2025110401.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

289
APT.Data.Migrations/Migrations/20251104072719_wyw2025110401.cs
View File

@ -1,289 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025110401 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SE_TRAIN_PLAN",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PLAN_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
TYPE = table.Column<int>(type: "int", nullable: false),
YEAR = table.Column<int>(type: "int", nullable: false),
LAUNCH_TIME = table.Column<DateTime>(type: "datetime2", nullable: false),
END_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
DEPARTMENT_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LAUNCH_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
PLAN_NAME = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
GUIDE_PRINCIPLE = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
TRAIN_REQUIREMENT = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
PERSENT = table.Column<decimal>(type: "decimal(18,2)", nullable: true),
STATUS = table.Column<int>(type: "int", nullable: false),
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_SE_TRAIN_PLAN", x => x.ID);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_T_FM_DEPARTMENT_DEPARTMENT_ID",
column: x => x.DEPARTMENT_ID,
principalTable: "T_FM_DEPARTMENT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_T_FM_USER_LAUNCH_USER_ID",
column: x => x.LAUNCH_USER_ID,
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SE_TRAIN_PLAN_DETAIL",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PLAN_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PLAN_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
DATE_TRAIN = table.Column<DateTime>(type: "datetime2", nullable: false),
IN_OUT = table.Column<int>(type: "int", nullable: false),
TYPE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
NAME = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
OBJECT = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
TRAINTYPE = table.Column<int>(type: "int", nullable: false),
CHECKTYPE = table.Column<int>(type: "int", nullable: false),
CLASSHOUR = table.Column<int>(type: "int", nullable: false),
SPRINTTYPE = table.Column<int>(type: "int", nullable: false),
ISALL = table.Column<bool>(type: "bit", nullable: false),
DEPARTMENT_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
STATUS = table.Column<int>(type: "int", nullable: false),
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_SE_TRAIN_PLAN_DETAIL", x => x.ID);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_DETAIL_T_FM_DEPARTMENT_DEPARTMENT_ID",
column: x => x.DEPARTMENT_ID,
principalTable: "T_FM_DEPARTMENT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_DETAIL_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_DETAIL_T_SE_TRAIN_PLAN_PLAN_ID",
column: x => x.PLAN_ID,
principalTable: "T_SE_TRAIN_PLAN",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_DETAIL_T_SE_TRAIN_TYPE_ENUM_TYPE_ID",
column: x => x.TYPE_ID,
principalTable: "T_SE_TRAIN_TYPE_ENUM",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SE_TRAIN_PLAN_FILE",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PLAN_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IMG_FILE_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
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_SE_TRAIN_PLAN_FILE", x => x.ID);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_FILE_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_FILE_T_PF_IMG_FILE_IMG_FILE_ID",
column: x => x.IMG_FILE_ID,
principalTable: "T_PF_IMG_FILE",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_FILE_T_SE_TRAIN_PLAN_PLAN_ID",
column: x => x.PLAN_ID,
principalTable: "T_SE_TRAIN_PLAN",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PLAN_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
DEPARTMENT_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_SE_TRAIN_PLAN_DETAIL_DEPARTMENT", x => x.ID);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT_T_FM_DEPARTMENT_DEPARTMENT_ID",
column: x => x.DEPARTMENT_ID,
principalTable: "T_FM_DEPARTMENT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT_T_SE_TRAIN_PLAN_DETAIL_PLAN_DETAIL_ID",
column: x => x.PLAN_DETAIL_ID,
principalTable: "T_SE_TRAIN_PLAN_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DEPARTMENT_ID",
table: "T_SE_TRAIN_PLAN",
column: "DEPARTMENT_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_LAUNCH_USER_ID",
table: "T_SE_TRAIN_PLAN",
column: "LAUNCH_USER_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_ORG_ID",
table: "T_SE_TRAIN_PLAN",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT_ID",
table: "T_SE_TRAIN_PLAN_DETAIL",
column: "DEPARTMENT_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DETAIL_ORG_ID",
table: "T_SE_TRAIN_PLAN_DETAIL",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DETAIL_PLAN_ID",
table: "T_SE_TRAIN_PLAN_DETAIL",
column: "PLAN_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DETAIL_TYPE_ID",
table: "T_SE_TRAIN_PLAN_DETAIL",
column: "TYPE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT_DEPARTMENT_ID",
table: "T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT",
column: "DEPARTMENT_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT_ORG_ID",
table: "T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT_PLAN_DETAIL_ID",
table: "T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT",
column: "PLAN_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_FILE_IMG_FILE_ID",
table: "T_SE_TRAIN_PLAN_FILE",
column: "IMG_FILE_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_FILE_ORG_ID",
table: "T_SE_TRAIN_PLAN_FILE",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_PLAN_FILE_PLAN_ID",
table: "T_SE_TRAIN_PLAN_FILE",
column: "PLAN_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT");
migrationBuilder.DropTable(
name: "T_SE_TRAIN_PLAN_FILE");
migrationBuilder.DropTable(
name: "T_SE_TRAIN_PLAN_DETAIL");
migrationBuilder.DropTable(
name: "T_SE_TRAIN_PLAN");
}
}
}

2981
APT.Data.Migrations/Migrations/20251107032753_hmr2025110701.cs
View File

File diff suppressed because it is too large Load Diff

130905
APT.Data.Migrations/Migrations/20251107034559_wyw2025110701.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20251107034559_wyw2025110701.cs
View File

@ -1,24 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025110701 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "PLANDETAILID",
table: "T_SE_TRAIN_NOTIFY",
type: "uniqueidentifier",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PLANDETAILID",
table: "T_SE_TRAIN_NOTIFY");
}
}
}

48
APT.Data.Migrations/Migrations/20251107072044_wyw2025110702.cs
View File

@ -1,48 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025110702 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<Guid>(
name: "DEPARTMENT_ID",
table: "T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT",
type: "uniqueidentifier",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
oldClrType: typeof(Guid),
oldType: "uniqueidentifier",
oldNullable: true);
migrationBuilder.AlterColumn<decimal>(
name: "CLASSHOUR",
table: "T_SE_TRAIN_PLAN_DETAIL",
type: "decimal(18,2)",
nullable: false,
oldClrType: typeof(int),
oldType: "int");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<Guid>(
name: "DEPARTMENT_ID",
table: "T_SE_TRAIN_PLAN_DETAIL_DEPARTMENT",
type: "uniqueidentifier",
nullable: true,
oldClrType: typeof(Guid),
oldType: "uniqueidentifier");
migrationBuilder.AlterColumn<int>(
name: "CLASSHOUR",
table: "T_SE_TRAIN_PLAN_DETAIL",
type: "int",
nullable: false,
oldClrType: typeof(decimal),
oldType: "decimal(18,2)");
}
}
}

24
APT.Data.Migrations/Migrations/20251107101616_hmr2025110702.cs
View File

@ -1,24 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025110702 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "BORN_DATE",
table: "T_FM_USER",
type: "datetime2",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BORN_DATE",
table: "T_FM_USER");
}
}
}

805
APT.Data.Migrations/Migrations/20251107032753_hmr2025110701.Designer.cs → APT.Data.Migrations/Migrations/20251120131903_wyw2025112001.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

56
APT.Data.Migrations/Migrations/20251120131903_wyw2025112001.cs Normal file
View File

@ -0,0 +1,56 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025112001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SE_TRAIN_NOTIFY_T_SE_TRAIN_CHECK_TYPE_ENUM_CHECK_TYPE_ID",
table: "T_SE_TRAIN_NOTIFY");
migrationBuilder.DropIndex(
name: "IX_T_SE_TRAIN_NOTIFY_CHECK_TYPE_ID",
table: "T_SE_TRAIN_NOTIFY");
migrationBuilder.DropColumn(
name: "CHECK_TYPE_ID",
table: "T_SE_TRAIN_NOTIFY");
migrationBuilder.AddColumn<int>(
name: "CHECKTYPE",
table: "T_SE_TRAIN_NOTIFY",
type: "int",
nullable: false,
defaultValue: 56);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CHECKTYPE",
table: "T_SE_TRAIN_NOTIFY");
migrationBuilder.AddColumn<Guid>(
name: "CHECK_TYPE_ID",
table: "T_SE_TRAIN_NOTIFY",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_SE_TRAIN_NOTIFY_CHECK_TYPE_ID",
table: "T_SE_TRAIN_NOTIFY",
column: "CHECK_TYPE_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_SE_TRAIN_NOTIFY_T_SE_TRAIN_CHECK_TYPE_ENUM_CHECK_TYPE_ID",
table: "T_SE_TRAIN_NOTIFY",
column: "CHECK_TYPE_ID",
principalTable: "T_SE_TRAIN_CHECK_TYPE_ENUM",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
}
}

814
APT.Data.Migrations/Migrations/20251107101616_hmr2025110702.Designer.cs → APT.Data.Migrations/Migrations/20251121092338_wyw2025112101.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

33
APT.Data.Migrations/Migrations/20251121092338_wyw2025112101.cs Normal file
View File

@ -0,0 +1,33 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025112101 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "EXAMINATION_RESULTS",
table: "T_SE_TRAIN_RECORD_USER",
type: "int",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "SCORE",
table: "T_SE_TRAIN_RECORD_USER",
type: "int",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "EXAMINATION_RESULTS",
table: "T_SE_TRAIN_RECORD_USER");
migrationBuilder.DropColumn(
name: "SCORE",
table: "T_SE_TRAIN_RECORD_USER");
}
}
}

5098
APT.Data.Migrations/Migrations/20251107072044_wyw2025110702.Designer.cs → APT.Data.Migrations/Migrations/20251121110002_wyw2025112102.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

31
APT.Data.Migrations/Migrations/20251121110002_wyw2025112102.cs Normal file
View File

@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2025112102 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "EVALUATION_RESULT",
table: "T_SE_TRAINING_EFFECT_EVALUATION_SURVEY_RESULTS",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "EVALUATION_RESULT",
table: "T_SE_TRAINING_EFFECT_EVALUATION_SURVEY_RESULTS",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
}
}
}

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

@ -73784,7 +73784,7 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("ENTITY_ORG_TPYE") b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int"); .HasColumnType("int");
b.Property<int>("EVALUATION_RESULT") b.Property<int?>("EVALUATION_RESULT")
.HasColumnType("int"); .HasColumnType("int");
b.Property<Guid?>("FLOW_ID") b.Property<Guid?>("FLOW_ID")
@ -74000,8 +74000,8 @@ namespace APT.Data.Migrations.Migrations
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("CHECK_TYPE_ID") b.Property<int>("CHECKTYPE")
.HasColumnType("uniqueidentifier"); .HasColumnType("int");
b.Property<string>("CODE") b.Property<string>("CODE")
.HasMaxLength(100) .HasMaxLength(100)
@ -74111,8 +74111,6 @@ namespace APT.Data.Migrations.Migrations
b.HasKey("ID"); b.HasKey("ID");
b.HasIndex("CHECK_TYPE_ID");
b.HasIndex("LAUNCH_DEPARTMENT_ID"); b.HasIndex("LAUNCH_DEPARTMENT_ID");
b.HasIndex("LAUNCH_USER_ID"); b.HasIndex("LAUNCH_USER_ID");
@ -74924,6 +74922,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("ENTITY_ORG_TPYE") b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int"); .HasColumnType("int");
b.Property<int?>("EXAMINATION_RESULTS")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID") b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -74959,6 +74960,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid>("RECORD_ID") b.Property<Guid>("RECORD_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<int?>("SCORE")
.HasColumnType("int");
b.Property<int>("STATUS") b.Property<int>("STATUS")
.HasColumnType("int"); .HasColumnType("int");
@ -124000,11 +124004,6 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.SE.T_SE_TRAIN_NOTIFY", b => modelBuilder.Entity("APT.MS.Domain.Entities.SE.T_SE_TRAIN_NOTIFY", b =>
{ {
b.HasOne("APT.MS.Domain.Entities.SE.T_SE_TRAIN_CHECK_TYPE_ENUM", "Nav_TrainCheckType")
.WithMany()
.HasForeignKey("CHECK_TYPE_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_LaunchDepartment") b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_LaunchDepartment")
.WithMany() .WithMany()
.HasForeignKey("LAUNCH_DEPARTMENT_ID") .HasForeignKey("LAUNCH_DEPARTMENT_ID")
@ -124044,8 +124043,6 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_RecordUser"); b.Navigation("Nav_RecordUser");
b.Navigation("Nav_TrainCheckType");
b.Navigation("Nav_TrainDepartment"); b.Navigation("Nav_TrainDepartment");
b.Navigation("Nav_TrainType"); b.Navigation("Nav_TrainType");

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

@ -10517,7 +10517,6 @@ builder.HasOne(t => t.Nav_TrainType).WithMany().HasForeignKey(t => t.TRAIN_TYPE)
builder.Property(t => t.TRAIN_ADDR).HasMaxLength(100); builder.Property(t => t.TRAIN_ADDR).HasMaxLength(100);
builder.Property(t => t.TRAIN_TEACHER).HasMaxLength(100); builder.Property(t => t.TRAIN_TEACHER).HasMaxLength(100);
builder.Property(t => t.TRAIN_MODEL).HasMaxLength(50); builder.Property(t => t.TRAIN_MODEL).HasMaxLength(50);
builder.HasOne(t => t.Nav_TrainCheckType).WithMany().HasForeignKey(t => t.CHECK_TYPE_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.TRAIN_PLAN).HasMaxLength(500); builder.Property(t => t.TRAIN_PLAN).HasMaxLength(500);
builder.Ignore(t => t.PUBLISH); builder.Ignore(t => t.PUBLISH);
builder.Ignore(t => t.IS_OVERTIME); builder.Ignore(t => t.IS_OVERTIME);

13
APT.MS.Domain/Entities/SC/SE/51T_SE_TRAIN_NOTIFY.cs
View File

@ -139,18 +139,13 @@ namespace APT.MS.Domain.Entities.SE
public string TRAIN_MODEL { get; set; } public string TRAIN_MODEL { get; set; }
/// <summary> /// <summary>
/// 考核方式ID /// 考核方式 线上培训/线下培训 委外培训
/// </summary> /// </summary>
[Description("考核方式")] [Description("考核方式")]
[FormFieldTable]
[FormFieldEdit] [FormFieldEdit]
[DataFieldForeignKey("Nav_TrainCheckType")] [EnumName("PlanCheckType")]
public Guid? CHECK_TYPE_ID { get; set; } public PlanCheckType CHECKTYPE { get; set; }
/// <summary>
/// 导航: 考核方式
/// </summary>
[Description("导航: 考核方式")]
public T_SE_TRAIN_CHECK_TYPE_ENUM Nav_TrainCheckType { get; set; }
/// <summary> /// <summary>
/// 导航: 培训内容 /// 导航: 培训内容
/// </summary> /// </summary>

13
APT.MS.Domain/Entities/SC/SE/65T_SE_TRAIN_RECORD_USER.cs
View File

@ -51,6 +51,19 @@ namespace APT.MS.Domain.Entities.SE
[Description("岗位")] [Description("岗位")]
[DataFieldLength(50)] [DataFieldLength(50)]
public string POST_NAME { get; set; } public string POST_NAME { get; set; }
/// <summary>
/// 考核结果
/// </summary>
[Description("考核结果")]
public SEExaminationResultsEnum? EXAMINATION_RESULTS { get; set; }
/// <summary>
/// 分数
/// </summary>
[Description("分数")]
public int? SCORE { get; set; }
/// <summary> /// <summary>
/// 状态 /// 状态
/// </summary> /// </summary>

4
APT.MS.Domain/Entities/SC/SE/82T_SE_TRAINING_EFFECT_EVALUATION_SURVEY_RESULTS.cs
View File

@ -14,7 +14,7 @@ namespace APT.MS.Domain.Entities.SE
/// 培训效果评估调查表 /// 培训效果评估调查表
/// </summary> /// </summary>
[Description("培训效果评估调查表")] [Description("培训效果评估调查表")]
[DataFieldForeignKey("Nav_TrainingEffectSurvey","Nav_ResultList")] [DataFieldForeignKey("Nav_TrainingEffectSurvey", "Nav_ResultList")]
public Guid TRAINING_EFFECT_EVALUATION_SURVEY_ID { get; set; } public Guid TRAINING_EFFECT_EVALUATION_SURVEY_ID { get; set; }
/// <summary> /// <summary>
/// 导航: 培训效果评估调查表 /// 导航: 培训效果评估调查表
@ -39,7 +39,7 @@ namespace APT.MS.Domain.Entities.SE
[Description("评估结果")] [Description("评估结果")]
[EnumName("SEEvaluationResultEnum")] [EnumName("SEEvaluationResultEnum")]
[FormFieldEdit] [FormFieldEdit]
public SEEvaluationResultEnum EVALUATION_RESULT { get; set; } public SEEvaluationResultEnum? EVALUATION_RESULT { get; set; }
} }
} }

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BD.WebApi.Controllers.Api namespace APT.BD.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.BD; using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护 #region Hmi-HMI资源表维护
/// <summary> /// <summary>
/// HMI资源表维护 /// HMI资源表维护
@ -130,10 +123,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Picture-图片资源 #region Picture-图片资源
/// <summary> /// <summary>
/// 图片资源 /// 图片资源
@ -241,10 +232,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PictureFile-资源图片文件 #region PictureFile-资源图片文件
/// <summary> /// <summary>
/// 资源图片文件 /// 资源图片文件
@ -352,10 +341,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Place-区域表 #region Place-区域表
/// <summary> /// <summary>
/// 区域表 /// 区域表
@ -462,8 +449,7 @@ namespace APT.BD.WebApi.Controllers.Api
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary>
/// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
/// <param name="filter"></param> /// <param name="filter"></param>
@ -474,10 +460,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region ServerInfo-服务器信息表 #region ServerInfo-服务器信息表
/// <summary> /// <summary>
/// 服务器信息表 /// 服务器信息表
@ -585,10 +569,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SystemInfo-系统信息表 #region SystemInfo-系统信息表
/// <summary> /// <summary>
/// 系统信息表 /// 系统信息表
@ -696,10 +678,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region WordTemplate-WORD模板维护 #region WordTemplate-WORD模板维护
/// <summary> /// <summary>
/// WORD模板维护 /// WORD模板维护
@ -807,8 +787,6 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

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

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

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

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

File diff suppressed because it is too large Load Diff

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.LG.WebApi.Controllers.Api namespace APT.LG.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.LG; using APT.BaseData.Domain.Entities.LG;
#region Oprate-表单操作日志表 #region Oprate-表单操作日志表
/// <summary> /// <summary>
/// 表单操作日志表 /// 表单操作日志表
@ -130,8 +123,6 @@ namespace APT.LG.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

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

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

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

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

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

4
APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs
View File

@ -315,7 +315,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest sendReq = new AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest { }; AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest sendReq = new AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest { };
sendReq.PhoneNumbers = user.PHONE; sendReq.PhoneNumbers = user.PHONE;
sendReq.SignName = "吐鲁番金源矿冶";// "小鸣学习"; sendReq.SignName = "吐鲁番金源矿冶";// "小鸣学习";
sendReq.TemplateCode = "SMS_496760196";// "SMS_472015260"; sendReq.TemplateCode = "SMS_496915204";// "SMS_472015260";
//sendReq.TemplateParam = "{'name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; //sendReq.TemplateParam = "{'name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}";
sendReq.TemplateParam = "{'state':'临超期','name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; sendReq.TemplateParam = "{'state':'临超期','name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}";
@ -339,7 +339,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest sendReq = new AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest { }; AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest sendReq = new AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsRequest { };
sendReq.PhoneNumbers = user.PHONE; sendReq.PhoneNumbers = user.PHONE;
sendReq.SignName = "吐鲁番金源矿冶";// "小鸣学习"; sendReq.SignName = "吐鲁番金源矿冶";// "小鸣学习";
sendReq.TemplateCode = "SMS_496760196";// "SMS_472015260"; sendReq.TemplateCode = "SMS_496915204";// "SMS_472015260";
//sendReq.TemplateParam = "{'name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; //sendReq.TemplateParam = "{'name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}";
sendReq.TemplateParam = "{'state':'新','name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}"; sendReq.TemplateParam = "{'state':'新','name':'" + send.NOTICE_TITLE + "','time':'" + send.TASK_ENDDT + "'}";
AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsResponse sendResp = client.SendSms(sendReq); AlibabaCloud.SDK.Dysmsapi20170525.Models.SendSmsResponse sendResp = client.SendSms(sendReq);

44
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
View File

@ -86,11 +86,10 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//部门培训计划 //部门培训计划
//CheckDepTrainPlan(filter, dtNow, config); //CheckDepTrainPlan(filter, dtNow, config);
CreateYearTrainPlan(filter, dtNow, config); CreateYearTrainPlan(filter, dtNow, config);//培训计划 （给安环部安全员）
//到时间触发年度培训计划,搜集完成的部门培训计划 //到时间触发年度培训计划,搜集完成的部门培训计划
//FinishYearTrainPlan(filter, dtNow, config); wyw 只触发给公司级 没必要添加结束时间 就一单 时间没到做归档也没意义 //FinishYearTrainPlan(filter, dtNow, config); wyw 只触发给公司级 没必要添加结束时间 就一单 时间没到做归档也没意义
//培训通知 //CheckYearTrainPlan(filter, dtNow); //培训通知 旧模式 可废弃
CheckYearTrainPlan(filter, dtNow);
//培训通知 wyw //培训通知 wyw
TrainPlan(filter, dtNow); TrainPlan(filter, dtNow);
//换证培训触发 //换证培训触发
@ -340,7 +339,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
try try
{ {
var riskFilter = new BaseFilter(filter.GetOrgId()); var riskFilter = new BaseFilter(filter.GetOrgId());
riskFilter.Include = new string[] { "Nav_User.Nav_Department", "Nav_Record.Nav_Notify.Nav_TrainCheckType", "Nav_Record.Nav_Papers", "Nav_User.Nav_ProdutionUnit.Nav_Enums", "Nav_Record.Nav_Papers" }; riskFilter.Include = new string[] { "Nav_User.Nav_Department", "Nav_Record.Nav_Notify", "Nav_Record.Nav_Papers", "Nav_User.Nav_ProdutionUnit.Nav_Enums", "Nav_Record.Nav_Papers" };
var param = GetEntity<T_FM_SYNC_TASK>(t => t.INTERFACE_ADDRESS == "PP/SEController/updateTrainRecordReport"); var param = GetEntity<T_FM_SYNC_TASK>(t => t.INTERFACE_ADDRESS == "PP/SEController/updateTrainRecordReport");
var searchTime = DateTime.Parse("2023-01-01"); var searchTime = DateTime.Parse("2023-01-01");
if (param.SYNC_PARAM != null) if (param.SYNC_PARAM != null)
@ -368,7 +367,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
newRecord.END_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_END_TIME; newRecord.END_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_END_TIME;
newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL); newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL);
newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS; newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS;
newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; //newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME;
newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.CHECKTYPE.GetDescription();
newRecord.ORG_ID = filter.GetOrgId(); newRecord.ORG_ID = filter.GetOrgId();
newRecord.RECORD_ID = item.RECORD_ID; newRecord.RECORD_ID = item.RECORD_ID;
newRecord.TRAIN_TEACHER = item.Nav_Record.Nav_Notify.TRAIN_TEACHER; newRecord.TRAIN_TEACHER = item.Nav_Record.Nav_Notify.TRAIN_TEACHER;
@ -401,7 +402,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
newRecord.END_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_END_TIME; newRecord.END_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_END_TIME;
newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL); newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL);
newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS; newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS;
newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; //newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME;
newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.CHECKTYPE.GetDescription();
newRecord.ORG_ID = filter.GetOrgId(); newRecord.ORG_ID = filter.GetOrgId();
newRecord.USER_ID = item.USER_ID; newRecord.USER_ID = item.USER_ID;
@ -1358,6 +1361,14 @@ namespace APT.PP.WebApi.Controllers.Api.PP
return true; return true;
}); });
} }
/// <summary>
/// 培训计划 （给安环部安全员）
/// </summary>
/// <param name="filter"></param>
/// <param name="dtNow"></param>
/// <param name="config"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
private JsonActionResult<bool> CreateYearTrainPlan(KeywordFilter filter, DateTime dtNow, T_SE_SECONFIG config) private JsonActionResult<bool> CreateYearTrainPlan(KeywordFilter filter, DateTime dtNow, T_SE_SECONFIG config)
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
@ -1383,10 +1394,19 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
return true; return true;
} }
var approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(e => e.NAME.Contains("安环部负责人")); T_FM_USER user = null;
var approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(e => e.NAME.Contains("安环部安全员"));
if (approveRole != null) if (approveRole != null)
{ {
var user = GetEntity<T_FM_USER>(e => e.APPROVE_ROLE_ID.HasValue && e.APPROVE_ROLE_ID.Value == approveRole.ID && e.ENABLE_STATUS == 0); user = GetEntity<T_FM_USER>(e => e.APPROVE_ROLE_ID.HasValue && e.APPROVE_ROLE_ID.Value == approveRole.ID && e.ENABLE_STATUS == 0);
}
if (user == null)
{
approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(e => e.NAME.Contains("安环部负责人"));
}
if (approveRole != null)
{
user = GetEntity<T_FM_USER>(e => e.APPROVE_ROLE_ID.HasValue && e.APPROVE_ROLE_ID.Value == approveRole.ID && e.ENABLE_STATUS == 0);
if (user == null) if (user == null)
{ {
approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(e => e.NAME.Contains("总监") && e.NAME.Contains("安")); approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(e => e.NAME.Contains("总监") && e.NAME.Contains("安"));
@ -1552,7 +1572,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
trainNotify.TRAIN_ADDR = plan.ADDRESS; trainNotify.TRAIN_ADDR = plan.ADDRESS;
trainNotify.TRAIN_TEACHER = plan.TEACHER; trainNotify.TRAIN_TEACHER = plan.TEACHER;
trainNotify.TRAIN_MODEL = plan.TRAIN_MODEL; trainNotify.TRAIN_MODEL = plan.TRAIN_MODEL;
trainNotify.CHECK_TYPE_ID = plan.CHECK_TYPE_ID.Value; //trainNotify.CHECK_TYPE_ID = plan.CHECK_TYPE_ID.Value;
trainNotify.STATUS = SETrainNotifyStatus.草稿; trainNotify.STATUS = SETrainNotifyStatus.草稿;
trainNotify.ORG_ID = filter.GetOrgId(); trainNotify.ORG_ID = filter.GetOrgId();
trainNotify.CODE = DateTime.Now.ToString("yyyyMMddHHmmss"); trainNotify.CODE = DateTime.Now.ToString("yyyyMMddHHmmss");
@ -1732,7 +1753,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
catch { } catch { }
} }
DateTime maxTime = dt.AddMinutes(10); //ActionExecutingContext context
DateTime maxTime = dt.AddMinutes(2);//10
var orgId = filter.GetOrgId(); var orgId = filter.GetOrgId();
BaseFilter baseFilter = new BaseFilter(orgId); BaseFilter baseFilter = new BaseFilter(orgId);
baseFilter.Include = new string[] { "Nav_RecordUser", "Nav_TrainUserList.Nav_User.Nav_Department", "Nav_TrainUserList.Nav_User.Nav_Person.Nav_Post", "Nav_Files" }; baseFilter.Include = new string[] { "Nav_RecordUser", "Nav_TrainUserList.Nav_User.Nav_Department", "Nav_TrainUserList.Nav_User.Nav_Person.Nav_Post", "Nav_Files" };
@ -2172,6 +2195,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
modelNotify.NAME = item.NAME; modelNotify.NAME = item.NAME;
modelNotify.CREATE_NOTIFY_RECORD = true; modelNotify.CREATE_NOTIFY_RECORD = true;
modelNotify.CHECKTYPE = item.CHECKTYPE;
modelNotify.TRAIN_TYPE = TRAIN_TYPE; modelNotify.TRAIN_TYPE = TRAIN_TYPE;
modelNotify.LEVEL = LEVEL; modelNotify.LEVEL = LEVEL;
modelNotify.HOURS = item.CLASSHOUR;//培训学时 modelNotify.HOURS = item.CLASSHOUR;//培训学时

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

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

12
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs
View File

@ -695,7 +695,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
#region 13 #region 13
PerformanceModel CHARTZYRW1 = new PerformanceModel(); PerformanceModel CHARTZYRW1 = new PerformanceModel();
var allzyrw = GetEntities<T_HM_OPERATION_LINK>(t=>t.IS_DELETED==false, new BaseFilter(filter.GetOrgId())); var allzyrw = GetEntities<T_HM_OPERATION_LINK>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId()));
CHARTZYRW1.NAME = new List<string> { "许可作业", "关键任务", "一般任务" }; CHARTZYRW1.NAME = new List<string> { "许可作业", "关键任务", "一般任务" };
var zy1 = allzyrw.Count(t => t.TASK_LEVEL == 1); var zy1 = allzyrw.Count(t => t.TASK_LEVEL == 1);
var zy2 = allzyrw.Count(t => t.TASK_LEVEL == 2); var zy2 = allzyrw.Count(t => t.TASK_LEVEL == 2);
@ -794,7 +794,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
return SafeExecute<safeTrainData>(() => return SafeExecute<safeTrainData>(() =>
{ {
var riskFilter = new BaseFilter(filter.GetOrgId()); var riskFilter = new BaseFilter(filter.GetOrgId());
riskFilter.Include = new string[] { "Nav_Notify.Nav_TrainUserList", "Nav_Users", "Nav_Notify.Nav_TrainCheckType" }; riskFilter.Include = new string[] { "Nav_Notify.Nav_TrainUserList", "Nav_Users", "Nav_Notify" };
DateTime time = DateTime.Parse(filter.Parameter1); DateTime time = DateTime.Parse(filter.Parameter1);
DateTime currYear = DateTime.Parse(time.Year + " 01-01"); DateTime currYear = DateTime.Parse(time.Year + " 01-01");
var startTime = time.AddDays(1 - time.Day); var startTime = time.AddDays(1 - time.Day);
@ -820,8 +820,12 @@ namespace APT.SC.WebApi.Controllers.Api.BI
trainRecord.TIMERANGE = item.Nav_Notify.TRAIN_START_TIME + "-" + item.Nav_Notify.TRAIN_END_TIME; trainRecord.TIMERANGE = item.Nav_Notify.TRAIN_START_TIME + "-" + item.Nav_Notify.TRAIN_END_TIME;
trainRecord.SHOULD_TRAINER = item.Nav_Notify.Nav_TrainUserList.Count(); trainRecord.SHOULD_TRAINER = item.Nav_Notify.Nav_TrainUserList.Count();
trainRecord.ACTUAL_TRAINER = item.Nav_Users.Count(); trainRecord.ACTUAL_TRAINER = item.Nav_Users.Count();
trainRecord.METHOD = item.Nav_Notify.Nav_TrainCheckType.NAME;
if (item.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") //trainRecord.METHOD = item.Nav_Notify.Nav_TrainCheckType.NAME;
//if (item.Nav_Notify.Nav_TrainCheckType.NAME == "笔试")
trainRecord.METHOD = item.Nav_Notify.CHECKTYPE.GetDescription();
if (item.Nav_Notify.CHECKTYPE == PlanCheckType.InOnLine)
{ {
var currExams = exams.Where(t => t.RECORD_ID == item.ID); var currExams = exams.Where(t => t.RECORD_ID == item.ID);
var currCount = currExams.Count(); var currCount = currExams.Count();

8
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs
View File

@ -57,6 +57,14 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
throw new Exception("请选择培训人员"); throw new Exception("请选择培训人员");
} }
if (entity.TRAIN_START_TIME.HasValue && entity.TRAIN_START_TIME.Value <= DateTime.Now)
{
throw new Exception("培训开始时间不能小于当前时间！");
}
if (entity.TRAIN_START_TIME.HasValue && entity.TRAIN_END_TIME.HasValue && entity.TRAIN_START_TIME.Value > entity.TRAIN_END_TIME.Value)
{
throw new Exception("培训开始时间不能大于培训结束时间！");
}
var Nav_TrainUserList = entity.Nav_TrainUserList.Where(t => t.USER_ID != Guid.Empty); var Nav_TrainUserList = entity.Nav_TrainUserList.Where(t => t.USER_ID != Guid.Empty);
var Nav_Files = entity.Nav_Files; var Nav_Files = entity.Nav_Files;

95
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
View File

@ -63,7 +63,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
// throw new Exception("请上传附件！"); // throw new Exception("请上传附件！");
// } // }
//} //}
var data = GetEntity<T_SE_TRAIN_RECORD>(t => t.ID == entity.ID, new BaseFilter(entity.ORG_ID), new string[] { "Nav_Notify.Nav_TrainCheckType", "Nav_Notify.Nav_TrainContentList", "Nav_Users" }); var data = GetEntity<T_SE_TRAIN_RECORD>(t => t.ID == entity.ID, new BaseFilter(entity.ORG_ID), new string[] { "Nav_Notify", "Nav_Notify.Nav_TrainContentList", "Nav_Users" });
if (data != null && data.STATUS != SETrainRecordStatus.草稿) if (data != null && data.STATUS != SETrainRecordStatus.草稿)
{ {
throw new Exception("当前状态不可提交"); throw new Exception("当前状态不可提交");
@ -74,7 +74,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID, "SE017_SHOWPRINT"); finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID, "SE017_SHOWPRINT");
} }
if (data.Nav_Notify != null && data.Nav_Notify.Nav_TrainCheckType != null && data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") //if (data.Nav_Notify != null && data.Nav_Notify.Nav_TrainCheckType != null && data.Nav_Notify.Nav_TrainCheckType.NAME == "笔试")
if (data.Nav_Notify != null && data.Nav_Notify.CHECKTYPE == PlanCheckType.InOnLine)
{ {
var config = GetEntity<T_SE_SECONFIG>(t => true); var config = GetEntity<T_SE_SECONFIG>(t => true);
var SCount = 1; var SCount = 1;
@ -82,18 +83,29 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var CCount = 1; var CCount = 1;
if (config != null) if (config != null)
{ {
if (config.M_TEST_COUNT > 0) if (config.M_TEST_COUNT > 0 || config.S_TEST_COUNT > 0 || config.C_TEST_COUNT > 0)
{ {
//王永文 只要有配置 就获取
MCount = config.M_TEST_COUNT; MCount = config.M_TEST_COUNT;
}
if (config.S_TEST_COUNT > 0)
{
SCount = config.S_TEST_COUNT; SCount = config.S_TEST_COUNT;
}
if (config.C_TEST_COUNT > 0)
{
CCount = config.C_TEST_COUNT; CCount = config.C_TEST_COUNT;
} }
else
{
//保持原来的版本
if (config.M_TEST_COUNT > 0)
{
MCount = config.M_TEST_COUNT;
}
if (config.S_TEST_COUNT > 0)
{
SCount = config.S_TEST_COUNT;
}
if (config.C_TEST_COUNT > 0)
{
CCount = config.C_TEST_COUNT;
}
}
} }
var pointIDS = data.Nav_Notify.Nav_TrainContentList.Select(t => t.POINT_ID).ToList(); var pointIDS = data.Nav_Notify.Nav_TrainContentList.Select(t => t.POINT_ID).ToList();
var testidlist = new List<Guid>(); var testidlist = new List<Guid>();
@ -229,6 +241,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
return SafeExecute(() => return SafeExecute(() =>
{ {
if (entity.TaskID == Guid.Empty)
{
throw new Exception("获取待办传参失败，请在首页待办进入考试！");
}
if (entity.Nav_Papers == null || entity.Nav_Papers.Count == 0) if (entity.Nav_Papers == null || entity.Nav_Papers.Count == 0)
{ {
throw new Exception("试卷不能为空"); throw new Exception("试卷不能为空");
@ -261,10 +277,25 @@ namespace APT.SC.WebApi.Controllers.Api.SE
item.SCORE = score; item.SCORE = score;
} }
var finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID); var finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
T_SE_TRAIN_RECORD_USER RecordUser = null;
if (APT.Infrastructure.Api.AppContext.CurrentSession.UserID.HasValue)
{
RecordUser = GetEntity<T_SE_TRAIN_RECORD_USER>(e => e.RECORD_ID == finishNotice.SOURCE_DATA_ID && e.USER_ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID);
RecordUser.SCORE = score;
int PASS_MARK = entity.Nav_Config.PASS_MARK;
if (PASS_MARK == 0)
{
PASS_MARK = 60;
}
RecordUser.EXAMINATION_RESULTS = RecordUser.SCORE < PASS_MARK ? SEExaminationResultsEnum.不合格 : SEExaminationResultsEnum.合格;
}
UnifiedCommit(() => UnifiedCommit(() =>
{ {
if (finishNotice != null) if (finishNotice != null)
UpdateEntityNoCommit(finishNotice); UpdateEntityNoCommit(finishNotice);
if (RecordUser != null)
UpdateEntityNoCommit(RecordUser);
BantchSaveEntityNoCommit(entity.Nav_Papers); BantchSaveEntityNoCommit(entity.Nav_Papers);
}); });
@ -309,7 +340,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
userID = finishNotice.USER_ID; userID = finishNotice.USER_ID;
} }
var record = GetEntity<T_SE_TRAIN_RECORD>(filter.Keyword, new string[] { "Nav_Notify.Nav_TrainCheckType", "Nav_Notify.Nav_TrainContentList", "Nav_Users.Nav_User" }); var record = GetEntity<T_SE_TRAIN_RECORD>(filter.Keyword, new string[] { "Nav_Notify", "Nav_Notify.Nav_TrainContentList", "Nav_Users.Nav_User" });
if (record == null) if (record == null)
{ {
throw new Exception("未查到当前培训记录，无法签到"); throw new Exception("未查到当前培训记录，无法签到");
@ -328,7 +359,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
//笔试才触发问卷,20201103提的需求 //笔试才触发问卷,20201103提的需求
IEnumerable<T_SE_TRAIN_RECORD_PAPER> listCheckPaper = null; IEnumerable<T_SE_TRAIN_RECORD_PAPER> listCheckPaper = null;
if (record.Nav_Notify != null && record.Nav_Notify.Nav_TrainCheckType != null && record.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") //if (record.Nav_Notify != null && record.Nav_Notify.Nav_TrainCheckType != null && record.Nav_Notify.Nav_TrainCheckType.NAME == "笔试")
if (record.Nav_Notify != null && record.Nav_Notify.CHECKTYPE == PlanCheckType.InOnLine)
{ {
listCheckPaper = GetEntities<T_SE_TRAIN_RECORD_PAPER>(t => t.RECORD_ID == record.ID && t.USER_ID == userID, null, null); listCheckPaper = GetEntities<T_SE_TRAIN_RECORD_PAPER>(t => t.RECORD_ID == record.ID && t.USER_ID == userID, null, null);
if (isReSend) if (isReSend)
@ -351,18 +383,29 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var CCount = 1; var CCount = 1;
if (config != null) if (config != null)
{ {
if (config.M_TEST_COUNT > 0) if (config.M_TEST_COUNT > 0 || config.S_TEST_COUNT > 0 || config.C_TEST_COUNT > 0)
{ {
//王永文 只要有配置 就获取
MCount = config.M_TEST_COUNT; MCount = config.M_TEST_COUNT;
}
if (config.S_TEST_COUNT > 0)
{
SCount = config.S_TEST_COUNT; SCount = config.S_TEST_COUNT;
}
if (config.C_TEST_COUNT > 0)
{
CCount = config.C_TEST_COUNT; CCount = config.C_TEST_COUNT;
} }
else
{
//保持原来的版本
if (config.M_TEST_COUNT > 0)
{
MCount = config.M_TEST_COUNT;
}
if (config.S_TEST_COUNT > 0)
{
SCount = config.S_TEST_COUNT;
}
if (config.C_TEST_COUNT > 0)
{
CCount = config.C_TEST_COUNT;
}
}
} }
var pointIDS = record.Nav_Notify.Nav_TrainContentList.Select(t => t.POINT_ID).ToList(); var pointIDS = record.Nav_Notify.Nav_TrainContentList.Select(t => t.POINT_ID).ToList();
var testidlist = new List<Guid>(); var testidlist = new List<Guid>();
@ -546,7 +589,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
HOURS = item.Nav_Notify.HOURS, HOURS = item.Nav_Notify.HOURS,
TRAIN_TEACHER = item.Nav_User.NAME,//默认带转训的人 TRAIN_TEACHER = item.Nav_User.NAME,//默认带转训的人
TRAIN_MODEL = item.Nav_Notify.TRAIN_MODEL, TRAIN_MODEL = item.Nav_Notify.TRAIN_MODEL,
CHECK_TYPE_ID = item.Nav_Notify.CHECK_TYPE_ID, //CHECK_TYPE_ID = item.Nav_Notify.CHECK_TYPE_ID,
CHECKTYPE = item.Nav_Notify.CHECKTYPE,
TRAIN_PLAN = item.Nav_Notify.TRAIN_PLAN, TRAIN_PLAN = item.Nav_Notify.TRAIN_PLAN,
CREATE_NOTIFY_RECORD = true, CREATE_NOTIFY_RECORD = true,
ORIGINAL_NOTIFY_ID = item.Nav_Notify.ID, ORIGINAL_NOTIFY_ID = item.Nav_Notify.ID,
@ -598,8 +642,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var absentUsers = ""; var absentUsers = "";
var leaveUsers = data.Nav_Users.Where(t => t.STATUS == SETrainRecordUserStatusEnum.请假); var leaveUsers = data.Nav_Users.Where(t => t.STATUS == SETrainRecordUserStatusEnum.请假);
var missUsers = data.Nav_Users.Where(t => t.STATUS == SETrainRecordUserStatusEnum.缺席); var missUsers = data.Nav_Users.Where(t => t.STATUS == SETrainRecordUserStatusEnum.缺席);
var UnqualifiedUsers = data.Nav_Users.Where(t => t.STATUS == SETrainRecordUserStatusEnum.参与 && t.EXAMINATION_RESULTS.HasValue && t.EXAMINATION_RESULTS.Value == SEExaminationResultsEnum.不合格);
if (leaveUsers.Count() > 0 || missUsers.Count() > 0) if (leaveUsers.Count() > 0 || missUsers.Count() > 0 || UnqualifiedUsers.Count() > 0)
{ {
foreach (var user in leaveUsers) foreach (var user in leaveUsers)
{ {
@ -617,7 +662,15 @@ namespace APT.SC.WebApi.Controllers.Api.SE
allSendUserNames.Add(user.Nav_User.NAME); allSendUserNames.Add(user.Nav_User.NAME);
absentUsers += user.Nav_User.NAME + " "; absentUsers += user.Nav_User.NAME + " ";
} }
allSendUserTitles.Add("请假和缺席人员:" + absentUsers + "未参加" + data.Nav_Notify.TRAIN_START_TIME.ToString().Substring(0, 10) + "举办的《" + data.Nav_Notify.NAME + "》培训，请重新安排培训!"); foreach (var user in UnqualifiedUsers)
{
allSendUserTitles.Add("您未通过" + data.Nav_Notify.TRAIN_START_TIME.ToString().Substring(0, 10) + "举办的《" + data.Nav_Notify.NAME + "》培训考试，请关注下次培训!");
allSendDataIds.Add(Guid.Parse(filter.Keyword));
allSendUserIds.Add(user.USER_ID);
allSendUserNames.Add(user.Nav_User.NAME);
absentUsers += user.Nav_User.NAME + " ";
}
allSendUserTitles.Add("请假、缺席和未通过考核人员:" + absentUsers + "未参加/通过" + data.Nav_Notify.TRAIN_START_TIME.ToString().Substring(0, 10) + "举办的《" + data.Nav_Notify.NAME + "》培训，请重新安排培训!");
allSendDataIds.Add(Guid.Parse(filter.Keyword)); allSendDataIds.Add(Guid.Parse(filter.Keyword));
allSendUserIds.Add((Guid)data.Nav_Notify.LAUNCH_USER_ID); allSendUserIds.Add((Guid)data.Nav_Notify.LAUNCH_USER_ID);
allSendUserNames.Add(data.Nav_Notify.Nav_LaunchUser.NAME); allSendUserNames.Add(data.Nav_Notify.Nav_LaunchUser.NAME);

25
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
View File

@ -273,18 +273,29 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var CCount = 1; var CCount = 1;
if (config != null) if (config != null)
{ {
if (config.M_TEST_COUNT > 0) if (config.M_TEST_COUNT > 0 || config.S_TEST_COUNT > 0 || config.C_TEST_COUNT > 0)
{ {
//王永文 只要有配置 就获取
MCount = config.M_TEST_COUNT; MCount = config.M_TEST_COUNT;
}
if (config.S_TEST_COUNT > 0)
{
SCount = config.S_TEST_COUNT; SCount = config.S_TEST_COUNT;
}
if (config.C_TEST_COUNT > 0)
{
CCount = config.C_TEST_COUNT; CCount = config.C_TEST_COUNT;
} }
else
{
//保持原来的版本
if (config.M_TEST_COUNT > 0)
{
MCount = config.M_TEST_COUNT;
}
if (config.S_TEST_COUNT > 0)
{
SCount = config.S_TEST_COUNT;
}
if (config.C_TEST_COUNT > 0)
{
CCount = config.C_TEST_COUNT;
}
}
} }
var testidlist = new List<Guid>(); var testidlist = new List<Guid>();
var testFilter = new BaseFilter(filter.GetOrgId()); var testFilter = new BaseFilter(filter.GetOrgId());

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

File diff suppressed because it is too large Load Diff