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-09-22 23:22:38 +08:00
parent 38a057a67d
commit 1d591c1526
50 changed files with 690 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11361,6 +11361,7 @@ namespace APT.BaseData.Services.DomainServices
record.HIDDEN_DANGER_CONFIRM_ID = null;
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + random.Next(1, 999);
record.MineType = entity.MineType;
record.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
record.RISK_AREA_ID = detail.RISK_AREA_ID;
record.HIDDEN_PLACE = detail.HIDDEN_PLACE;
record.HIDDEN_DESCRIPTION = detail.HIDDEN_DESCRIPTION;
@ -11416,7 +11417,8 @@ namespace APT.BaseData.Services.DomainServices
notice.HIDDEN_DANGER_CONFIRM_ID = null;
notice.APPLY_USER_ID = entity.APPLY_USER_ID;
notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
notice.MineType = entity.MineType;
notice.MineType = entity.MineType;
notice.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
@ -11672,7 +11674,8 @@ namespace APT.BaseData.Services.DomainServices
record.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID;
record.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
record.MineType = entity.MineType;
record.MineType = entity.MineType;
record.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
record.RISK_AREA_ID = entity.RISK_AREA_ID;
record.HIDDEN_PLACE = entity.HIDDEN_PLACE;
record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_ID;
@ -11713,7 +11716,8 @@ namespace APT.BaseData.Services.DomainServices
notice.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
notice.APPLY_USER_ID = entity.APPLY_USER_ID;
notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
notice.MineType = entity.MineType;
notice.MineType = entity.MineType;
notice.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
@ -12304,7 +12308,8 @@ namespace APT.BaseData.Services.DomainServices
{
T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.RISK_IDENTIFY_ID = ide.ID;
ideDetail.RISK_IDENTIFY_ID = ide.ID;
ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID;
ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType;
ideDetail.AREA_ID = library?.AREA_ID;
ideDetail.RISK_NAME = library?.RISK_NAME;
@ -12549,7 +12554,7 @@ namespace APT.BaseData.Services.DomainServices
//Expression<Func<T_SK_RISK_IDENTIFY_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && identityIds.Contains(i.RISK_IDENTIFY_ID);
//List<T_SK_RISK_IDENTIFY_DETAIL> list = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID)).ToList();
var list = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => identityIds.Contains(t.RISK_IDENTIFY_ID), new BaseFilter(entity.ORG_ID));
var detailList = list.GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
var detailList = list.GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
if (detailList.Any())
{
foreach (var item in detailList)
@ -12572,6 +12577,7 @@ namespace APT.BaseData.Services.DomainServices
ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID;
@ -12874,16 +12880,17 @@ namespace APT.BaseData.Services.DomainServices
//Expression<Func<T_SK_RISK_IDENTIFY_RESULT_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID);
//List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> details = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID), new string[] { "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts" }).ToList();
var details = GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(i => resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID) && i.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts");
var detailList = details.GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
var detailList = details.GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
if (detailList.Any())
{
foreach (var de in detailList)
{
var temp = details.FirstOrDefault(m => m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
ideDetail.ORG_ID = entity.ORG_ID;
ideDetail.IDENTIFY_RESULT_SUMMARY_ID = sum.ID;
ideDetail.MineType = de.Key.MineType;
ideDetail.MineType = de.Key.MineType;
ideDetail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = de.Key.AREA_ID;
ideDetail.RISK_NAME = de.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = de.Key.RISK_NAME_ID;
@ -13089,11 +13096,12 @@ namespace APT.BaseData.Services.DomainServices
{
if (de != null)
{
var departTemp = librarys.FirstOrDefault(t => t.MineType == de.MineType && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_NAME_ID == de.RISK_NAME_ID && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID);
var departTemp = librarys.FirstOrDefault(t =>t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.MineType == de.MineType && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_NAME_ID == de.RISK_NAME_ID && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID);
T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL();
detail.ORG_ID = entity.ORG_ID;
detail.RISK_EVALUATION_ID = result.ID;
detail.MineType = de.MineType;
detail.MineType = de.MineType;
detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID;
detail.AREA_ID = de.AREA_ID;
detail.RISK_NAME = de.RISK_NAME;
detail.RISK_NAME_ID = de.RISK_NAME_ID;
@ -13361,15 +13369,16 @@ namespace APT.BaseData.Services.DomainServices
result.ISCOMPANY = entity.ISCOMPANY;
var resultIds = results.Select(t => t.ID).ToList();
var details = GetEntities<T_SK_RISK_EVALUATION_DETAIL>(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts");
var detailList = details.GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
var detailList = details.GroupBy(m => new { m.AREA_ID,m.PRODUCTION_UNIT_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
if (detailList.Any())
{
foreach (var de in detailList)
{
var temp = details.FirstOrDefault(m => m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
T_SK_RISK_EVALUATION_SUMMARY_DETAIL detail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
detail.ORG_ID = entity.ORG_ID;
detail.RISK_EVALUATION_SUMMARY_ID = result.ID;
detail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
detail.MineType = de == null ? SKProductionUnit.Mine : de.Key.MineType;
detail.AREA_ID = de.Key.AREA_ID;
detail.RISK_NAME = de.Key.RISK_NAME;
@ -13475,7 +13484,8 @@ namespace APT.BaseData.Services.DomainServices
{
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL detail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL();
detail.ORG_ID = item.ORG_ID;
detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID;
detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID;
detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
detail.MineType = item.MineType;
detail.AREA_ID = item.AREA_ID;
detail.TYPE_ID = item.TYPE_ID;
@ -13743,6 +13753,7 @@ namespace APT.BaseData.Services.DomainServices
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL detail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL();
detail.ORG_ID = item.ORG_ID;
detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID;
detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
detail.MineType = item.MineType;
detail.AREA_ID = item.AREA_ID;
detail.TYPE_ID = item.TYPE_ID;

9
APT.MS.Domain/Entities/SK/T_SK_BASIC_LIBRARY.cs
View File

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums.SK;
@ -21,6 +22,12 @@ namespace APT.MS.Domain.Entities.SK
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 辨识区域
/// </summary>

11
APT.MS.Domain/Entities/SK/T_SK_CHECK_CONTENTS.cs
View File

@ -1,4 +1,5 @@
using APT.Infrastructure.Core;
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.BS;
using APT.MS.Domain.Enums;
using APT.MS.Domain.Enums.SK;
@ -17,7 +18,13 @@ namespace APT.MS.Domain.Entities.SK
{
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit? MineType { get; set; }
public SKProductionUnit? MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查内容
/// </summary>

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

@ -16,7 +16,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
[Description("组织结构")]
[DataFieldForeignKey("Nav_Department")]

11
APT.MS.Domain/Entities/SK/T_SK_CHECK_TYPE.cs
View File

@ -1,4 +1,5 @@
using APT.Infrastructure.Core;
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.BS;
using APT.MS.Domain.Enums.SK;
using System;
@ -52,6 +53,12 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
}
}

9
APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM.cs
View File

@ -147,6 +147,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("驳回意见")]
[DataFieldIngore]
public string CONTEXT { get; set; }
public string CONTEXT { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

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

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums;
@ -31,7 +32,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 辨识区域
/// </summary>

11
APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY.cs
View File

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums;
@ -21,7 +22,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 辨识区域
/// </summary>

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

@ -99,6 +99,14 @@ namespace APT.MS.Domain.Entities.SK
[DataFieldIngore]
public string DEPART_NAME { get; set; }
public string DEPART_NAME { get; set; }
[DataFieldIngore]
public string MINE_NAME { get; set; }
[DataFieldIngore]
public Guid? PRODUCTION_UNIT_ID { get; set; }
}
}

17
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs
View File

@ -49,7 +49,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查区域
/// </summary>
@ -210,6 +216,13 @@ namespace APT.MS.Domain.Entities.SK
/// 导航属性：检查依据
/// </summary>
[Description("导航：检查依据")]
public virtual ICollection<T_SK_HIDDEN_DANGER_CONFIRM_BASIC> Nav_Basics { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_CONFIRM_BASIC> Nav_Basics { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

17
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_HAND_REPORT.cs
View File

@ -36,7 +36,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查区域
@ -75,6 +81,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("是否发布")]
[DataFieldIngore]
public string PUBLISH { get; set; }
public string PUBLISH { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

17
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY.cs
View File

@ -45,7 +45,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 延期整改理由
@ -69,6 +75,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("驳回意见")]
[DataFieldIngore]
public string CONTEXT { get; set; }
public string CONTEXT { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

17
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE.cs
View File

@ -51,7 +51,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查类型
@ -131,6 +137,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("整改落实人")]
public string ImplementUser { get; set; }
[Description("验收人")]
public string AcceptUser { get; set; }
public string AcceptUser { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

17
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs
View File

@ -77,7 +77,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查区域
@ -265,6 +271,13 @@ namespace APT.MS.Domain.Entities.SK
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_BASIC> Nav_RectifyBasics { get; set; }
[Description("备注")]
public string REMARK { get; set; }
public string REMARK { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

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

@ -37,7 +37,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查类型
/// </summary>
@ -100,6 +106,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("驳回意见")]
[DataFieldIngore]
public string CONTEXT { get; set; }
public string CONTEXT { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

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

@ -77,6 +77,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("驳回意见")]
[DataFieldIngore]
public string CONTEXT { get; set; }
public string CONTEXT { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

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

@ -111,11 +111,17 @@ namespace APT.MS.Domain.Entities.SK
public int ENABLE_STATUS { get; set; }
/// <summary>
/// 检查范围
/// 生产单元
/// </summary>
[Description("检查范围")]
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查部门范围

8
APT.MS.Domain/Entities/SK/T_SK_RISK_AREA.cs
View File

@ -47,7 +47,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit? MineType { get; set; }
public SKProductionUnit? MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
}
}

9
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION.cs
View File

@ -73,6 +73,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("是否公司级")]
[EnumName("SKIsStoreEnum")]
public SKIsStoreEnum ISCOMPANY { get; set; }
public SKIsStoreEnum ISCOMPANY { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

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

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums.SK;
@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
[Description("序号")]

9
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY.cs
View File

@ -72,6 +72,13 @@ namespace APT.MS.Domain.Entities.SK
public string CONTEXT { get; set; }
[Description("是否公司级")]
[EnumName("SKIsStoreEnum")]
public SKIsStoreEnum ISCOMPANY { get; set; }
public SKIsStoreEnum ISCOMPANY { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

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

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums.SK;
@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
[Description("序号")]

9
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY.cs
View File

@ -78,6 +78,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("驳回意见")]
[DataFieldIngore]
public string CONTEXT { get; set; }
public string CONTEXT { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

11
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_DETAIL.cs
View File

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums.SK;
@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
[Description("序号")]

9
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT.cs
View File

@ -89,6 +89,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("是否公司级")]
[EnumName("SKIsStoreEnum")]
public SKIsStoreEnum ISCOMPANY { get; set; }
public SKIsStoreEnum ISCOMPANY { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

11
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_DETAIL.cs
View File

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums.SK;
@ -30,7 +31,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
[Description("序号")]

9
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY.cs
View File

@ -87,6 +87,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("是否公司级")]
[EnumName("SKIsStoreEnum")]
public SKIsStoreEnum ISCOMPANY { get; set; }
public SKIsStoreEnum ISCOMPANY { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

11
APT.MS.Domain/Entities/SK/T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL.cs
View File

@ -1,4 +1,5 @@
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Enums.SK;
@ -29,7 +30,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
[Description("序号")]

11
APT.MS.Domain/Entities/SK/T_SK_RISK_TYPE.cs
View File

@ -1,4 +1,5 @@
using APT.Infrastructure.Core;
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Enums;
using System;
using System.Collections.Generic;
@ -31,6 +32,12 @@ namespace APT.MS.Domain.Entities.SK
[FormFieldQuery]
[FormFieldEdit]
[EnumName("STATUSEnum")]
public STATUSEnum STATUS { get; set; }
public STATUSEnum STATUS { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
}
}

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

@ -8,6 +8,7 @@ using APT.MS.Domain.Enums.SK;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace APT.MS.Domain.Entities.SK
@ -29,13 +30,18 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航属性：发起部门")]
public virtual T_FM_DEPARTMENT Nav_ApplyDepartment { get; set; }
/// <summary>
/// 生产单元
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查类型
@ -98,6 +104,13 @@ namespace APT.MS.Domain.Entities.SK
[Description("驳回意见")]
[DataFieldIngore]
public string CONTEXT { get; set; }
public string CONTEXT { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

17
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD.cs
View File

@ -38,7 +38,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查类型
/// </summary>
@ -118,6 +124,13 @@ namespace APT.MS.Domain.Entities.SK
public Guid? RECORD_USER_ID { get; set; }
[Description("导航属性：记录人")]
public virtual T_FM_USER Nav_RecordUser { get; set; }
public virtual T_FM_USER Nav_RecordUser { get; set; }
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

17
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY.cs
View File

@ -40,7 +40,13 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("生产单元")]
[EnumName("SKProductionUnit")]
public SKProductionUnit MineType { get; set; }
public SKProductionUnit MineType { get; set; }
[Description("生产单元")]
[DataFieldForeignKey("Nav_ProductionUnit")]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[Description("导航属性：生产单元")]
public T_FM_USER_PRODUCTION_UNIT_SET Nav_ProductionUnit { get; set; }
/// <summary>
/// 检查类型
/// </summary>
@ -99,6 +105,13 @@ namespace APT.MS.Domain.Entities.SK
/// 是否自动触发
/// </summary>
[Description("是否自动触发")]
public bool ISAUTO { get; set; } = false;
public bool ISAUTO { get; set; } = false;
[Description("发起人部门")]
[DataFieldLength(50)]
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
}
}

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

@ -55,7 +55,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
var result = WitOrderEntities(null, filter);
if (result.Data.Count() > 0)
{
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(filter.OrgId)).ToList();
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && !t.CODE.Contains("admin"), new BaseFilter(filter.OrgId)).ToList();
foreach (var item in result.Data)
{
List<Guid> outPartmentIds = new List<Guid>();
@ -513,7 +513,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
main = entity;
if (entity.Nav_DepartmentUser != null && entity.Nav_DepartmentUser.Any())
{
main.Nav_DepartmentUser = entity.Nav_DepartmentUser.Where(t => !t.Nav_User.CODE.Contains("admin")).ToList();
main.Nav_DepartmentUser = entity.Nav_DepartmentUser.Where(t => !t.Nav_User.CODE.Contains("admin")).OrderBy(m=>m.Nav_User.NUM).ToList();
}
else
{
@ -534,7 +534,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
departmentUser.Add(us);
});
//main.Nav_DepartmentUser = departmentUser.OrderByDescending(e => e.Nav_User.APPROVE_ROLE_ID).ToList();//wyw 有审批角色的显示再前面
main.Nav_DepartmentUser = departmentUser.OrderByDescending(e => e.Nav_User.Nav_ApproveRole?.CODE).ToList();
main.Nav_DepartmentUser = departmentUser.OrderBy(t=>t.Nav_User?.NUM).ThenByDescending(e => e.Nav_User.Nav_ApproveRole?.CODE).ToList();
}
}
}

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

@ -51,6 +51,7 @@ namespace APT.PP.WebApi.Controllers.Api
{
public class CheckListNew
{
public Guid? PRODUCTION_UNIT_ID { get; set; }
public SKProductionUnit Mine { get; set; }
public SKPLANCHECKFREQUENCYEnum Cycle { get; set; }
public SKDepartmentTypeEnum DepartType { get; set; }
@ -624,6 +625,7 @@ namespace APT.PP.WebApi.Controllers.Api
record.SECURITY_INSPECTION_NOTICE_ID = item.ID;
record.ORG_ID = filter.GetOrgId();
record.MineType = item.MineType;
record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.APPLY_DEPARTMENT_ID = item.APPLY_DEPARTMENT_ID;
record.APPLY_USER_ID = item.APPLY_USER_ID;
record.CHECK_TYPE_ID = item.CHECK_TYPE_ID;
@ -1096,6 +1098,7 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_ID = ide.ID;
ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID;
ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType;
ideDetail.AREA_ID = library?.AREA_ID;
ideDetail.RISK_DESCRIPTION = library?.RISK_DESCRIPTION;
@ -1338,6 +1341,7 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_RISK_IDENTIFY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_ID = ide.ID;
ideDetail.PRODUCTION_UNIT_ID = library?.PRODUCTION_UNIT_ID;
ideDetail.MineType = library == null ? SKProductionUnit.Mine : library.MineType;
ideDetail.AREA_ID = library?.AREA_ID;
ideDetail.RISK_DESCRIPTION = library?.RISK_DESCRIPTION;
@ -1517,14 +1521,14 @@ namespace APT.PP.WebApi.Controllers.Api
results.Add(result);
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
var temp = list.Where(m =>m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
//只取有效的部门岗位
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList();
@ -1533,6 +1537,7 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
@ -1647,14 +1652,14 @@ namespace APT.PP.WebApi.Controllers.Api
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.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
//只取有效的部门岗位
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList();
@ -1663,7 +1668,8 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.MineType = item.Key.MineType;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID;
@ -1783,14 +1789,14 @@ namespace APT.PP.WebApi.Controllers.Api
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.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListYes = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.Yes).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
var detailListNo = list.Where(m => m.ENABLE_STATUS == SKEnableStatusEnum.No).GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID }).ToList();
detailListYes.AddRange(detailListNo);
if (detailListYes.Any())
{
foreach (var item in detailListYes)
{
var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
var temp = list.Where(m => m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
//只取有效的部门岗位
var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
var identifyIds = temp.Where(m => m.ENABLE_STATUS == 0).Select(t => t.RISK_IDENTIFY_ID).ToList();
@ -1799,6 +1805,7 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
ideDetail.ORG_ID = filter.OrgId;
ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
ideDetail.MineType = item.Key.MineType;
ideDetail.AREA_ID = item.Key.AREA_ID;
ideDetail.RISK_NAME = item.Key.RISK_NAME;
@ -4911,7 +4918,7 @@ namespace APT.PP.WebApi.Controllers.Api
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin") && t.Nav_Person != null, new BaseFilter(filter.OrgId), "Nav_Person", "Nav_ApproveRole");
var checkCycles = setList.Select(t => t.CHECK_CYCLE).Distinct().ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_ProductionUnit").ToList();
var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
@ -4943,6 +4950,7 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = post?.NAME;
de.MineType = item.MineType;
de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -4962,7 +4970,9 @@ namespace APT.PP.WebApi.Controllers.Api
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = "未配置辨识岗位";
de.MineType = item.MineType;
de.MineType = item.MineType;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -5020,14 +5030,14 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList();
var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType,t.PRODUCTION_UNIT_ID, t.MINE_NAME,t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList();
foreach (var item in group)
{
CheckListNew listNew = new CheckListNew();
listNew.Mine = item.Key.MineType;
listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
listNew.Cycle = item.Key.CHECK_CYCLE;
listNew.DepartType = item.Key.CHECK_TYPE;
listNew.MineType = item.Key.MineType.GetDescription();
listNew.MineType = item.Key.MINE_NAME;
listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
@ -5103,6 +5113,7 @@ namespace APT.PP.WebApi.Controllers.Api
record.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
record.APPLY_USER_ID = userInfo.ID;
record.MineType = item.Mine;
record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.CHECK_TYPE_ID = item.CheckTypeId;
record.PLANCHECKFREQUENCY = item.Cycle;
record.DEPARTMENT_TYPE = item.DepartType;
@ -5197,6 +5208,7 @@ namespace APT.PP.WebApi.Controllers.Api
safeNotice.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
safeNotice.APPLY_USER_ID = userInfo.ID;
safeNotice.MineType = item.Mine;
safeNotice.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
safeNotice.CHECK_TYPE_ID = item.CheckTypeId;
safeNotice.PLANCHECKFREQUENCY = item.Cycle;
safeNotice.DEPARTMENT_TYPE = item.DepartType;

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs
View File

@ -54,7 +54,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_USER_ID == null)
{
entity.APPLY_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
}
}
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID).NAME;
entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
List<Guid> detailIds = new List<Guid>();
List<Guid> detailDepartIds = new List<Guid>();
List<Guid> detailPostIds = new List<Guid>();

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
View File

@ -52,7 +52,9 @@ namespace APT.SK.WebApi.Controllers.Api
var files = entity.Nav_Files;
entity.Nav_Files = null;
var basics = entity.Nav_Basics;
entity.Nav_Basics = null;
entity.Nav_Basics = 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 (string.IsNullOrEmpty(entity.HIDDEN_DESCRIPTION))
{
entity.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;

7
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs
View File

@ -58,7 +58,9 @@ namespace APT.SK.WebApi.Controllers.Api
entity.ORG_ID = orgId;
var files = entity.Nav_ReportFiles;
entity.Nav_ReportFiles = null;
entity.Nav_RiskArea = null;
entity.Nav_RiskArea = 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 (files != null && files.Any())
{
foreach (var item in files)
@ -86,7 +88,8 @@ namespace APT.SK.WebApi.Controllers.Api
confirm = new T_SK_HIDDEN_DANGER_CONFIRM();
confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID;
confirm.ORG_ID = entity.ORG_ID;
confirm.MineType = entity.MineType;
confirm.MineType = entity.MineType;
confirm.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
confirm.APPLY_USER_ID = entity.APPLY_USER_ID;
confirm.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
confirm.RISK_AREA_ID = entity.RISK_AREA_ID;

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

@ -40,7 +40,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_USER_ID == null)
entity.APPLY_USER_ID = userId;
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
entity.APPLY_DEPARTMENT_ID = departId;
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.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.ID == entity.HIDDEN_DANGER_RECTIFY_RECORD_ID);

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

@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_RectifyDetails;
entity.Nav_RectifyDetails = null;
var files = entity.Nav_RectifyFiles;
entity.Nav_RectifyFiles = null;
entity.Nav_RectifyFiles = 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;
List<Guid> deleteFileIds = new List<Guid>();
List<Guid> deleteBasicIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
@ -554,6 +556,7 @@ namespace APT.SK.WebApi.Controllers.Api
record.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = detail.ID;
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + random.Next(1, 999);
record.MineType = notice.MineType;
record.PRODUCTION_UNIT_ID = notice.PRODUCTION_UNIT_ID;
record.RISK_AREA_ID = detail.RISK_AREA_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;

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

@ -47,7 +47,9 @@ namespace APT.SK.WebApi.Controllers
if (entity.APPLY_USER_ID == null)
entity.APPLY_USER_ID = userId;
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
entity.APPLY_DEPARTMENT_ID = departId;
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.IMPLEMENT_USER_ID == entity.ACCEPT_USER_ID)
{
throw new Exception("验收人和落实人不能是同一个人");
@ -70,6 +72,7 @@ namespace APT.SK.WebApi.Controllers
entity.IMPLEMENT_USER_ID = record.IMPLEMENT_USER_ID;
entity.CHECK_TIME = record.CHECK_TIME;
entity.CHECK_PERSON = record.CHECK_PERSON;
entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID;
}
var photoas = entity.Nav_RectifyPhotoas;
entity.Nav_RectifyPhotoas = null;

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

@ -60,7 +60,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_ReportDetails;
entity.Nav_ReportDetails = null;
var files = entity.Nav_ReportFiles;
entity.Nav_ReportFiles = null;
entity.Nav_ReportFiles = 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;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
List<Guid> userIds = new List<Guid>();
List<Guid> deleteFileIds = new List<Guid>();

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

@ -1,254 +1,256 @@
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.IServices.FM;
using APT.BaseData.Domain.IServices;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.SK;
using APT.MS.Domain.Enums;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using log4net.Core;
using APT.MS.Domain.Enums.SK;
using APT.MS.Domain.Entities.FO;
using System;
using System.Collections.Generic;
using System.Linq;
namespace APT.SK.WebApi.Controllers.Api
{
/// <summary>
/// 辨识评估计划
/// </summary>
[Route("api/SK/SKIdentifyEvaluationPlan")]
public partial class IdentifyEvaluationPlanController : AuthorizeApiController<T_SK_IDENTIFY_EVALUATION_PLAN>
{
IPFApproveCallBackService ApproveCallBackService { get; set; }
IFMNotificationTaskService NotificationTaskService { get; set; }
IPFCodeRuleService CodeRuleService { get; set; }
IFMFlowPermitService MFlowPermitService { get; set; }
public IdentifyEvaluationPlanController(IFMNotificationTaskService notificationTaskService, IFMFlowPermitService mFlowPermitService, IPFCodeRuleService codeRuleService, IPFApproveCallBackService approveCallBackService)
{
NotificationTaskService = notificationTaskService;
MFlowPermitService = mFlowPermitService;
CodeRuleService = codeRuleService;
ApproveCallBackService = approveCallBackService;
}
[HttpPost, Route("FullUpdate")]
public JsonActionResult<bool> FullUpdate([FromBody] T_SK_IDENTIFY_EVALUATION_PLAN entity)
{
return SafeExecute<bool>(() =>
{
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
if (entity.APPLY_USER_ID == null)
entity.APPLY_USER_ID = userId;
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
if (entity.START_DATE.Value.Date < DateTime.Now.Date)
{
throw new Exception("辨识开始时间必须大于今天");
}
List<Guid> deleteUserIds = new List<Guid>();
List<Guid> deleteIds = new List<Guid>();
List<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER> userList = new List<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>();
var error1 = details.FirstOrDefault(t => t.DEPARTMENT_ID == null && !t.IS_DELETED);
if (error1 != null)
{
throw new Exception("辨识部门不能为空");
}
var error2 = details.FirstOrDefault(t => t.Nav_DetailUsers == null && !t.IS_DELETED);
if (error2 != null)
{
throw new Exception("辨识人员不能为空");
}
deleteIds = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(t => t.IDENTIFY_EVALUATION_PLAN_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteUserIds = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(t => deleteIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
if (details != null && details.Where(t => !t.IS_DELETED).Any())
{
foreach (var item in details.Where(t => !t.IS_DELETED).ToList())
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
if (item.Nav_DetailUsers != null && item.Nav_DetailUsers.Where(t => !t.IS_DELETED).Any())
{
foreach (var item2 in item.Nav_DetailUsers.Where(t => !t.IS_DELETED).ToList())
{
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_EVALUATION_PLAN_DETAIL_ID = item.ID;
item2.Nav_User = null;
userList.Add(item2);
}
}
item.Nav_DetailUsers = null;
}
}
if (files != null && files.Any())
{
foreach (var item in files)
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var param = "其他";
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
if (department != null)
{
if (department.DEPARTMENT_TYPE == 3 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 0))
{ param = "公司"; }
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();
sysFilter.CodeType = (int)PFCodeRuleType.审批流编码;
sysFilter.Count = 1;
sysFilter.OrgId = entity.ORG_ID;
var codes = CodeRuleService.NewGenSerial(sysFilter);
var serialCode = codes.Split(new char[] { ',' });
MFlowPermitService.InsertApprove(serialCode[0], "SK031", param, entity.ID, "SK031_SHOWPRINT", entity.TaskID, true, () =>
{
if (deleteUserIds != null && deleteUserIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(deleteUserIds);
if (deleteIds != null && deleteIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(deleteIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
}, null, null, null, null, null, "SK031_SHOWPRINT", null, "安全风险辨识与评估计划审批");
return true;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.IServices.FM;
using APT.BaseData.Domain.IServices;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.SK;
using APT.MS.Domain.Enums;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using log4net.Core;
using APT.MS.Domain.Enums.SK;
using APT.MS.Domain.Entities.FO;
using System;
using System.Collections.Generic;
using System.Linq;
namespace APT.SK.WebApi.Controllers.Api
{
/// <summary>
/// 辨识评估计划
/// </summary>
[Route("api/SK/SKIdentifyEvaluationPlan")]
public partial class IdentifyEvaluationPlanController : AuthorizeApiController<T_SK_IDENTIFY_EVALUATION_PLAN>
{
IPFApproveCallBackService ApproveCallBackService { get; set; }
IFMNotificationTaskService NotificationTaskService { get; set; }
IPFCodeRuleService CodeRuleService { get; set; }
IFMFlowPermitService MFlowPermitService { get; set; }
public IdentifyEvaluationPlanController(IFMNotificationTaskService notificationTaskService, IFMFlowPermitService mFlowPermitService, IPFCodeRuleService codeRuleService, IPFApproveCallBackService approveCallBackService)
{
NotificationTaskService = notificationTaskService;
MFlowPermitService = mFlowPermitService;
CodeRuleService = codeRuleService;
ApproveCallBackService = approveCallBackService;
}
[HttpPost, Route("FullUpdate")]
public JsonActionResult<bool> FullUpdate([FromBody] T_SK_IDENTIFY_EVALUATION_PLAN entity)
{
return SafeExecute<bool>(() =>
{
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
if (entity.APPLY_USER_ID == null)
entity.APPLY_USER_ID = userId;
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = 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)
{
throw new Exception("辨识开始时间必须大于今天");
}
List<Guid> deleteUserIds = new List<Guid>();
List<Guid> deleteIds = new List<Guid>();
List<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER> userList = new List<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>();
var error1 = details.FirstOrDefault(t => t.DEPARTMENT_ID == null && !t.IS_DELETED);
if (error1 != null)
{
throw new Exception("辨识部门不能为空");
}
var error2 = details.FirstOrDefault(t => t.Nav_DetailUsers == null && !t.IS_DELETED);
if (error2 != null)
{
throw new Exception("辨识人员不能为空");
}
deleteIds = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(t => t.IDENTIFY_EVALUATION_PLAN_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteUserIds = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(t => deleteIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
if (details != null && details.Where(t => !t.IS_DELETED).Any())
{
foreach (var item in details.Where(t => !t.IS_DELETED).ToList())
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
if (item.Nav_DetailUsers != null && item.Nav_DetailUsers.Where(t => !t.IS_DELETED).Any())
{
foreach (var item2 in item.Nav_DetailUsers.Where(t => !t.IS_DELETED).ToList())
{
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_EVALUATION_PLAN_DETAIL_ID = item.ID;
item2.Nav_User = null;
userList.Add(item2);
}
}
item.Nav_DetailUsers = null;
}
}
if (files != null && files.Any())
{
foreach (var item in files)
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_EVALUATION_PLAN_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var param = "其他";
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
if (department != null)
{
if (department.DEPARTMENT_TYPE == 3 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 0))
{ param = "公司"; }
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();
sysFilter.CodeType = (int)PFCodeRuleType.审批流编码;
sysFilter.Count = 1;
sysFilter.OrgId = entity.ORG_ID;
var codes = CodeRuleService.NewGenSerial(sysFilter);
var serialCode = codes.Split(new char[] { ',' });
MFlowPermitService.InsertApprove(serialCode[0], "SK031", param, entity.ID, "SK031_SHOWPRINT", entity.TaskID, true, () =>
{
if (deleteUserIds != null && deleteUserIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(deleteUserIds);
if (deleteIds != null && deleteIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(deleteIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
}, null, null, null, null, null, "SK031_SHOWPRINT", null, "安全风险辨识与评估计划审批");
return true;
}
this.UnifiedCommit(() =>
{
if (deleteUserIds != null && deleteUserIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(deleteUserIds);
if (deleteIds != null && deleteIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(deleteIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
});
return true;
});
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("SKGet")]
public JsonActionResult<T_SK_IDENTIFY_EVALUATION_PLAN> SKGet([FromBody] KeywordFilter filter)
{
return SafeExecute(() =>
{
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
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"});
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");
if (details.Any())
{
var detailIds = details.Select(t => t.ID).ToList();
var users = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(t => detailIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_User");
foreach (var detail in details)
{
var userTemps = users.Where(t => t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID == detail.ID).ToList();
detail.Nav_DetailUsers = userTemps;
}
}
result.Nav_Details = details.OrderBy(m => m.NUM).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);
}
}
return result;
});
}
/// <summary>
/// 回调函数
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpPost, Route("BackUpdateNew")]
public JsonActionResult<bool> BackUpdateNew([FromBody] T_PF_APPROVE entity)
{
return SafeExecute(() =>
{
return ApproveCallBackService.CallBackNew("SK/SKIdentifyEvaluationPlan/BackUpdateNew", entity);
});
}
/// <summary>
/// 驳回
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpPost, Route("RejectUpdate")]
public JsonActionResult<bool> RejectUpdate([FromBody] T_PF_APPROVE model)
{
return SafeExecute(() =>
{
//公共 获取审批流信息
T_PF_APPROVE modelApp = null;
List<T_PF_APPROVE_DETAIL> listAppDetail = null;
T_FM_NOTIFICATION_TASK taskFinish = null;
string Msg = string.Empty;
bool ResultGetInfo = ApproveCallBackService.GetApproject(model, ref modelApp, ref listAppDetail, ref taskFinish, ref Msg);
if (!ResultGetInfo)
throw new Exception("驳回失败！");
if (modelApp == null || listAppDetail == null)
throw new Exception("获取驳回信息失败！");
var entity = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(model.DATA_ID, new string[] { "Nav_ApplyUser" });
entity.STATUS = PFStandardStatus.Rejected;
T_FM_NOTIFICATION_TASK notice = new T_FM_NOTIFICATION_TASK();
if (entity.APPLY_USER_ID != null)
{
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识与评估计划被驳回", entity.ID, entity.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK031");
}
UnifiedCommit(() =>
{
if (entity != null)
this.UpdateEntityNoCommit(entity);
if (notice != null)
this.UpdateEntityNoCommit(notice);
if (modelApp != null)
UpdateEntityNoCommit(modelApp);
if (listAppDetail != null && listAppDetail.Count > 0)
BantchUpdateEntityNoCommit(listAppDetail);
if (taskFinish != null)
UpdateEntityNoCommit(taskFinish);
});
return true;
//return ApproveCallBackService.CallReject("HM/HMLicenseAnalysis/RejectUpdate", id);
});
}
}
}
this.UnifiedCommit(() =>
{
if (deleteUserIds != null && deleteUserIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(deleteUserIds);
if (deleteIds != null && deleteIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL>(deleteIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (userList != null && userList.Any())
BantchSaveEntityNoCommit(userList);
});
return true;
});
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("SKGet")]
public JsonActionResult<T_SK_IDENTIFY_EVALUATION_PLAN> SKGet([FromBody] KeywordFilter filter)
{
return SafeExecute(() =>
{
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
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"});
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");
if (details.Any())
{
var detailIds = details.Select(t => t.ID).ToList();
var users = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(t => detailIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_User");
foreach (var detail in details)
{
var userTemps = users.Where(t => t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID == detail.ID).ToList();
detail.Nav_DetailUsers = userTemps;
}
}
result.Nav_Details = details.OrderBy(m => m.NUM).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);
}
}
return result;
});
}
/// <summary>
/// 回调函数
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpPost, Route("BackUpdateNew")]
public JsonActionResult<bool> BackUpdateNew([FromBody] T_PF_APPROVE entity)
{
return SafeExecute(() =>
{
return ApproveCallBackService.CallBackNew("SK/SKIdentifyEvaluationPlan/BackUpdateNew", entity);
});
}
/// <summary>
/// 驳回
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpPost, Route("RejectUpdate")]
public JsonActionResult<bool> RejectUpdate([FromBody] T_PF_APPROVE model)
{
return SafeExecute(() =>
{
//公共 获取审批流信息
T_PF_APPROVE modelApp = null;
List<T_PF_APPROVE_DETAIL> listAppDetail = null;
T_FM_NOTIFICATION_TASK taskFinish = null;
string Msg = string.Empty;
bool ResultGetInfo = ApproveCallBackService.GetApproject(model, ref modelApp, ref listAppDetail, ref taskFinish, ref Msg);
if (!ResultGetInfo)
throw new Exception("驳回失败！");
if (modelApp == null || listAppDetail == null)
throw new Exception("获取驳回信息失败！");
var entity = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(model.DATA_ID, new string[] { "Nav_ApplyUser" });
entity.STATUS = PFStandardStatus.Rejected;
T_FM_NOTIFICATION_TASK notice = new T_FM_NOTIFICATION_TASK();
if (entity.APPLY_USER_ID != null)
{
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识与评估计划被驳回", entity.ID, entity.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK031");
}
UnifiedCommit(() =>
{
if (entity != null)
this.UpdateEntityNoCommit(entity);
if (notice != null)
this.UpdateEntityNoCommit(notice);
if (modelApp != null)
UpdateEntityNoCommit(modelApp);
if (listAppDetail != null && listAppDetail.Count > 0)
BantchUpdateEntityNoCommit(listAppDetail);
if (taskFinish != null)
UpdateEntityNoCommit(taskFinish);
});
return true;
//return ApproveCallBackService.CallReject("HM/HMLicenseAnalysis/RejectUpdate", id);
});
}
}
}

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -50,7 +50,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.Nav_Files = 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;
List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDepartIds = new List<Guid>();
List<Guid> deletePostIds = new List<Guid>();

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs
View File

@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.Nav_Files = 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;
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART> departList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST> postList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>();

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

@ -51,7 +51,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.Nav_Files = 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;
List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>();

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -50,7 +50,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.Nav_Files = 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;
List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDepartIds = new List<Guid>();
List<Guid> deletePostIds = new List<Guid>();

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
View File

@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
entity.Nav_Files = 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;
List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDepartIds = new List<Guid>();
List<Guid> deletePostIds = new List<Guid>();

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

@ -129,6 +129,8 @@ namespace APT.SK.WebApi.Controllers.Api
throw new Exception("检查类型不能为空");
if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
throw new Exception("检查时间必须填写");
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;
var details = entity.Nav_CheckNoticeDetails;
entity.Nav_CheckNoticeDetails = null;
var files = entity.Nav_CheckNoticeFiles;

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

@ -56,7 +56,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_CheckRecordDetails;
entity.Nav_CheckRecordDetails = null;
var files = entity.Nav_CheckRecordFiles;
entity.Nav_CheckRecordFiles = null;
entity.Nav_CheckRecordFiles = 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;
List<Guid> deleteUserIds = new List<Guid>();
List<Guid> deleteFileIds = new List<Guid>();
List<Guid> deleteBasicIds = new List<Guid>();
@ -457,7 +459,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.CHECK_TYPE_ID == null)
throw new Exception("检查类型不能为空");
if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
throw new Exception("检查时间必须填写");
throw new Exception("检查时间必须填写");
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;
var details = entity.Nav_CheckRecordDetails;
entity.Nav_CheckRecordDetails = null;
var files = entity.Nav_CheckRecordFiles;
@ -649,7 +653,8 @@ namespace APT.SK.WebApi.Controllers.Api
summary.SECURITY_INSPECTION_NOTICE_ID = notice != null ? notice.ID : null;
summary.APPLY_DEPARTMENT_ID = notice != null ? notice.APPLY_DEPARTMENT_ID : entity.APPLY_DEPARTMENT_ID;
summary.APPLY_USER_ID = notice != null ? notice.APPLY_USER_ID : entity.APPLY_USER_ID;
summary.MineType = notice != null ? notice.MineType : entity.MineType;
summary.MineType = notice != null ? notice.MineType : entity.MineType;
summary.PRODUCTION_UNIT_ID = notice != null ? notice.PRODUCTION_UNIT_ID : entity.PRODUCTION_UNIT_ID;
summary.CHECK_TYPE_ID = notice != null ? notice.CHECK_TYPE_ID : entity.CHECK_TYPE_ID;
summary.PLANCHECKFREQUENCY = notice != null ? notice.PLANCHECKFREQUENCY : entity.PLANCHECKFREQUENCY;
summary.DEPARTMENT_TYPE = notice != null ? notice.DEPARTMENT_TYPE : entity.DEPARTMENT_TYPE;
@ -982,7 +987,8 @@ namespace APT.SK.WebApi.Controllers.Api
report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = record.ID;
report.APPLY_USER_ID = entity.APPLY_USER_ID;
report.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
report.MineType = record.MineType;
report.MineType = record.MineType;
report.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID;
report.CHECK_TYPE_ID = record.CHECK_TYPE_ID;
report.PLANCHECKFREQUENCY = record.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE;

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

@ -48,7 +48,9 @@ namespace APT.SK.WebApi.Controllers.Api
var details = entity.Nav_CheckRecordDetails;
entity.Nav_CheckRecordDetails = null;
var files = entity.Nav_CheckRecordFiles;
entity.Nav_CheckRecordFiles = null;
entity.Nav_CheckRecordFiles = 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;
List<Guid> userIds = new List<Guid>();
List<Guid> deleteUserIds = new List<Guid>();
List<Guid> deleteFileIds = new List<Guid>();
@ -190,6 +192,7 @@ namespace APT.SK.WebApi.Controllers.Api
report.APPLY_USER_ID = entity.APPLY_USER_ID;
report.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
report.MineType = entity.MineType;
report.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
report.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
report.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
@ -358,7 +361,8 @@ namespace APT.SK.WebApi.Controllers.Api
report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = record.ID;
report.APPLY_USER_ID = record.APPLY_USER_ID;
report.APPLY_DEPARTMENT_ID = record.APPLY_DEPARTMENT_ID;
report.MineType = record.MineType;
report.MineType = record.MineType;
report.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID;
report.CHECK_TYPE_ID = record.CHECK_TYPE_ID;
report.PLANCHECKFREQUENCY = record.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE;
@ -506,7 +510,8 @@ namespace APT.SK.WebApi.Controllers.Api
report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = record.ID;
report.APPLY_USER_ID = record.APPLY_USER_ID;
report.APPLY_DEPARTMENT_ID = record.APPLY_DEPARTMENT_ID;
report.MineType = record.MineType;
report.MineType = record.MineType;
report.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID;
report.CHECK_TYPE_ID = record.CHECK_TYPE_ID;
report.PLANCHECKFREQUENCY = record.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE;