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-16 14:34:59 +08:00
parent 4ef517acce
commit 89db85f53e
20 changed files with 273232 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

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

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

File diff suppressed because it is too large Load Diff

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

@ -0,0 +1,74 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025111602 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
IDENTIFY_EVALUATION_PLAN_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
EVALUATION_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_T_SK_EVALUATION_EVALUATION_ID",
column: x => x.EVALUATION_ID,
principalTable: "T_SK_EVALUATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_T_SK_IDENTIFY_EVALUATION_PLAN_IDENTIFY_EVALUATION_PLAN_ID",
column: x => x.IDENTIFY_EVALUATION_PLAN_ID,
principalTable: "T_SK_IDENTIFY_EVALUATION_PLAN",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_EVALUATION_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
column: "EVALUATION_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_IDENTIFY_EVALUATION_PLAN_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
column: "IDENTIFY_EVALUATION_PLAN_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION_ORG_ID",
table: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION",
column: "ORG_ID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION");
}
}
}

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

@ -77004,6 +77004,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<string>("DEPARTMENT_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<Guid>("DOUBLE_PREVENT_MECHANISM_ID")
.HasColumnType("uniqueidentifier");
@ -77047,12 +77051,36 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("IDENTIFY_DEPART")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_DEPARTMENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_POST")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_USER")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<int>("MARK")
.HasColumnType("int");
b.Property<string>("MEASURE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
@ -81371,6 +81399,63 @@ namespace APT.Data.Migrations.Migrations
b.ToTable("T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("EVALUATION_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("IDENTIFY_EVALUATION_PLAN_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("EVALUATION_ID");
b.HasIndex("IDENTIFY_EVALUATION_PLAN_ID");
b.HasIndex("ORG_ID");
b.ToTable("T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_FILE", b =>
{
b.Property<Guid>("ID")
@ -82844,10 +82929,22 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("IDENTIFY_DEPART")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_DEPARTMENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_POST")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_USER")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
@ -83444,10 +83541,22 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("IDENTIFY_DEPART")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_DEPARTMENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_POST")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_TYPE")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("IDENTIFY_USER")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
@ -126254,6 +126363,32 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_User");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_EVALUATION", "Nav_Evaluation")
.WithMany()
.HasForeignKey("EVALUATION_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", "Nav_Plan")
.WithMany("Nav_Evaluations")
.HasForeignKey("IDENTIFY_EVALUATION_PLAN_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Evaluation");
b.Navigation("Nav_Org");
b.Navigation("Nav_Plan");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN_FILE", b =>
{
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_IDENTIFY_EVALUATION_PLAN", "Nav_Plan")
@ -134955,6 +135090,8 @@ namespace APT.Data.Migrations.Migrations
{
b.Navigation("Nav_Details");
b.Navigation("Nav_Evaluations");
b.Navigation("Nav_Files");
b.Navigation("Nav_Requires");

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

@ -13141,6 +13141,13 @@ builder.HasOne(t => t.Nav_RiskName).WithMany().HasForeignKey(t => t.RISK_NAME_ID
builder.HasOne(t => t.Nav_SCOREL).WithMany().HasForeignKey(t => t.SCOREL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_SCOREE).WithMany().HasForeignKey(t => t.SCOREE_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_SCOREC).WithMany().HasForeignKey(t => t.SCOREC_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.MEASURE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPART).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_POST).HasMaxLength(500);
builder.Property(t => t.DEPARTMENT_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPARTMENT).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_USER).HasMaxLength(500);
}
}
#endregion
@ -13983,6 +13990,17 @@ builder.Ignore(t => t.USERS);
builder.HasOne(t => t.Nav_PlanDetail).WithMany(t=>t.Nav_DetailUsers).HasForeignKey(t => t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region IdentifyEvaluationPlanEvaluation
public partial class SKIdentifyEvaluationPlanEvaluationMap :APTEntityBaseMap<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION>
{
public override void Configure(EntityTypeBuilder<T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_Plan).WithMany(t=>t.Nav_Evaluations).HasForeignKey(t => t.IDENTIFY_EVALUATION_PLAN_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Evaluation).WithMany().HasForeignKey(t => t.EVALUATION_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region IdentifyEvaluationPlanFile
@ -14285,6 +14303,9 @@ builder.Property(t => t.RISK_DESCRIPTION).HasMaxLength(500);
builder.HasOne(t => t.Nav_Type).WithMany().HasForeignKey(t => t.TYPE_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.MEASURE).HasMaxLength(500);
builder.Property(t => t.EMERGENCY).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPART).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_POST).HasMaxLength(500);
builder.Property(t => t.DEPARTMENT_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPARTMENT).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_USER).HasMaxLength(500);
@ -14395,6 +14416,9 @@ builder.Property(t => t.RISK_DESCRIPTION).HasMaxLength(500);
builder.HasOne(t => t.Nav_Type).WithMany().HasForeignKey(t => t.TYPE_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.MEASURE).HasMaxLength(500);
builder.Property(t => t.EMERGENCY).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPART).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_POST).HasMaxLength(500);
builder.Property(t => t.DEPARTMENT_TYPE).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_DEPARTMENT).HasMaxLength(500);
builder.Property(t => t.IDENTIFY_USER).HasMaxLength(500);

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

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

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

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

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

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

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

@ -0,0 +1,32 @@
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("评价要求")]
public class T_SK_IDENTIFY_EVALUATION_PLAN_EVALUATION : MesEntityBase
{
/// <summary>
/// 辨识评估计划
/// </summary>
[Description("辨识评估计划")]
[DataFieldForeignKey("Nav_Plan", "Nav_Evaluations")]
public Guid IDENTIFY_EVALUATION_PLAN_ID { get; set; }
/// <summary>
/// 导航：辨识评估计划
/// </summary>
[Description("导航：辨识评估计划")]
public virtual T_SK_IDENTIFY_EVALUATION_PLAN Nav_Plan { get; set; }
[Description("评价要求")]
[DataFieldForeignKey("Nav_Evaluation")]
public Guid? EVALUATION_ID { get; set; }
[Description("导航属性：评价要求")]
public virtual T_SK_EVALUATION Nav_Evaluation { get; set; }
}
}

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

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

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

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

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

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

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

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

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

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

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

@ -110,10 +110,22 @@ namespace APT.SK.WebApi.Controllers.Api
{
var details = entity.Nav_Details;
entity.Nav_Details = null;
if (details != null && details.Any())
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
var departs = entity.Nav_Departs;
entity.Nav_Departs = null;
entity.Nav_Departs = null;
if (departs != null && departs.Any())
{
departs = departs.Where(t => !t.IS_DELETED).ToList();
}
var posts = entity.Nav_Posts;
entity.Nav_Posts = null;
entity.Nav_Posts = null;
if (posts != null && posts.Any())
{
posts = posts.Where(t => !t.IS_DELETED).ToList();
}
List<Guid> libraryDepartIds = new List<Guid>();
List<Guid> libraryPostIds = new List<Guid>();
List<Guid> libraryPostDetailIds = new List<Guid>();
@ -184,7 +196,12 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
if (details != null && details.Any())
{
{
var numIsNull = details.FirstOrDefault(t => t.NUM == null || t.NUM == 0);
if (numIsNull != null)
{
throw new Exception("管控措施的顺序必须填写");
}
detailIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => t.ENTERPRISE_LIBRARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
contentIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
basicIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
@ -1088,14 +1105,15 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
var checkList = new JsonActionResult<List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>>();
var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_DetailContent.Nav_LibraryDetail.Nav_Library", "Nav_CheckType").ToList();
var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_DetailContent.Nav_LibraryDetail.Nav_Library.Nav_ProductionUnit", "Nav_CheckType").ToList();
if (detailContents != null && detailContents.Any())
{
foreach (var item in detailContents)
{
item.MineType = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.MineType;
item.PRODUCTION_UNIT_ID = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.PRODUCTION_UNIT_ID;
item.MINE_NAME = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.Nav_ProductionUnit.NAME;
}
checkList.Data = detailContents.GroupBy(t => new { t.MineType, t.CHECK_TYPE_ID, t.CHECK_CYCLE, t.CHECK_TYPE }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.CHECK_TYPE).ThenBy(y => y.CHECK_TYPE_ID).ToList();
checkList.Data = detailContents.GroupBy(t => new { t.PRODUCTION_UNIT_ID,t.MINE_NAME, t.CHECK_TYPE_ID, t.CHECK_CYCLE, t.CHECK_TYPE }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.CHECK_TYPE).ThenBy(y => y.CHECK_TYPE_ID).ToList();
checkList.TotalCount = checkList.Data.Count;
}
return checkList;
@ -1123,11 +1141,11 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item in detailContents)
{
item.MineType = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.MineType;
item.PRODUCTION_UNIT_ID = item.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.PRODUCTION_UNIT_ID;
}
if (!string.IsNullOrEmpty(filter.Keyword))
{
detailContents = detailContents.Where(t => t.MineType == (SKProductionUnit)int.Parse(filter.Keyword)).ToList();
detailContents = detailContents.Where(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Keyword)).ToList();
}
if (!string.IsNullOrEmpty(filter.Parameter1))
{
@ -1147,7 +1165,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item in contentList)
{
item.MineType = item.Nav_LibraryDetail.Nav_Library.MineType;
item.PRODUCTION_UNIT_ID = item.Nav_LibraryDetail.Nav_Library.PRODUCTION_UNIT_ID;
item.AREA_NAME = item.Nav_LibraryDetail.Nav_Library.AREA_NAME;
item.AREA_ID = item.Nav_LibraryDetail.Nav_Library.AREA_ID;
item.Nav_Contents = item.Nav_Contents;
@ -1167,7 +1185,7 @@ namespace APT.SK.WebApi.Controllers.Api
item2.POST_NAME = userPosts.FirstOrDefault(t => t.ID == item.POST_ID)?.NAME;
var tempIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Nav_DetailDepart.DEPARTMENT_ID).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var contentTemps = contentList.Where(t => tempIds.Contains(t.ID)).ToList();
item2.Nav_ContentDatas = contentTemps.GroupBy(t => new { t.MineType, t.AREA_NAME, t.Nav_Contents?.CHECKCONTENT }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.AREA_NAME).ToList();
item2.Nav_ContentDatas = contentTemps.GroupBy(t => new { t.PRODUCTION_UNIT_ID, t.AREA_NAME, t.Nav_Contents?.CHECKCONTENT }).Select(m => m.FirstOrDefault()).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.AREA_NAME).ToList();
checkTempList.Add(item2);
}
checkList.Data = checkTempList;

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

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

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

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

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

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