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

bug修复

Browse Source
This commit is contained in:
何美荣 2025-11-11 17:48:25 +08:00
parent 0a06c2ab46
commit ee4708a22e
20 changed files with 136867 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12721,11 +12721,20 @@ namespace APT.BaseData.Services.DomainServices
}
else
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == currentDepart.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部负责人"));
if (user != null)
{
userId = user.ID;
}
else
{
//找总经理
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("总经理"));
if (user != null)
{
userId = user.ID;
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
@ -12739,9 +12748,18 @@ namespace APT.BaseData.Services.DomainServices
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
//部门负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -12762,6 +12780,27 @@ namespace APT.BaseData.Services.DomainServices
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
else {
var departUserUp = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID);
if (departUserUp != null)
{
userId = departUserUp.USER_ID;
if (userId != null)
{
//部门负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUserUp.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
}
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
@ -12790,6 +12829,28 @@ namespace APT.BaseData.Services.DomainServices
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
var departUserUp = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID);
if (departUserUp != null)
{
userId = departUserUp.USER_ID;
if (userId != null)
{
//部门负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUserUp.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
}
}
@ -12808,33 +12869,14 @@ namespace APT.BaseData.Services.DomainServices
{
userId = user.ID;
}
}
}
//当前层级安全员和负责人都找不到，找一次上级安全员和负责人
if (userId == null)
else
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
//找总经理
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("总经理"));
if (user != null)
{
userId = user.ID;
}
else
{
//负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13046,6 +13088,15 @@ namespace APT.BaseData.Services.DomainServices
{
userId = user.ID;
}
else
{
//找总经理
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("总经理"));
if (user != null)
{
userId = user.ID;
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
@ -13066,6 +13117,15 @@ namespace APT.BaseData.Services.DomainServices
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13096,6 +13156,15 @@ namespace APT.BaseData.Services.DomainServices
{
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13131,6 +13200,15 @@ namespace APT.BaseData.Services.DomainServices
{
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13151,32 +13229,14 @@ namespace APT.BaseData.Services.DomainServices
{
userId = user.ID;
}
}
}
//当前层级安全员和负责人都找不到，找一次上级安全员和负责人
if (userId == null)
else
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
//找总经理
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("总经理"));
if (user != null)
{
userId = user.ID;
}
else
{
//负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13630,6 +13690,15 @@ namespace APT.BaseData.Services.DomainServices
{
userId = user.ID;
}
else
{
//找总经理
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("总经理"));
if (user != null)
{
userId = user.ID;
}
}
}
}
else if (currentDepart.DEPARTMENT_TYPE == 10)
@ -13647,9 +13716,17 @@ namespace APT.BaseData.Services.DomainServices
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13680,6 +13757,15 @@ namespace APT.BaseData.Services.DomainServices
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13715,6 +13801,15 @@ namespace APT.BaseData.Services.DomainServices
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
else
{
userId = departs.FirstOrDefault(t => t.ID == departUser.PARENT_ID)?.USER_ID;
if (userId != null)
{
//公司负责人
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
@ -13735,36 +13830,18 @@ namespace APT.BaseData.Services.DomainServices
{
userId = user.ID;
}
}
}
//当前层级安全员和负责人都找不到，找一次上级安全员和负责人
if (userId == null)
else
{
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == parentId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
//找总经理
user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("总经理"));
if (user != null)
{
userId = user.ID;
}
else
{
//负责人
var departUser = departs.FirstOrDefault(t => t.ID == parentId);
if (departUser != null)
{
userId = departUser.USER_ID;
if (userId != null)
{
//currentDepart = departUser;
user = users.FirstOrDefault(t => t.ID == userId);
}
}
}
}
}
}
var requre = this.GetEntity<T_SK_EVALUATION>(t => !t.IS_DELETED);
var filter = new BaseFilter(entity.ORG_ID);

135422
APT.Data.Migrations/Migrations/20251111094647_hmr2025111101.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

302
APT.Data.Migrations/Migrations/20251111094647_hmr2025111101.cs Normal file
View File

@ -0,0 +1,302 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025111101 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_T_FM_USER_AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.DropForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_T_FM_USER_PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.DropIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.DropIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "AFTER_USER_DEAL_STATUS",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "PRE_USER_DEAL_STATUS",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL");
migrationBuilder.AddColumn<Guid>(
name: "AREA_ID",
table: "T_SK_CHECK_SET_CONTENTS",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "ENTERPRISE_LIBRARY_DETAIL_ID",
table: "T_SK_CHECK_SET_CONTENTS",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "ENTERPRISE_LIBRARY_ID",
table: "T_SK_CHECK_SET_CONTENTS",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "MEASURES_NAME",
table: "T_SK_CHECK_SET_CONTENTS",
type: "nvarchar(300)",
maxLength: 300,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "RISK_NAME",
table: "T_SK_CHECK_SET_CONTENTS",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "POST_NAME",
table: "T_SK_CHECK_SET",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.CreateTable(
name: "T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
LEADER_WELL_RECORD_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
AFTER_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
AFTER_USER_DEAL_STATUS = table.Column<int>(type: "int", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER", x => x.ID);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER_T_FM_USER_AFTER_USER_ID",
column: x => x.AFTER_USER_ID,
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER_T_FO_LEADER_WELL_RECORD_DETAIL_LEADER_WELL_RECORD_DETAIL_ID",
column: x => x.LEADER_WELL_RECORD_DETAIL_ID,
principalTable: "T_FO_LEADER_WELL_RECORD_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
LEADER_WELL_RECORD_DETAIL_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PRE_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
PRE_USER_DEAL_STATUS = table.Column<int>(type: "int", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER", x => x.ID);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER_T_FM_USER_PRE_USER_ID",
column: x => x.PRE_USER_ID,
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER_T_FO_LEADER_WELL_RECORD_DETAIL_LEADER_WELL_RECORD_DETAIL_ID",
column: x => x.LEADER_WELL_RECORD_DETAIL_ID,
principalTable: "T_FO_LEADER_WELL_RECORD_DETAIL",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_CHECK_SET_CONTENTS_AREA_ID",
table: "T_SK_CHECK_SET_CONTENTS",
column: "AREA_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER_AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER",
column: "AFTER_USER_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER_LEADER_WELL_RECORD_DETAIL_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER",
column: "LEADER_WELL_RECORD_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER_ORG_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER_LEADER_WELL_RECORD_DETAIL_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER",
column: "LEADER_WELL_RECORD_DETAIL_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER_ORG_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER_PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER",
column: "PRE_USER_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_SK_CHECK_SET_CONTENTS_T_SK_RISK_AREA_AREA_ID",
table: "T_SK_CHECK_SET_CONTENTS",
column: "AREA_ID",
principalTable: "T_SK_RISK_AREA",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SK_CHECK_SET_CONTENTS_T_SK_RISK_AREA_AREA_ID",
table: "T_SK_CHECK_SET_CONTENTS");
migrationBuilder.DropTable(
name: "T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER");
migrationBuilder.DropTable(
name: "T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER");
migrationBuilder.DropIndex(
name: "IX_T_SK_CHECK_SET_CONTENTS_AREA_ID",
table: "T_SK_CHECK_SET_CONTENTS");
migrationBuilder.DropColumn(
name: "AREA_ID",
table: "T_SK_CHECK_SET_CONTENTS");
migrationBuilder.DropColumn(
name: "ENTERPRISE_LIBRARY_DETAIL_ID",
table: "T_SK_CHECK_SET_CONTENTS");
migrationBuilder.DropColumn(
name: "ENTERPRISE_LIBRARY_ID",
table: "T_SK_CHECK_SET_CONTENTS");
migrationBuilder.DropColumn(
name: "MEASURES_NAME",
table: "T_SK_CHECK_SET_CONTENTS");
migrationBuilder.DropColumn(
name: "RISK_NAME",
table: "T_SK_CHECK_SET_CONTENTS");
migrationBuilder.DropColumn(
name: "POST_NAME",
table: "T_SK_CHECK_SET");
migrationBuilder.AddColumn<int>(
name: "AFTER_USER_DEAL_STATUS",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
type: "int",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "PRE_USER_DEAL_STATUS",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
type: "int",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
column: "AFTER_USER_ID");
migrationBuilder.CreateIndex(
name: "IX_T_FO_LEADER_WELL_RECORD_DETAIL_PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
column: "PRE_USER_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_T_FM_USER_AFTER_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
column: "AFTER_USER_ID",
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_T_FO_LEADER_WELL_RECORD_DETAIL_T_FM_USER_PRE_USER_ID",
table: "T_FO_LEADER_WELL_RECORD_DETAIL",
column: "PRE_USER_ID",
principalTable: "T_FM_USER",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
}
}

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

@ -35604,12 +35604,6 @@ namespace APT.Data.Migrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<int?>("AFTER_USER_DEAL_STATUS")
.HasColumnType("int");
b.Property<Guid?>("AFTER_USER_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
@ -35666,12 +35660,6 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<int?>("PRE_USER_DEAL_STATUS")
.HasColumnType("int");
b.Property<Guid?>("PRE_USER_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("QUESTION")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
@ -35687,19 +35675,75 @@ namespace APT.Data.Migrations.Migrations
b.HasKey("ID");
b.HasIndex("AFTER_USER_ID");
b.HasIndex("LEADER_WELL_RECORD_ID");
b.HasIndex("ORG_ID");
b.HasIndex("PRE_USER_ID");
b.HasIndex("USER_ID");
b.ToTable("T_FO_LEADER_WELL_RECORD_DETAIL");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<int?>("AFTER_USER_DEAL_STATUS")
.HasColumnType("int");
b.Property<Guid?>("AFTER_USER_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid>("LEADER_WELL_RECORD_DETAIL_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("AFTER_USER_ID");
b.HasIndex("LEADER_WELL_RECORD_DETAIL_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL_AREA", b =>
{
b.Property<Guid>("ID")
@ -35814,6 +35858,66 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_FO_LEADER_WELL_RECORD_DETAIL_FILE");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid>("LEADER_WELL_RECORD_DETAIL_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<int?>("PRE_USER_DEAL_STATUS")
.HasColumnType("int");
b.Property<Guid?>("PRE_USER_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("LEADER_WELL_RECORD_DETAIL_ID");
b.HasIndex("ORG_ID");
b.HasIndex("PRE_USER_ID");
b.ToTable("T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_FILE", b =>
{
b.Property<Guid>("ID")
@ -76326,6 +76430,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("POST_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("POST_NAME")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("PRODUCTION_UNIT_ID")
.HasColumnType("uniqueidentifier");
@ -76350,6 +76458,9 @@ namespace APT.Data.Migrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("AREA_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("CHECK_CONTENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
@ -76370,6 +76481,12 @@ namespace APT.Data.Migrations.Migrations
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ENTERPRISE_LIBRARY_DETAIL_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("ENTERPRISE_LIBRARY_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
@ -76388,6 +76505,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<string>("MEASURES_NAME")
.HasMaxLength(300)
.HasColumnType("nvarchar(300)");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -76401,8 +76522,14 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<string>("RISK_NAME")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.HasKey("ID");
b.HasIndex("AREA_ID");
b.HasIndex("CHECK_CONTENTS_ID");
b.HasIndex("CHECK_SET_ID");
@ -108589,11 +108716,6 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_AfterUser")
.WithMany()
.HasForeignKey("AFTER_USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
.WithMany("Nav_Details")
.HasForeignKey("LEADER_WELL_RECORD_ID")
@ -108606,27 +108728,44 @@ namespace APT.Data.Migrations.Migrations
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_PreUser")
.WithMany()
.HasForeignKey("PRE_USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_User")
.WithMany()
.HasForeignKey("USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_AfterUser");
b.Navigation("Nav_Org");
b.Navigation("Nav_PreUser");
b.Navigation("Nav_Record");
b.Navigation("Nav_User");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_AfterUser")
.WithMany()
.HasForeignKey("AFTER_USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", "Nav_Detail")
.WithMany("Nav_AfterUsers")
.HasForeignKey("LEADER_WELL_RECORD_DETAIL_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_AfterUser");
b.Navigation("Nav_Detail");
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL_AREA", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_AREA", "Nav_Area")
@ -108679,6 +108818,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER", b =>
{
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", "Nav_Detail")
.WithMany("Nav_PreUsers")
.HasForeignKey("LEADER_WELL_RECORD_DETAIL_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_PreUser")
.WithMany()
.HasForeignKey("PRE_USER_ID")
.OnDelete(DeleteBehavior.Restrict);
b.Navigation("Nav_Detail");
b.Navigation("Nav_Org");
b.Navigation("Nav_PreUser");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_FILE", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.T_PF_IMG_FILE", "Nav_ImgFile")
@ -124005,6 +124170,11 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_CHECK_SET_CONTENTS", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_AREA", "Nav_Area")
.WithMany()
.HasForeignKey("AREA_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_CHECK_CONTENTS", "Nav_Contents")
.WithMany()
.HasForeignKey("CHECK_CONTENTS_ID")
@ -124022,6 +124192,8 @@ namespace APT.Data.Migrations.Migrations
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Area");
b.Navigation("Nav_CheckSet");
b.Navigation("Nav_Contents");
@ -133207,9 +133379,13 @@ namespace APT.Data.Migrations.Migrations
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", b =>
{
b.Navigation("Nav_AfterUsers");
b.Navigation("Nav_DetailAreas");
b.Navigation("Nav_DetailFiles");
b.Navigation("Nav_PreUsers");
});
modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_PRE_OPER_SCH", b =>

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

@ -1736,7 +1736,16 @@ builder.Property(t => t.MEASURE).HasMaxLength(500);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.ITEM).HasMaxLength(500);
builder.Property(t => t.PLACE).HasMaxLength(50);
builder.HasOne(t => t.Nav_PreUser).WithMany().HasForeignKey(t => t.PRE_USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region LeaderWellRecordDetailAfteruser
public partial class FOLeaderWellRecordDetailAfteruserMap :APTEntityBaseMap<T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER>
{
public override void Configure(EntityTypeBuilder<T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Detail).WithMany(t=>t.Nav_AfterUsers).HasForeignKey(t => t.LEADER_WELL_RECORD_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_AfterUser).WithMany().HasForeignKey(t => t.AFTER_USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
@ -1761,6 +1770,17 @@ builder.HasOne(t => t.Nav_Area).WithMany().HasForeignKey(t => t.AREA_ID).OnDelet
builder.HasOne(t => t.Nav_Detail).WithMany(t=>t.Nav_DetailFiles).HasForeignKey(t => t.LEADER_WELL_RECORD_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region LeaderWellRecordDetailPreuser
public partial class FOLeaderWellRecordDetailPreuserMap :APTEntityBaseMap<T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER>
{
public override void Configure(EntityTypeBuilder<T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Detail).WithMany(t=>t.Nav_PreUsers).HasForeignKey(t => t.LEADER_WELL_RECORD_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_PreUser).WithMany().HasForeignKey(t => t.PRE_USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region LeaderWellRecordFile
@ -13001,6 +13021,8 @@ builder.Ignore(t => t.HIDDEN_DESCRIPTION);
builder.Ignore(t => t.RECTIFICATION_MEASURES);
builder.Ignore(t => t.AREA_NAME);
builder.Ignore(t => t.RISK_NAME);
builder.Property(t => t.POST_NAME).HasMaxLength(50);
builder.Ignore(t => t.PUBLISH);
}
}
#endregion
@ -13014,7 +13036,9 @@ builder.Ignore(t => t.RISK_NAME);
builder.HasOne(t => t.Nav_Contents).WithMany().HasForeignKey(t => t.CHECK_CONTENTS_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.CHECK_CONTENT).HasMaxLength(500);
builder.Property(t => t.CHECK_STANDARD).HasMaxLength(500);
builder.Ignore(t => t.AREA_ID);
builder.HasOne(t => t.Nav_Area).WithMany().HasForeignKey(t => t.AREA_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.RISK_NAME).HasMaxLength(50);
builder.Property(t => t.MEASURES_NAME).HasMaxLength(300);
}
}
#endregion

23
APT.MS.Domain/Entities/FO/T_FO_LEADER_WELL_RECORD_DETAIL.cs
View File

@ -71,29 +71,12 @@ namespace APT.MS.Domain.Entities.FO
[DataFieldLength(50)]
public string PLACE { get; set; }
[Description("交班人")]
[DataFieldForeignKey("Nav_PreUser")]
[FormFieldEdit]
public Guid? PRE_USER_ID { get; set; }
[Description("导航属性：交班人")]
public T_FM_USER Nav_PreUser { get; set; }
[Description("处理状态")]
[EnumName("FOUserShiftStatusEnum")] //为枚举（0待处理 1已处理）
public FOUserShiftStatusEnum? PRE_USER_DEAL_STATUS { get; set; }
[Description("接班人")]
[DataFieldForeignKey("Nav_AfterUser")]
[FormFieldEdit]
public Guid? AFTER_USER_ID { get; set; }
public ICollection<T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER> Nav_PreUsers { get; set; }
[Description("导航属性：接班人")]
public T_FM_USER Nav_AfterUser { get; set; }
[EnumName("FOUserShiftStatusEnum")] //为枚举（0待处理 1已处理）
public FOUserShiftStatusEnum? AFTER_USER_DEAL_STATUS { get; set; }
[FormFieldEdit]
public ICollection<T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER> Nav_AfterUsers { get; set; }
}
}

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

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

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

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

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

@ -69,5 +69,12 @@ namespace APT.MS.Domain.Entities.SK
public string AREA_NAME { get; set; }
[DataFieldIngore]
public string RISK_NAME { get; set; }
[Description("检查对象")]
[DataFieldLength(50)]
public string POST_NAME { get; set; }
[Description("是否同步基础库")]
[DataFieldIngore]
public string PUBLISH { get; set; }
}
}

38
APT.MS.Domain/Entities/SK/T_SK_CHECK_SET_CONTENTS.cs
View File

@ -73,8 +73,42 @@ namespace APT.MS.Domain.Entities.SK
[Description("顺序")]
public int? NUM { get; set; }
[DataFieldIngore]
[Description("区域")]
/// <summary>
/// 辨识区域
/// </summary>
[Description("辨识区域")]
[DataFieldForeignKey("Nav_Area")]
public Guid? AREA_ID { get; set; }
/// <summary>
/// 导航属性：辨识区域
/// </summary>
[Description("导航属性：辨识区域")]
public T_SK_RISK_AREA Nav_Area { get; set; }
/// <summary>
/// 风险名称
/// </summary>
[Description("风险名称")]
public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
[Description("风险名称")]
[DataFieldLength(50)]
public string RISK_NAME { get; set; }
/// <summary>
/// 管控措施
/// </summary>
[Description("管控措施")]
public Guid? ENTERPRISE_LIBRARY_DETAIL_ID { get; set; }
/// <summary>
/// 管控措施
/// </summary>
[Description("管控措施")]
[DataFieldLength(300)]
public string MEASURES_NAME { get; set; }
}
}

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

@ -59,11 +59,15 @@ namespace APT.FO.WebApi.Controllers
var detailIds = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL>(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
var detailFileIds = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL_FILE>(t => detailIds.Contains(t.LEADER_WELL_RECORD_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
var detailAreaIds = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL_AREA>(t => detailIds.Contains(t.LEADER_WELL_RECORD_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
var detailPreUserIds = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER>(t => detailIds.Contains(t.LEADER_WELL_RECORD_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
var detailAfterUserIds = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER>(t => detailIds.Contains(t.LEADER_WELL_RECORD_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
var userList = new List<T_FO_LEADER_WELL_RECORD_USER>();
var fileList = new List<T_FO_LEADER_WELL_RECORD_FILE>();
var detailList = new List<T_FO_LEADER_WELL_RECORD_DETAIL>();
var detailFileList = new List<T_FO_LEADER_WELL_RECORD_DETAIL_FILE>();
var detailAreaList = new List<T_FO_LEADER_WELL_RECORD_DETAIL_AREA>();
var detailPreUserList = new List<T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER>();
var detailAfterUserList = new List<T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER>();
if (details != null && details.Any())
{
foreach (var item in details)
@ -88,6 +92,26 @@ namespace APT.FO.WebApi.Controllers
detailAreaList.Add(item2);
}
}
if (item.Nav_PreUsers != null && item.Nav_PreUsers.Any())
{
foreach (var item2 in item.Nav_PreUsers)
{
item2.ORG_ID = entity.ORG_ID;
item2.LEADER_WELL_RECORD_DETAIL_ID = item.ID;
item2.Nav_PreUser = null;
detailPreUserList.Add(item2);
}
}
if (item.Nav_AfterUsers != null && item.Nav_AfterUsers.Any())
{
foreach (var item2 in item.Nav_AfterUsers)
{
item2.ORG_ID = entity.ORG_ID;
item2.LEADER_WELL_RECORD_DETAIL_ID = item.ID;
item2.Nav_AfterUser = null;
detailAfterUserList.Add(item2);
}
}
item.ORG_ID = entity.ORG_ID;
item.LEADER_WELL_RECORD_ID = entity.ID;
item.Nav_DetailFiles = null;
@ -143,6 +167,10 @@ namespace APT.FO.WebApi.Controllers
}
this.UnifiedCommit(() =>
{
if (detailPreUserIds != null && detailPreUserIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_LEADER_WELL_RECORD_DETAIL_PREUSER>(detailPreUserIds);
if (detailAfterUserIds != null && detailAfterUserIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_LEADER_WELL_RECORD_DETAIL_AFTERUSER>(detailAfterUserIds);
if (detailFileIds != null && detailFileIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_LEADER_WELL_RECORD_DETAIL_FILE>(detailFileIds);
if (detailAreaIds != null && detailAreaIds.Any())
@ -161,6 +189,10 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(detailFileList);
if (detailAreaList != null && detailAreaList.Any())
this.BantchSaveEntityNoCommit(detailAreaList);
if (detailPreUserList != null && detailPreUserList.Any())
this.BantchSaveEntityNoCommit(detailPreUserList);
if (detailAfterUserList != null && detailAfterUserList.Any())
this.BantchSaveEntityNoCommit(detailAfterUserList);
if (userList != null && userList.Any())
this.BantchSaveEntityNoCommit(userList);
if (fileList != null && fileList.Any())

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

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

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

@ -55,26 +55,37 @@ namespace APT.SK.WebApi.Controllers.Api
{
List<T_SK_CHECK_SET_CONTENTS_HIDDEN> hiddens = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
List<T_SK_CHECK_SET_CONTENTS_BASIC> basics = new List<T_SK_CHECK_SET_CONTENTS_BASIC>();
List<T_SK_CHECK_SET_CONTENTS_AREA> areas = new List<T_SK_CHECK_SET_CONTENTS_AREA>();
List<T_SK_CHECK_SET_CONTENTS_AREA_RISK> risks = new List<T_SK_CHECK_SET_CONTENTS_AREA_RISK>();
//List<T_SK_CHECK_SET_CONTENTS_AREA> areas = new List<T_SK_CHECK_SET_CONTENTS_AREA>();
//List<T_SK_CHECK_SET_CONTENTS_AREA_RISK> risks = new List<T_SK_CHECK_SET_CONTENTS_AREA_RISK>();
var details = entity.Nav_CheckSetContents;
entity.Nav_CheckSetContents = null;
List<Guid> detailIds = new List<Guid>();
//List<Guid> hiddenIds = new List<Guid>();
List<Guid> basicIds = new List<Guid>();
detailIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => t.CHECK_SET_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
basicIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_BASIC>(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
//hiddenIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_HIDDEN>(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.POST_ID == entity.POST_ID);
if (record != null)
{
throw new Exception("相同检查已存在，请修改检查信息或回到列表页检索");
}
if (details != null && details.Any())
{
foreach (var item in details)
{
item.ORG_ID = entity.ORG_ID;
item.CHECK_SET_ID = entity.ID;
if (item.Nav_ContentsHiddens != null && item.Nav_ContentsHiddens.Any())
{
foreach (var item2 in item.Nav_ContentsHiddens)
{
item2.ORG_ID = entity.ORG_ID;
item2.CHECK_CONTENTS_SET_ID = item.ID;
hiddens.Add(item2);
}
}
item.Nav_ContentsHiddens = null;
//if (item.Nav_ContentsHiddens != null && item.Nav_ContentsHiddens.Any())
//{
// foreach (var item2 in item.Nav_ContentsHiddens)
// {
// item2.ORG_ID = entity.ORG_ID;
// item2.CHECK_CONTENTS_SET_ID = item.ID;
// hiddens.Add(item2);
// //conHiddenIds.Add(item2.CHECK_QUESTION_ID);
// }
//}
if (item.Nav_ContentsBasics != null && item.Nav_ContentsBasics.Any())
{
foreach (var item2 in item.Nav_ContentsBasics)
@ -84,32 +95,260 @@ namespace APT.SK.WebApi.Controllers.Api
basics.Add(item2);
}
}
item.Nav_ContentsBasics = null;
if (item.Nav_ContentsAreas != null && item.Nav_ContentsAreas.Any())
{
foreach (var item2 in item.Nav_ContentsAreas)
{
item2.ORG_ID = entity.ORG_ID;
item2.CHECK_SET_CONTENTS_ID = item.ID;
areas.Add(item2);
if (item2.Nav_ContentsAreaRisks != null && item2.Nav_ContentsAreaRisks.Any())
{
foreach (var item3 in item2.Nav_ContentsAreaRisks)
{
item3.ORG_ID = entity.ORG_ID;
item3.CHECK_SET_CONTENTS_AREA_ID = item2.ID;
risks.Add(item3);
}
}
item2.Nav_ContentsAreaRisks = null;
}
}
item.Nav_ContentsAreas = null;
}
}
//if (item.Nav_ContentsAreas != null && item.Nav_ContentsAreas.Any())
//{
// foreach (var item2 in item.Nav_ContentsAreas)
// {
// item2.ORG_ID = entity.ORG_ID;
// item2.CHECK_SET_CONTENTS_ID = item.ID;
// areas.Add(item2);
// if (item2.Nav_ContentsAreaRisks != null && item2.Nav_ContentsAreaRisks.Any())
// {
// foreach (var item3 in item2.Nav_ContentsAreaRisks)
// {
// item3.ORG_ID = entity.ORG_ID;
// item3.CHECK_SET_CONTENTS_AREA_ID = item2.ID;
// risks.Add(item3);
// }
// }
// item2.Nav_ContentsAreaRisks = null;
// }
//}
//item.Nav_ContentsAreas = null;
}
}
//同步到企业库
var areaIds = details.Select(t => t.AREA_ID).Distinct().ToList();
var riskNames = details.Select(t => t.RISK_NAME).Distinct().ToList();
var measures = details.Select(t => t.MEASURES_NAME).Distinct().ToList();
var contentIds = details.Select(t => t.CHECK_CONTENTS_ID).Distinct().ToList();
//conHiddenIds = conHiddenIds.Distinct().ToList();
var contentHiddens = this.GetEntities<T_SK_CHECK_QUESTION>(t => contentIds.Contains(t.CHECK_CONTENTS_ID), new BaseFilter(entity.ORG_ID));
var conHiddenIds = contentHiddens.Select(m => m.ID).ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && riskNames.Contains(t.RISK_NAME) && areaIds.Contains(t.AREA_ID) && t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(m => m.ID).ToList();
var libraryLevels = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID) && t.DEPARTMENT_ID == entity.DEPARTMENT_ID, new BaseFilter(entity.ORG_ID));
var libraryPosts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID) && t.DEPARTMENT_ID == entity.DEPARTMENT_ID, new BaseFilter(entity.ORG_ID));
var postIds = libraryPosts.Select(m => m.ID).ToList();
var libraryPostDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>(t => postIds.Contains(t.ENTERPRISE_LIBRARY_POST_ID) && t.POST_ID == entity.POST_ID, new BaseFilter(entity.ORG_ID));
var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID) && measures.Contains(t.MEASURES_NAME), new BaseFilter(entity.ORG_ID));
var detIds = libraryDetails.Select(m => m.ID).ToList();
var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => detIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID) && contentIds.Contains(t.CHECK_CONTENTS_ID), new BaseFilter(entity.ORG_ID));
var detailConIds = libraryContents.Select(t => t.ID).ToList();
var libraryHiddens = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>(t => detailConIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID) && t.CHECK_QUESTION_ID != null && conHiddenIds.Contains((Guid)t.CHECK_QUESTION_ID), new BaseFilter(entity.ORG_ID));
var libraryDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => detailConIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID) && t.DEPARTMENT_ID == entity.DEPARTMENT_ID, new BaseFilter(entity.ORG_ID));
//var departIds = libraryDetails.Select(m => m.ID).ToList();
//var libraryDepPots = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => departIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID) && t.POST_ID == entity.POST_ID, new BaseFilter(entity.ORG_ID));
//List<T_SK_ENTERPRISE_LIBRARY> libraryList = new List<T_SK_ENTERPRISE_LIBRARY>();
List<T_SK_ENTERPRISE_LIBRARY_DEPART> libraryLevelList = new List<T_SK_ENTERPRISE_LIBRARY_DEPART>();
List<T_SK_ENTERPRISE_LIBRARY_POST> libraryPostList = new List<T_SK_ENTERPRISE_LIBRARY_POST>();
List<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL> libraryPostDetList = new List<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL> libraryDetailList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT> libraryDetailContList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN> libraryDetailHiddList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> libraryDetailDepList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
//List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST> libraryDetailPostList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var riskName = details.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == null);
if (riskName != null)
{
throw new Exception("风险名称不能为空，请排查确认");
}
var measure = details.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_DETAIL_ID == null);
if (measure != null)
{
throw new Exception("管控措施不能为空，请排查确认");
}
foreach (var item in details)
{
var libFirst = librarys.FirstOrDefault(t => t.RISK_NAME == item.RISK_NAME && t.AREA_ID == item.AREA_ID);
//企业库已有，去更新。未找到，直接添加
if (libFirst != null)
{
var libDetailFirst = libraryDetails.FirstOrDefault(t => t.MEASURES_NAME == item.MEASURES_NAME && t.ENTERPRISE_LIBRARY_ID == libFirst.ID);
//管控措施为空
if (libDetailFirst == null)
{
//全部添加
T_SK_ENTERPRISE_LIBRARY_DETAIL mes = new T_SK_ENTERPRISE_LIBRARY_DETAIL();
mes.ORG_ID = entity.ORG_ID;
mes.ENTERPRISE_LIBRARY_ID = libFirst.ID;
mes.MEASURES_NAME = item.MEASURES_NAME;
mes.NUM = 99;
libraryDetailList.Add(mes);
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT con = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT();
con.ORG_ID = entity.ORG_ID;
con.ENTERPRISE_LIBRARY_DETAIL_ID = mes.ID;
con.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
con.NUM = 99;
libraryDetailContList.Add(con);
if (item.Nav_ContentsHiddens != null && item.Nav_ContentsHiddens.Any())
{
foreach (var item2 in item.Nav_ContentsHiddens)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN hid = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN();
hid.ORG_ID = entity.ORG_ID;
hid.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = con.ID;
hid.CHECK_QUESTION_ID = item2.CHECK_QUESTION_ID;
hid.NUM = item2.NUM;
libraryDetailHiddList.Add(hid);
}
}
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART dep = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
dep.ORG_ID = entity.ORG_ID;
dep.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = con.ID;
dep.DEPARTMENT_ID = entity.DEPARTMENT_ID;
dep.CHECK_TYPE = entity.CHECK_TYPE;
dep.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
dep.CHECK_CYCLE = entity.CHECK_CYCLE;
dep.NUM = 1;
libraryDetailDepList.Add(dep);
//T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST pos = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST();
//pos.ORG_ID = entity.ORG_ID;
//pos.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
//pos.POST_ID = entity.POST_ID;
//libraryDetailPostList.Add(pos);
}
else
{
//检查内容为空
var libConFirst = libraryContents.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_DETAIL_ID == libDetailFirst.ID && t.CHECK_CONTENTS_ID == item.CHECK_CONTENTS_ID);
if (libConFirst == null)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT con = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT();
con.ORG_ID = entity.ORG_ID;
con.ENTERPRISE_LIBRARY_DETAIL_ID = libDetailFirst.ID;
con.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
con.NUM = 99;
libraryDetailContList.Add(con);
if (item.Nav_ContentsHiddens != null && item.Nav_ContentsHiddens.Any())
{
foreach (var item2 in item.Nav_ContentsHiddens)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN hid = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN();
hid.ORG_ID = entity.ORG_ID;
hid.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = con.ID;
hid.CHECK_QUESTION_ID = item2.CHECK_QUESTION_ID;
hid.NUM = item2.NUM;
libraryDetailHiddList.Add(hid);
}
}
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART dep = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
dep.ORG_ID = entity.ORG_ID;
dep.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = con.ID;
dep.DEPARTMENT_ID = entity.DEPARTMENT_ID;
dep.CHECK_TYPE = entity.CHECK_TYPE;
dep.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
dep.CHECK_CYCLE = entity.CHECK_CYCLE;
dep.NUM = 1;
libraryDetailDepList.Add(dep);
//T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST pos = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST();
//pos.ORG_ID = entity.ORG_ID;
//pos.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
//pos.POST_ID = entity.POST_ID;
//libraryDetailPostList.Add(pos);
}
else
{
//检查层级没有就加，有就不处理
var libConDepFirst = libraryDeparts.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID == libConFirst.ID && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE);
if (libConDepFirst == null)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART dep = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
dep.ORG_ID = entity.ORG_ID;
dep.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = libConFirst.ID;
dep.DEPARTMENT_ID = entity.DEPARTMENT_ID;
dep.CHECK_TYPE = entity.CHECK_TYPE;
dep.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
dep.CHECK_CYCLE = entity.CHECK_CYCLE;
dep.NUM = 1;
libraryDetailDepList.Add(dep);
//T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST pos = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST();
//pos.ORG_ID = entity.ORG_ID;
//pos.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = dep.ID;
//pos.POST_ID = entity.POST_ID;
//libraryDetailPostList.Add(pos);
}
//隐患描述没有就加，有就不处理
var libConHidList = contentHiddens.Where(t => t.CHECK_CONTENTS_ID == item.CHECK_CONTENTS_ID).ToList();
if (libConHidList != null && libConHidList.Any())
{
foreach (var item2 in libConHidList)
{
var libConHidFirst = libraryHiddens.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID == libConFirst.ID && t.CHECK_QUESTION_ID == item2.ID);
if (libConHidFirst == null)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN hid = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN();
hid.ORG_ID = entity.ORG_ID;
hid.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = libConFirst.ID;
hid.CHECK_QUESTION_ID = item2.ID;
hid.NUM = item2.NUM;
hid.HIDDEN_DESCRIPTION = item2.DESCREPTION;
hid.HIDDEN_LEVEL = item2.QUESTION_LEVEL;
hid.RECTIFICATION_MEASURES = item2.DEMAND;
libraryDetailHiddList.Add(hid);
}
}
}
}
}
//管控层级为空就加，有就不处理
var libLevelFirst = libraryLevels.FirstOrDefault(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.ENTERPRISE_LIBRARY_ID == libFirst.ID);
if (libLevelFirst == null)
{
T_SK_ENTERPRISE_LIBRARY_DEPART lev = new T_SK_ENTERPRISE_LIBRARY_DEPART();
lev.ORG_ID = entity.ORG_ID;
lev.ENTERPRISE_LIBRARY_ID = libFirst.ID;
lev.DEPARTMENT_ID = entity.DEPARTMENT_ID;
libraryLevelList.Add(lev);
}
//辨识岗位
var libPostFirst = libraryPosts.FirstOrDefault(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.ENTERPRISE_LIBRARY_ID == libFirst.ID);
if (libLevelFirst == null)
{
T_SK_ENTERPRISE_LIBRARY_POST dep = new T_SK_ENTERPRISE_LIBRARY_POST();
dep.ORG_ID = entity.ORG_ID;
dep.ENTERPRISE_LIBRARY_ID = libFirst.ID;
dep.DEPARTMENT_ID = entity.DEPARTMENT_ID;
libraryPostList.Add(dep);
T_SK_ENTERPRISE_LIBRARY_POST_DETAIL pos = new T_SK_ENTERPRISE_LIBRARY_POST_DETAIL();
pos.ORG_ID = entity.ORG_ID;
pos.ENTERPRISE_LIBRARY_POST_ID = dep.ID;
pos.POST_ID = entity.POST_ID;
libraryPostDetList.Add(pos);
}
else
{
//辨识岗位为空就加，有就不处理
var libPostDetailFirst = libraryPostDetails.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_POST_ID == libLevelFirst.ID && t.POST_ID == entity.POST_ID);
if (libPostDetailFirst == null)
{
T_SK_ENTERPRISE_LIBRARY_POST_DETAIL pos = new T_SK_ENTERPRISE_LIBRARY_POST_DETAIL();
pos.ORG_ID = entity.ORG_ID;
pos.ENTERPRISE_LIBRARY_POST_ID = libLevelFirst.ID;
pos.POST_ID = entity.POST_ID;
libraryPostDetList.Add(pos);
}
}
}
else
{
//没有先不处理，如果直接加的话，隐患描述，应急处置，LEC怎么填
}
}
}
details.ForEach(t => { t.Nav_ContentsHiddens = null; t.Nav_ContentsBasics = null; });
this.UnifiedCommit(() =>
{
if (basicIds != null && basicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS_BASIC>(basicIds);
//if (hiddenIds != null && hiddenIds.Any())
// this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS_HIDDEN>(hiddenIds);
if (detailIds != null && detailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS>(detailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
@ -118,14 +357,55 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(hiddens);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
if (areas != null && areas.Any())
BantchSaveEntityNoCommit(areas);
if (risks != null && risks.Any())
BantchSaveEntityNoCommit(risks);
//if (areas != null && areas.Any())
// BantchSaveEntityNoCommit(areas);
//if (risks != null && risks.Any())
// BantchSaveEntityNoCommit(risks);
if (libraryLevelList != null && libraryLevelList.Any())
BantchSaveEntityNoCommit(libraryLevelList);
if (libraryPostList != null && libraryPostList.Any())
BantchSaveEntityNoCommit(libraryPostList);
if (libraryPostDetList != null && libraryPostDetList.Any())
BantchSaveEntityNoCommit(libraryPostDetList);
if (libraryDetailList != null && libraryDetailList.Any())
BantchSaveEntityNoCommit(libraryDetailList);
if (libraryDetailContList != null && libraryDetailContList.Any())
BantchSaveEntityNoCommit(libraryDetailContList);
if (libraryDetailHiddList != null && libraryDetailHiddList.Any())
BantchSaveEntityNoCommit(libraryDetailHiddList);
if (libraryDetailDepList != null && libraryDetailDepList.Any())
BantchSaveEntityNoCommit(libraryDetailDepList);
});
return true;
});
}
/// <summary>
/// 检查是否重复
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("CheckList")]
public JsonActionResult<bool> CheckList([FromBody] T_SK_CHECK_SET entity)
{
return SafeExecute<bool>(() =>
{
if (entity.PRODUCTION_UNIT_ID == null && entity.CHECK_TYPE_ID == null || entity.CHECK_TYPE == null || entity.DEPARTMENT_ID == null || entity.POST_ID == null)
{
throw new Exception("生产单元,检查层级,检查类型,检查周期,检查部门,检查对象都不能为空");
}
var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.POST_ID == entity.POST_ID);
if (record != null)
{
throw new Exception("相同检查已存在，请修改检查信息或回到列表页检索");
}
else
{
throw new Exception("当前检查不存在，请放心填写");
}
return true;
});
}
/// <summary>
/// 获取导入数据

14
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs
View File

@ -217,5 +217,19 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY>(null, pageFilter);
return result;
}
/// <summary>
/// 取整改记录，落实人为本人，且状态为草稿的
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("RecordOrderPaged")]
public PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> RecordOrderPaged([FromBody] KeywordPageFilter pageFilter)
{
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
pageFilter.IgnoreDataRule = true;
pageFilter.SelectField = new string[] { "ID", "CODE","Nav_RiskArea.NAME","HIDDEN_PLACE","HIDDEN_LEVEL","Nav_Question.DESCREPTION","RECITIFY_TIME","Nav_RectifyPhotoas","Nav_RectifyPhotoas.Nav_ImgFile.FILE_PATH" };
var result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t=>t.IMPLEMENT_USER_ID == userId && t.STATUS == PFStandardStatus.Draft, pageFilter);
return result;
}
}
}

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs
View File

@ -432,7 +432,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_RectifyFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null)
{
var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ImplementUser", "Nav_AcceptUser", "Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetailBasics.Nav_Law");
var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ImplementUser", "Nav_AcceptUser", "Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetailBasics.Nav_Law", "Nav_RectifyDetailReasons.Nav_Reason");
result.Nav_RectifyDetails = details.OrderBy(m => m.RISK_AREA_ID).ToList();
}
return result;
@ -454,7 +454,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetails.Nav_RectifyDetailReasons.Nav_Reason",
"Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())//&& taskId != null
@ -481,7 +481,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetails.Nav_RectifyDetailReasons.Nav_Reason",
"Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile", "Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())// && taskId != null

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

@ -482,7 +482,7 @@ namespace APT.SK.WebApi.Controllers
if (string.IsNullOrEmpty(id))
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea","Nav_Contents","Nav_Question","Nav_ProductionUnit",
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea","Nav_Contents","Nav_Question","Nav_ProductionUnit","Nav_RectifyReasons.Nav_Reason",
"Nav_RecitifyUser.Nav_Department","Nav_RecitifyUser.Nav_UserSignFiles","Nav_ImplementUser.Nav_UserSignFiles","Nav_AcceptUser.Nav_UserSignFiles","Nav_AcceptUser","Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyBasics.Nav_Law"});
if (result != null && result.STATUS == PFStandardStatus.Rejected)
{

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs
View File

@ -299,7 +299,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents","Nav_ReportDetails.Nav_Question","Nav_ReportDetails.Nav_ReportDetailBasics.Nav_Law",
"Nav_ReportDetails.Nav_RecitifyUser.Nav_UserSignFiles", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile",
"Nav_ReportDetails.Nav_RecitifyUser.Nav_UserSignFiles", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile","Nav_ReportDetails.Nav_ReportDetailReasons.Nav_Reason",
"Nav_ReportFiles","Nav_ReportFiles.Nav_ImgFile", "Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null
@ -329,7 +329,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents","Nav_ReportDetails.Nav_Question","Nav_ReportDetails.Nav_ReportDetailBasics.Nav_Law",
"Nav_ReportDetails.Nav_RecitifyUser", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile",
"Nav_ReportDetails.Nav_RecitifyUser", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile","Nav_ReportDetails.Nav_ReportDetailReasons.Nav_Reason",
"Nav_ReportFiles","Nav_ReportFiles.Nav_ImgFile"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null
@ -488,7 +488,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_ReportFiles.Nav_ImgFile", "Nav_ProductionUnit"});
if (result != null)
{
var details = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetailFiles.Nav_ImgFile");
var details = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetailFiles.Nav_ImgFile", "Nav_ReportDetailReasons.Nav_Reason");
result.Nav_ReportDetails = details.OrderBy(m => m.RISK_AREA_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{

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

@ -511,26 +511,22 @@ namespace APT.SK.WebApi.Controllers.Api
//if (postId == null)
// throw new Exception("请先维护登陆人岗位");
var departType = SKDepartmentTypeEnum.部门级;
if (filter.Parameter3 == "0")
if (filter.Parameter3 == "10")
{
departType = SKDepartmentTypeEnum.部门级;
}
else if (filter.Parameter3 == "1")
else if (filter.Parameter3 == "15")
{
departType = SKDepartmentTypeEnum.车间级;
}
else if (filter.Parameter3 == "2")
else if (filter.Parameter3 == "20")
{
departType = SKDepartmentTypeEnum.班组级;
}
else if (filter.Parameter3 == "3")
else if (filter.Parameter3 == "5")
{
departType = SKDepartmentTypeEnum.公司级;
}
else if (filter.Parameter3 == "4")
{
departType = SKDepartmentTypeEnum.班组级;
}
else
{
throw new Exception("检查层级错误");
@ -650,26 +646,22 @@ namespace APT.SK.WebApi.Controllers.Api
// throw new Exception("生产单元错误");
//}
var departType = SKDepartmentTypeEnum.部门级;
if (filter.Parameter3 == "0")
if (filter.Parameter3 == "10")
{
departType = SKDepartmentTypeEnum.部门级;
}
else if (filter.Parameter3 == "1")
else if (filter.Parameter3 == "15")
{
departType = SKDepartmentTypeEnum.车间级;
}
else if (filter.Parameter3 == "2")
else if (filter.Parameter3 == "20")
{
departType = SKDepartmentTypeEnum.班组级;
}
else if (filter.Parameter3 == "3")
else if (filter.Parameter3 == "5")
{
departType = SKDepartmentTypeEnum.公司级;
}
else if (filter.Parameter3 == "4")
{
departType = SKDepartmentTypeEnum.班组级;
}
else
{
throw new Exception("检查层级错误");

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -1225,7 +1225,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile","Nav_CheckRecordDetails.Nav_CheckRecordDetailReasons.Nav_Reason",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())
@ -1253,7 +1253,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile","Nav_CheckRecordDetails.Nav_CheckRecordDetailReasons.Nav_Reason",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())//&& taskId != null
@ -1343,7 +1343,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null)
{
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile");
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile", "Nav_CheckRecordDetailReasons.Nav_Reason");
if (details.Any())
{
var detailIds = details.Select(t => t.ID).ToList();

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

@ -663,7 +663,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User.Nav_UserSignFiles.Nav_ImgFile", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User.Nav_UserSignFiles.Nav_ImgFile", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile","Nav_CheckRecordDetails.Nav_CheckRecordDetailReasons.Nav_Reason",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null
@ -695,7 +695,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile","Nav_CheckRecordDetails.Nav_CheckRecordDetailReasons.Nav_Reason",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"});
// var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null
@ -788,7 +788,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null)
{
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile");
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile", "Nav_CheckRecordDetailReasons.Nav_Reason");
if (details.Any())
{
var detailIds = details.Select(t => t.ID).ToList();