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-20 13:03:07 +08:00
parent 6378e8315a
commit ba82182c72
28 changed files with 3415 additions and 850 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12699,8 +12699,9 @@ builder.Property(t => t.CHECK_STANDARD).HasMaxLength(500);
builder.Ignore(t => t.MineType);
builder.Ignore(t => t.AREA_ID);
builder.Ignore(t => t.AREA_NAME);
builder.Ignore(t => t.Nav_Area);
}
builder.Ignore(t => t.Nav_Area);
builder.Ignore(t => t.RISK_NAME);
}
}
#endregion
#region EnterpriseLibraryDetailContentBasic
@ -12726,8 +12727,13 @@ builder.HasOne(t => t.Nav_CheckType).WithMany().HasForeignKey(t => t.CHECK_TYPE_
builder.Ignore(t => t.MineType);
builder.Ignore(t => t.AREA_NAME);
builder.Ignore(t => t.POST_NAME);
builder.Ignore(t => t.Nav_ContentDatas);
}
builder.Ignore(t => t.Nav_ContentDatas);
builder.Ignore(t => t.TYPE_NAME);
builder.Ignore(t => t.DEPART_NAME);
builder.Ignore(t => t.ENTERPRISE_LIBRARY_DETAIL_ID);
builder.Ignore(t => t.ENTERPRISE_LIBRARY_ID);
builder.Ignore(t => t.POST_ID);
}
}
#endregion
#region EnterpriseLibraryDetailContentHidden

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

@ -99,6 +99,10 @@ namespace APT.MS.Domain.Entities.SK
/// </summary>
[Description("检查依据")]
[FormFieldEdit]
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC> Nav_DetailBasics { get; set; }
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC> Nav_DetailBasics { get; set; }
[DataFieldIngore]
public string RISK_NAME { get; set; }
}
}

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

@ -79,6 +79,26 @@ namespace APT.MS.Domain.Entities.SK
public string POST_NAME { get; set; }
[Description("检查内容")]
[DataFieldIngore]
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT> Nav_ContentDatas { get; set; }
public ICollection<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT> Nav_ContentDatas { get; set; }
[DataFieldIngore]
public Guid? ENTERPRISE_LIBRARY_DETAIL_ID { get; set; }
[DataFieldIngore]
public Guid? ENTERPRISE_LIBRARY_ID { get; set; }
[DataFieldIngore]
public Guid? POST_ID { get; set; }
[DataFieldIngore]
public string TYPE_NAME { get; set; }
[DataFieldIngore]
public string DEPART_NAME { get; set; }
}
}

15
APT.MS.Domain/Enums/SK/SKEnums.cs
View File

@ -124,15 +124,13 @@ namespace APT.MS.Domain.Enums.SK
public enum SKDepartmentTypeEnum
{
[Description("部门级")]
部门级 = 0,
部门级 = 10,
[Description("车间级")]
车间级 = 1,
车间级 = 15,
[Description("班组级")]
班组级 = 2,
班组级 = 20,
[Description("公司级")]
公司级 = 3,
[Description("岗位级")]
岗位级 = 4,
公司级 = 5
}
public enum SKPLANCHECKFREQUENCYEnum
{
@ -185,11 +183,6 @@ namespace APT.MS.Domain.Enums.SK
/// </summary>
[Description("每年")]
Year = 60,
/// <summary>
/// 每班
/// </summary>
[Description("每班")]
Class = 70,
}
public enum SKEnableStatusEnum
{

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

File diff suppressed because it is too large Load Diff

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

@ -94,9 +94,9 @@ namespace APT.SK.WebApi.Controllers
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN> libraryHiddenList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC> libraryBasicList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC>();
//同步企业库
if (entity.PUBLISH!=null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var library= this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == entity.MineType && t.AREA_ID ==entity.AREA_ID && t.TYPE_ID == entity.TYPE_ID && t.RISK_NAME == entity.RISK_NAME && t.RISK_DESCRIPTION ==entity.RISK_DESCRIPTION);
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var library = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == entity.MineType && t.AREA_ID == entity.AREA_ID && t.TYPE_ID == entity.TYPE_ID && t.RISK_NAME == entity.RISK_NAME && t.RISK_DESCRIPTION == entity.RISK_DESCRIPTION);
if (library != null)
{
libraryIds.Add(library.ID);
@ -109,86 +109,86 @@ namespace APT.SK.WebApi.Controllers
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();
departIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
postIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => departIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
}
enterpriseLib = new T_SK_ENTERPRISE_LIBRARY();
enterpriseLib.ID = entity.ID;
enterpriseLib.ORG_ID = entity.ORG_ID;
enterpriseLib.ENABLE_STATUS = entity.ENABLE_STATUS;
enterpriseLib.MineType = entity.MineType;
enterpriseLib.MINE_NAME = entity.MINE_NAME;
enterpriseLib.AREA_ID = entity.AREA_ID;
enterpriseLib.AREA_NAME = entity.AREA_NAME;
enterpriseLib.RISK_NAME = entity.RISK_NAME;
enterpriseLib.RISK_DESCRIPTION = entity.RISK_DESCRIPTION;
enterpriseLib.TYPE_ID = entity.TYPE_ID;
enterpriseLib.TYPE_NAME = entity.TYPE_NAME;
enterpriseLib.EVALUATE_L = entity.EVALUATE_L;
enterpriseLib.EVALUATE_E = entity.EVALUATE_E;
enterpriseLib.EVALUATE_C = entity.EVALUATE_C;
enterpriseLib.EVALUATE_SCORE = entity.EVALUATE_SCORE;
enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL;
enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
enterpriseLib.NUM = entity.NUM;
if (details != null && details.Any())
{
foreach (var item in details)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_ID = item.BASIC_LIBRARY_ID;
enterDetail.MEASURES_NAME = item.MEASURES_NAME;
enterDetail.NUM = item.NUM;
enterDetail.EMERGENCY = item.EMERGENCY;
libraryDetailList.Add(enterDetail);
}
}
if (contentList != null && contentList.Any())
{
foreach (var item in contentList)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_DETAIL_ID = item.BASIC_LIBRARY_DETAIL_ID;
enterDetail.CHECK_CONTENT = item.CHECK_CONTENT;
enterDetail.NUM = item.NUM;
enterDetail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
enterDetail.CHECK_BASIC = item.CHECK_BASIC;
enterDetail.CHECK_STANDARD = item.CHECK_STANDARD;
enterDetail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
enterDetail.CHECK_BASIC = item.CHECK_BASIC;
libraryContentList.Add(enterDetail);
}
}
if (basicList != null && basicList.Any())
{
foreach (var item in basicList)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item.BASIC_LIBRARY_DETAIL_CONTENT_ID;
enterDetail.LAW_ID = item.LAW_ID;
libraryBasicList.Add(enterDetail);
}
}
if (hiddenList != null && hiddenList.Any())
{
foreach (var item in hiddenList)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item.BASIC_LIBRARY_DETAIL_CONTENT_ID;
enterDetail.RECTIFICATION_MEASURES = item.RECTIFICATION_MEASURES;
enterDetail.NUM = item.NUM;
enterDetail.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID;
enterDetail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
enterDetail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
libraryHiddenList.Add(enterDetail);
}
}
enterpriseLib = new T_SK_ENTERPRISE_LIBRARY();
enterpriseLib.ID = entity.ID;
enterpriseLib.ORG_ID = entity.ORG_ID;
enterpriseLib.ENABLE_STATUS = entity.ENABLE_STATUS;
enterpriseLib.MineType = entity.MineType;
enterpriseLib.MINE_NAME = entity.MINE_NAME;
enterpriseLib.AREA_ID = entity.AREA_ID;
enterpriseLib.AREA_NAME = entity.AREA_NAME;
enterpriseLib.RISK_NAME = entity.RISK_NAME;
enterpriseLib.RISK_DESCRIPTION = entity.RISK_DESCRIPTION;
enterpriseLib.TYPE_ID = entity.TYPE_ID;
enterpriseLib.TYPE_NAME = entity.TYPE_NAME;
enterpriseLib.EVALUATE_L = entity.EVALUATE_L;
enterpriseLib.EVALUATE_E = entity.EVALUATE_E;
enterpriseLib.EVALUATE_C = entity.EVALUATE_C;
enterpriseLib.EVALUATE_SCORE = entity.EVALUATE_SCORE;
enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL;
enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
enterpriseLib.NUM = entity.NUM;
if (details != null && details.Any())
{
foreach (var item in details)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_ID = item.BASIC_LIBRARY_ID;
enterDetail.MEASURES_NAME = item.MEASURES_NAME;
enterDetail.NUM = item.NUM;
enterDetail.EMERGENCY = item.EMERGENCY;
libraryDetailList.Add(enterDetail);
}
}
if (contentList != null && contentList.Any())
{
foreach (var item in contentList)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_DETAIL_ID = item.BASIC_LIBRARY_DETAIL_ID;
enterDetail.CHECK_CONTENT = item.CHECK_CONTENT;
enterDetail.NUM = item.NUM;
enterDetail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
enterDetail.CHECK_BASIC = item.CHECK_BASIC;
enterDetail.CHECK_STANDARD = item.CHECK_STANDARD;
enterDetail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
enterDetail.CHECK_BASIC = item.CHECK_BASIC;
libraryContentList.Add(enterDetail);
}
}
if (basicList != null && basicList.Any())
{
foreach (var item in basicList)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item.BASIC_LIBRARY_DETAIL_CONTENT_ID;
enterDetail.LAW_ID = item.LAW_ID;
libraryBasicList.Add(enterDetail);
}
}
if (hiddenList != null && hiddenList.Any())
{
foreach (var item in hiddenList)
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN enterDetail = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN();
enterDetail.ORG_ID = item.ORG_ID;
enterDetail.ID = item.ID;
enterDetail.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item.BASIC_LIBRARY_DETAIL_CONTENT_ID;
enterDetail.RECTIFICATION_MEASURES = item.RECTIFICATION_MEASURES;
enterDetail.NUM = item.NUM;
enterDetail.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID;
enterDetail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
enterDetail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
libraryHiddenList.Add(enterDetail);
}
}
}
this.UnifiedCommit(() =>
{
@ -290,7 +290,7 @@ namespace APT.SK.WebApi.Controllers
[HttpPost, Route("SKOrderEntities")]
public JsonActionResult<IEnumerable<T_SK_BASIC_LIBRARY>> SKOrderEntities([FromBody] KeywordFilter filter)
{
var result = WitOrderEntities(null, filter);
var result = WitOrderEntities(null, filter);
if (result != null && result.Data != null)
{
if (result.Data != null && result.Data.Any())
@ -306,7 +306,7 @@ namespace APT.SK.WebApi.Controllers
var measureStr = new List<string>();
if (item.Nav_Details != null && item.Nav_Details.Any())
{
foreach (var item2 in item.Nav_Details.OrderBy(t=>t.NUM))
foreach (var item2 in item.Nav_Details.OrderBy(t => t.NUM))
{
var i = 1;
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
@ -384,8 +384,8 @@ namespace APT.SK.WebApi.Controllers
foreach (var item2 in contentStr)
{
if (!string.IsNullOrEmpty(item2))
{
var temp = i+ "、" + item2 + "\r\n";
{
var temp = i + "、" + item2 + "\r\n";
item.CHECKCONTENTS = item.CHECKCONTENTS + temp;
i++;
}
@ -478,7 +478,7 @@ namespace APT.SK.WebApi.Controllers
var result = WitEntity(null, filter);
if (result != null && result.Data != null)
{
if (result.Data.Nav_Details!= null && result.Data.Nav_Details.Any())
if (result.Data.Nav_Details != null && result.Data.Nav_Details.Any())
{
foreach (var item in result.Data.Nav_Details)
{

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

@ -52,6 +52,11 @@ namespace APT.SK.WebApi.Controllers.Api
{
return SafeExecute<bool>(() =>
{
var olds = this.GetEntity<T_SK_CHECK_CONTENTS>(t => !t.IS_DELETED && t.CHECKCONTENT == entity.CHECKCONTENT && t.ID != entity.ID);
if (olds != null)
{
throw new Exception("检查内容重复，请先修改");
}
var details = entity.Nav_ListCheckQuestion;
entity.Nav_ListCheckQuestion = null;
if (details != null && details.Any())
@ -62,13 +67,24 @@ namespace APT.SK.WebApi.Controllers.Api
item.CHECK_CONTENTS_ID = entity.ID;
}
}
var basics = entity.Nav_ContentsBasics;
entity.Nav_ContentsBasics = null;
if (basics != null && basics.Any())
{
foreach (var item in basics)
{
item.ORG_ID = entity.ORG_ID;
item.CHECK_CONTENTS_ID = entity.ID;
}
}
this.UnifiedCommit(() =>
{
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
});
return true;
});
@ -136,8 +152,8 @@ namespace APT.SK.WebApi.Controllers.Api
startRowIndexs.Add(0, 1);//根据Excel格式数据赋值
var dataTables = FileUtils.ReadExcelByOledb(filePath, startRowIndexs);
string Msg = string.Empty;
isOK = InsertModel(dataTables.Tables[0], orgId, ref Msg);
isOK = InsertModel(dataTables.Tables[0], orgId, ref Msg);
try
{
System.IO.File.Delete(filePath);
@ -172,7 +188,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
List<T_SK_CHECK_CONTENTS> contents = new List<T_SK_CHECK_CONTENTS>();
List<T_SK_CHECK_QUESTION> qustions = new List<T_SK_CHECK_QUESTION>();
Guid? checkId=null;
Guid? checkId = null;
var baseFilter = new BaseFilter(orgId);
var oldContents = this.GetEntities<T_SK_CHECK_CONTENTS>(i => i.IS_DELETED == false, baseFilter, "Nav_ListCheckQuestion");
for (int i = 0; i < rowAll; i++)

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

@ -55,6 +55,8 @@ namespace APT.SK.WebApi.Controllers.Api
{
List<T_SK_CHECK_SET_CONTENTS_HIDDEN> hiddens = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
List<T_SK_CHECK_SET_CONTENTS_BASIC> basics = new List<T_SK_CHECK_SET_CONTENTS_BASIC>();
List<T_SK_CHECK_SET_CONTENTS_AREA> areas = new List<T_SK_CHECK_SET_CONTENTS_AREA>();
List<T_SK_CHECK_SET_CONTENTS_AREA_RISK> risks = new List<T_SK_CHECK_SET_CONTENTS_AREA_RISK>();
var details = entity.Nav_CheckSetContents;
entity.Nav_CheckSetContents = null;
if (details != null && details.Any())
@ -83,9 +85,29 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
item.Nav_ContentsBasics = null;
if (item.Nav_ContentsAreas != null && item.Nav_ContentsAreas.Any())
{
foreach (var item2 in item.Nav_ContentsAreas)
{
item2.ORG_ID = entity.ORG_ID;
item2.CHECK_SET_CONTENTS_ID = item.ID;
areas.Add(item2);
if (item2.Nav_ContentsAreaRisks != null && item2.Nav_ContentsAreaRisks.Any())
{
foreach (var item3 in item2.Nav_ContentsAreaRisks)
{
item3.ORG_ID = entity.ORG_ID;
item3.CHECK_SET_CONTENTS_AREA_ID = item2.ID;
risks.Add(item3);
}
}
item2.Nav_ContentsAreaRisks = null;
}
}
item.Nav_ContentsAreas = null;
}
}
}
this.UnifiedCommit(() =>
{
if (entity != null)
@ -96,6 +118,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(hiddens);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
if (areas != null && areas.Any())
BantchSaveEntityNoCommit(areas);
if (risks != null && risks.Any())
BantchSaveEntityNoCommit(risks);
});
return true;
});
@ -309,8 +335,8 @@ namespace APT.SK.WebApi.Controllers.Api
set.ORG_ID = orgId;
set.ID = Guid.NewGuid();
set.MineType = mintype;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Class;
set.CHECK_TYPE = SKDepartmentTypeEnum.岗位级;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Date;
set.CHECK_TYPE = SKDepartmentTypeEnum.班组级;
set.CHECK_TYPE_ID = checkType?.ID;
set.DEPARTMENT_ID = de.ID;
set.POST_ID = po;
@ -318,7 +344,7 @@ namespace APT.SK.WebApi.Controllers.Api
set.HIDDEN_DESCRIPTION = hidden;
set.RECTIFICATION_MEASURES = measure;
set.AREA_NAME = areaName;
set.RISK_NAME = riskName;
set.RISK_NAME = riskName;
sets.Add(set);
}
}
@ -326,7 +352,7 @@ namespace APT.SK.WebApi.Controllers.Api
else if (post.Contains("，"))
{
var temp = post.Split("，").ToList();
var postIdTemps = posts.Where(t => temp.Contains(t.NAME)).Select(m=>m.ID).ToList();
var postIdTemps = posts.Where(t => temp.Contains(t.NAME)).Select(m => m.ID).ToList();
var postIds = users.Where(t => t.DEPARTMENT_ID == de.ID && postIdTemps.Contains((Guid)t.Nav_Person.POST_ID)).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
if (postIds.Any())
{
@ -336,8 +362,8 @@ namespace APT.SK.WebApi.Controllers.Api
set.ORG_ID = orgId;
set.ID = Guid.NewGuid();
set.MineType = mintype;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Class;
set.CHECK_TYPE = SKDepartmentTypeEnum.岗位级;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Date;
set.CHECK_TYPE = SKDepartmentTypeEnum.班组级;
set.CHECK_TYPE_ID = checkType?.ID;
set.DEPARTMENT_ID = de.ID;
set.POST_ID = po;
@ -362,8 +388,8 @@ namespace APT.SK.WebApi.Controllers.Api
set.ORG_ID = orgId;
set.ID = Guid.NewGuid();
set.MineType = mintype;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Class;
set.CHECK_TYPE = SKDepartmentTypeEnum.岗位级;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Date;
set.CHECK_TYPE = SKDepartmentTypeEnum.班组级;
set.CHECK_TYPE_ID = checkType?.ID;
set.DEPARTMENT_ID = de.ID;
set.POST_ID = postId.Nav_Person.POST_ID;
@ -395,8 +421,8 @@ namespace APT.SK.WebApi.Controllers.Api
set.ORG_ID = orgId;
set.ID = Guid.NewGuid();
set.MineType = mintype;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Class;
set.CHECK_TYPE = SKDepartmentTypeEnum.岗位级;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Date;
set.CHECK_TYPE = SKDepartmentTypeEnum.班组级;
set.CHECK_TYPE_ID = checkType?.ID;
set.DEPARTMENT_ID = departTemp.ID;
set.POST_ID = po;
@ -422,8 +448,8 @@ namespace APT.SK.WebApi.Controllers.Api
set.ORG_ID = orgId;
set.ID = Guid.NewGuid();
set.MineType = mintype;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Class;
set.CHECK_TYPE = SKDepartmentTypeEnum.岗位级;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Date;
set.CHECK_TYPE = SKDepartmentTypeEnum.班组级;
set.CHECK_TYPE_ID = checkType?.ID;
set.DEPARTMENT_ID = departTemp.ID;
set.POST_ID = po;
@ -448,8 +474,8 @@ namespace APT.SK.WebApi.Controllers.Api
set.ORG_ID = orgId;
set.ID = Guid.NewGuid();
set.MineType = mintype;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Class;
set.CHECK_TYPE = SKDepartmentTypeEnum.岗位级;
set.CHECK_CYCLE = SKPLANCHECKFREQUENCYEnum.Date;
set.CHECK_TYPE = SKDepartmentTypeEnum.班组级;
set.CHECK_TYPE_ID = checkType?.ID;
set.DEPARTMENT_ID = departTemp.ID;
set.POST_ID = postId.Nav_Person.POST_ID;
@ -491,7 +517,7 @@ namespace APT.SK.WebApi.Controllers.Api
set.DEPARTMENT_ID = item.Key.DEPARTMENT_ID;
set.POST_ID = item.Key.POST_ID;
addSets.Add(set);
var contentsTemps= laws.Where(t => t.MineType == item.Key.MineType && t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.POST_ID == item.Key.POST_ID && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE).ToList();
var contentsTemps = laws.Where(t => t.MineType == item.Key.MineType && t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.POST_ID == item.Key.POST_ID && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE).ToList();
if (contentsTemps.Any())
{
var distinctContents = contentsTemps.Select(t => t.CHECK_CONTENT).Distinct().ToList();
@ -512,7 +538,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item3 in hiddenTemps)
{
if (item3 != null && !string.IsNullOrEmpty(item3.HIDDEN_DESCRIPTION))
if (item3 != null && !string.IsNullOrEmpty(item3.HIDDEN_DESCRIPTION))
{
var ques = checkQuestions.FirstOrDefault(t => t.DESCREPTION == item3.HIDDEN_DESCRIPTION);
T_SK_CHECK_SET_CONTENTS_HIDDEN hid = new T_SK_CHECK_SET_CONTENTS_HIDDEN();
@ -546,7 +572,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
if (item4 == "所有风险")
{
var libraryTempIds = librarys.Where(t => t.MineType == item.Key.MineType && t.AREA_ID == area.ID).Select(t=>t.RISK_NAME_ID).Distinct().ToList();
var libraryTempIds = librarys.Where(t => t.MineType == item.Key.MineType && t.AREA_ID == area.ID).Select(t => t.RISK_NAME_ID).Distinct().ToList();
if (libraryTempIds.Any())
{
foreach (var item5 in libraryTempIds)
@ -581,7 +607,7 @@ namespace APT.SK.WebApi.Controllers.Api
risk.CHECK_SET_CONTENTS_AREA_ID = are.ID;
risk.RISK_NAME_ID = item5.ID;
addSetAreaRisks.Add(risk);
}
}
}
}
}
@ -669,7 +695,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
throw new Exception("导入必须两条以上，一条请直接新增");
}
List<ImportDetails> imports= new List<ImportDetails>();
List<ImportDetails> imports = new List<ImportDetails>();
int j = 1;
for (int i = 0; i < rowAll; i++)
{
@ -723,7 +749,7 @@ namespace APT.SK.WebApi.Controllers.Api
set.DepartType = SKDepartmentTypeEnum.公司级;
break;
case "岗位级":
set.DepartType = SKDepartmentTypeEnum.岗位级;
set.DepartType = SKDepartmentTypeEnum.班组级;
break;
default:
set.DepartType = SKDepartmentTypeEnum.公司级;
@ -745,7 +771,7 @@ namespace APT.SK.WebApi.Controllers.Api
switch (checkCycle)
{
case "每班":
set.CheckCycle = SKPLANCHECKFREQUENCYEnum.Class;
set.CheckCycle = SKPLANCHECKFREQUENCYEnum.Date;
break;
case "每天":
set.CheckCycle = SKPLANCHECKFREQUENCYEnum.Date;
@ -778,7 +804,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_CHECK_SET_CONTENTS_AREA_RISK> addSetAreaRisks = new List<T_SK_CHECK_SET_CONTENTS_AREA_RISK>();
if (imports.Any())
{
var departLevelGroups = imports.GroupBy(t => new { t.MineType,t.DepartType,t.CheckTypeId,t.CheckCycle }).ToList();
var departLevelGroups = imports.GroupBy(t => new { t.MineType, t.DepartType, t.CheckTypeId, t.CheckCycle }).ToList();
if (departLevelGroups.Any())
{
foreach (var item in departLevelGroups)
@ -792,7 +818,7 @@ namespace APT.SK.WebApi.Controllers.Api
set.CHECK_TYPE_ID = item.Key.CheckTypeId;
addSets.Add(set);
var contents = imports.Where(t => t.MineType == item.Key.MineType && t.DepartType == item.Key.DepartType && t.CheckCycle == item.Key.CheckCycle && t.CheckTypeId == item.Key.CheckTypeId).ToList();
var contentGroups = contents.GroupBy(t => new { t.MineType, t.DepartType, t.CheckTypeId, t.CheckCycle,t.CheckContent }).ToList();
var contentGroups = contents.GroupBy(t => new { t.MineType, t.DepartType, t.CheckTypeId, t.CheckCycle, t.CheckContent }).ToList();
if (contentGroups.Any())
{
foreach (var item2 in contentGroups)
@ -822,7 +848,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
var areaList = new List<string>();
var areaTemps = contents.Where(t => t.CheckContent == item2.Key.CheckContent).Select(m=>m.Areas).ToList();
var areaTemps = contents.Where(t => t.CheckContent == item2.Key.CheckContent).Select(m => m.Areas).ToList();
if (areaTemps.Any())
{
foreach (var item3 in areaTemps)
@ -934,7 +960,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_CHECK_TYPE> addSets = new List<T_SK_CHECK_TYPE>();
if (imports.Any())
{
var departLevelGroups = imports.GroupBy(t => new { t.CheckContent }).ToList();
var departLevelGroups = imports.GroupBy(t => new { t.CheckContent }).ToList();
if (departLevelGroups.Any())
{
foreach (var item in departLevelGroups)

32
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckTypeController.cs
View File

@ -1,7 +1,10 @@
using APT.Infrastructure.Core;
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.SK;
using APT.MS.Domain.Enums.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Linq;
namespace APT.SK.WebApi.Controllers.Api
@ -22,6 +25,11 @@ namespace APT.SK.WebApi.Controllers.Api
{
return SafeExecute<bool>(() =>
{
var olds = this.GetEntity<T_SK_CHECK_TYPE>(t => !t.IS_DELETED && t.MineType == entity.MineType && t.NAME == entity.NAME && t.ID != entity.ID);
if (olds != null)
{
throw new Exception("该生产单元检查类型已存在，请先修改");
}
var details = entity.Nav_CheckCycle;
entity.Nav_CheckCycle = null;
if (details != null && details.Any())
@ -43,5 +51,27 @@ namespace APT.SK.WebApi.Controllers.Api
return true;
});
}
/// <summary>
/// 查询
/// </summary>
/// <param name="pageFilter"></param>
/// <returns></returns>
[HttpPost, Route("OrderPagedNew")]
public PagedActionResult<T_SK_CHECK_TYPE> OrderPagedNew([FromBody] KeywordPageFilter pageFilter)
{
var result = new PagedActionResult<T_SK_CHECK_TYPE>();
if (!string.IsNullOrEmpty(pageFilter.Keyword))
{
if (pageFilter.Keyword != "0")
{
FilterRule order2 = new FilterRule();
order2.Field = "MineType";
order2.Value = (SKProductionUnit)(int.Parse(pageFilter.Keyword));
pageFilter.FilterGroup.Rules.Add(order2);
}
}
result = GetOrderPageEntities<T_SK_CHECK_TYPE>(null, pageFilter);
return result;
}
}
}

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

@ -146,8 +146,8 @@ namespace APT.SK.WebApi.Controllers.Api
item3.Nav_DetailMeasureContentBasics = null;
item3.Nav_DetailMeasureContentPosts = null;
}
}
}
item2.ORG_ID = entity.ORG_ID;
item2.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = item.ID;
item2.Nav_DetailMeasureContents = null;
@ -155,13 +155,13 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
var departType = "";
if (item.Nav_DetailPosts!=null && item.Nav_DetailPosts.Any())
if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
{
foreach (var item2 in item.Nav_DetailPosts)
{
item2.ORG_ID = entity.ORG_ID;
item2.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = item.ID;
departType = departType + item2.DEPARTMENT_TYPE.GetDescription()+",";
departType = departType + item2.DEPARTMENT_TYPE.GetDescription() + ",";
detailPostList.Add(item2);
}
}

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

@ -29,6 +29,13 @@ using System.IO;
using Org.BouncyCastle.Utilities;
using Microsoft.Extensions.Logging;
using APT.BaseData.Domain.Enums.PF;
using APT.MS.Data.Mapping;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using log4net.Core;
using System.Reflection.Metadata;
using APT.MS.Domain.Entities.PF;
using Google.Protobuf.Collections;
using Microsoft.Extensions.Hosting;
namespace APT.SK.WebApi.Controllers.Api
{
@ -54,6 +61,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
public class CheckListDetail
{
public string RISK_NAME { get; set; }
public Guid? RISK_AREA_ID { get; set; }
public string RISK_AREA_NAME { get; set; }
@ -65,6 +73,19 @@ namespace APT.SK.WebApi.Controllers.Api
public string CHECKSTANDARD { get; set; }
}
public class CheckListNew
{
public string MineType { get; set; }
public string CheckType { get; set; }
public string CheckCycle { get; set; }
public string CheckLevel { get; set; }
public int Num { get; set; }
public string CheckDepart { get; set; }
public string CheckPost { get; set; }
public List<CheckListDetail> details { get; set; }
}
/// <summary>
/// 企业库
/// </summary>
@ -101,19 +122,32 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> postIds = new List<Guid>();
List<Guid> hiddenIds = new List<Guid>();
List<Guid> basicIds = new List<Guid>();
List<T_SK_ENTERPRISE_LIBRARY_DEPART> libraryDepart = new List<T_SK_ENTERPRISE_LIBRARY_DEPART>();
List<T_SK_ENTERPRISE_LIBRARY_POST> libraryPost = new List<T_SK_ENTERPRISE_LIBRARY_POST>();
List<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL> libraryPostList = new List<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL> libraryDetail = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT> contentList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> departList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST> postList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN> hiddenList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC> basicList = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC>();
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_User").ToList();
if (departs != null && departs.Any())
{
libraryDepartIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => t.ENTERPRISE_LIBRARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in departs)
foreach (var item in departs.Where(t => !t.IS_DELETED).ToList())
{
item.ORG_ID = entity.ORG_ID;
item.ENTERPRISE_LIBRARY_ID = entity.ID;
var approve = departments.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID);
T_SK_ENTERPRISE_LIBRARY_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DEPART();
de.ID = Guid.NewGuid();
de.ORG_ID = entity.ORG_ID;
de.ENTERPRISE_LIBRARY_ID = entity.ID;
de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE;
de.USER_ID = item.USER_ID;
de.DEPARTMENT_ID = item.DEPARTMENT_ID;
de.USER_ID = approve?.Nav_User?.ID;
de.APPROVE_ROLE_ID = approve?.Nav_User?.APPROVE_ROLE_ID;
libraryDepart.Add(de);
}
//var departTemp= departs.Where(t=>!t.IS_DELETED).Select(t=>t.DEPARTMENT_TYPE).Distinct().ToList();
//if (departTemp.Any())
@ -126,18 +160,24 @@ namespace APT.SK.WebApi.Controllers.Api
{
libraryPostIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.ENTERPRISE_LIBRARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
libraryPostDetailIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>(t => libraryPostIds.Contains(t.ENTERPRISE_LIBRARY_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in posts)
foreach (var item in posts.Where(t => !t.IS_DELETED).ToList())
{
item.ORG_ID = entity.ORG_ID;
item.ENTERPRISE_LIBRARY_ID = entity.ID;
T_SK_ENTERPRISE_LIBRARY_POST po = new T_SK_ENTERPRISE_LIBRARY_POST();
po.ID = Guid.NewGuid();
po.ORG_ID = entity.ORG_ID;
po.ENTERPRISE_LIBRARY_ID = entity.ID;
po.DEPARTMENT_ID = item.DEPARTMENT_ID;
libraryPost.Add(po);
if (item.Nav_PostDetails != null && item.Nav_PostDetails.Any())
{
foreach (var item2 in item.Nav_PostDetails)
foreach (var item2 in item.Nav_PostDetails.Where(t => !t.IS_DELETED).ToList())
{
item2.ORG_ID = entity.ORG_ID;
item2.ENTERPRISE_LIBRARY_POST_ID = item.ID;
item2.Nav_Post = null;
libraryPostList.Add(item2);
T_SK_ENTERPRISE_LIBRARY_POST_DETAIL detai = new T_SK_ENTERPRISE_LIBRARY_POST_DETAIL();
detai.ID = Guid.NewGuid();
detai.ORG_ID = entity.ORG_ID;
detai.ENTERPRISE_LIBRARY_POST_ID = po.ID;
detai.POST_ID = item2.POST_ID;
libraryPostList.Add(detai);
}
}
}
@ -150,61 +190,256 @@ namespace APT.SK.WebApi.Controllers.Api
hiddenIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
departIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
postIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST>(t => departIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details)
foreach (var item in details.Where(t => !t.IS_DELETED).ToList())
{
T_SK_ENTERPRISE_LIBRARY_DETAIL de = new T_SK_ENTERPRISE_LIBRARY_DETAIL();
de.ID = Guid.NewGuid();
de.ORG_ID = entity.ORG_ID;
de.ENTERPRISE_LIBRARY_ID = entity.ID;
de.MEASURES_NAME = item.MEASURES_NAME;
de.EMERGENCY = item.EMERGENCY;
de.NUM = item.NUM;
libraryDetail.Add(de);
if (item.Nav_DetailContents != null && item.Nav_DetailContents.Any())
{
foreach (var item2 in item.Nav_DetailContents)
foreach (var item2 in item.Nav_DetailContents.Where(t => !t.IS_DELETED).ToList())
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT con = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT();
con.ID = Guid.NewGuid();
con.ORG_ID = entity.ORG_ID;
con.ENTERPRISE_LIBRARY_DETAIL_ID = de.ID;
con.CHECK_CONTENTS_ID = item2.CHECK_CONTENTS_ID;
con.CHECK_CONTENT = item2.CHECK_CONTENT;
con.CHECK_BASIC = item2.CHECK_BASIC;
con.CHECK_STANDARD = item2.CHECK_STANDARD;
con.NUM = item2.NUM;
contentList.Add(con);
if (item2.Nav_DetailHiddens != null && item2.Nav_DetailHiddens.Any())
{
foreach (var item3 in item2.Nav_DetailHiddens)
foreach (var item3 in item2.Nav_DetailHiddens.Where(t => !t.IS_DELETED).ToList())
{
item3.ORG_ID = entity.ORG_ID;
item3.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item2.ID;
hiddenList.Add(item3);
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN hi = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN();
hi.ID = Guid.NewGuid();
hi.ORG_ID = entity.ORG_ID;
hi.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = con.ID;
hi.CHECK_QUESTION_ID = item3.CHECK_QUESTION_ID;
hi.HIDDEN_DESCRIPTION = item3.HIDDEN_DESCRIPTION;
hi.HIDDEN_LEVEL = item3.HIDDEN_LEVEL;
hi.RECTIFICATION_MEASURES = item3.RECTIFICATION_MEASURES;
hi.NUM = item3.NUM;
hiddenList.Add(hi);
}
}
if (item2.Nav_DetailBasics != null && item2.Nav_DetailBasics.Any())
{
foreach (var item3 in item2.Nav_DetailBasics)
foreach (var item3 in item2.Nav_DetailBasics.Where(t => !t.IS_DELETED).ToList())
{
item3.ORG_ID = entity.ORG_ID;
item3.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item2.ID;
basicList.Add(item3);
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC ba = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_BASIC();
ba.ID = Guid.NewGuid();
ba.ORG_ID = entity.ORG_ID;
ba.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = con.ID;
ba.LAW_ID = item3.LAW_ID;
basicList.Add(ba);
}
}
}
if (item2.Nav_DetailDeparts != null && item2.Nav_DetailDeparts.Any())
{
foreach (var item4 in item2.Nav_DetailDeparts)
foreach (var item4 in item2.Nav_DetailDeparts.Where(t => !t.IS_DELETED).ToList())
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART pt = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
pt.ID = Guid.NewGuid();
pt.ORG_ID = entity.ORG_ID;
pt.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = con.ID;
pt.CHECK_TYPE = item4.CHECK_TYPE;
pt.DEPARTMENT_ID = item4.DEPARTMENT_ID;
pt.CHECK_TYPE_ID = item4.CHECK_TYPE_ID;
pt.CHECK_CYCLE = item4.CHECK_CYCLE;
pt.NUM = item4.NUM;
departList.Add(pt);
if (item4.Nav_DetailPosts != null && item4.Nav_DetailPosts.Any())
{
foreach (var item5 in item4.Nav_DetailPosts)
foreach (var item5 in item4.Nav_DetailPosts.Where(t => !t.IS_DELETED).ToList())
{
item5.ORG_ID = entity.ORG_ID;
item5.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = item4.ID;
postList.Add(item5);
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST po = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_POST();
po.ID = Guid.NewGuid();
po.ORG_ID = entity.ORG_ID;
po.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID = pt.ID;
po.POST_ID = item5.POST_ID;
postList.Add(po);
}
}
item4.ORG_ID = entity.ORG_ID;
item4.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = item2.ID;
item4.Nav_DetailPosts = null;
departList.Add(item4);
}
}
}
item2.ORG_ID = entity.ORG_ID;
item2.ENTERPRISE_LIBRARY_DETAIL_ID = item.ID;
item2.Nav_DetailHiddens = null;
item2.Nav_DetailDeparts = null;
contentList.Add(item2);
}
}
}
item.ORG_ID = entity.ORG_ID;
item.ENTERPRISE_LIBRARY_ID = entity.ID;
item.Nav_DetailContents = null;
}
}
}
//辨识层级
var postdepartIds = libraryPost.Select(t => t.DEPARTMENT_ID).Distinct().ToList();
var identitylLevel = departments.Where(m => postdepartIds.Contains(m.ID)).Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
if (identitylLevel != null && identitylLevel.Any())
{
}
else
{
throw new Exception("辨识岗位不能为空");
}
//管控层级
var controlLevel = libraryDepart.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
var count = controlLevel.Count();
//检查层级
var checkLevel = departList.Select(t => t.CHECK_TYPE).Distinct().ToList();
if (entity.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险)
{
if (count >= 4 && controlLevel.Contains(SKDepartmentTypeEnum.公司级))
{
//重大风险管控层级必须有四个层级，并且要有公司级
}
else
{
foreach (var level in identitylLevel)
{
if (!controlLevel.Contains((SKDepartmentTypeEnum)level))
{
throw new Exception("缺少管控层级，请添加管控层级:" + ((SKDepartmentTypeEnum)level).GetDescription());
}
}
}
}
if (entity.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险)
{
if (count >= 3 && controlLevel.Contains(SKDepartmentTypeEnum.部门级))
{
//较大风险管控层级必须有三个层级，并且要有部门级
}
else
{
foreach (var level in identitylLevel)
{
if (!controlLevel.Contains((SKDepartmentTypeEnum)level))
{
throw new Exception("缺少管控层级，请添加管控层级:" + ((SKDepartmentTypeEnum)level).GetDescription());
}
}
}
}
if (entity.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险)
{
if (count >= 2 && controlLevel.Contains(SKDepartmentTypeEnum.车间级))
{
//一般风险管控层级必须有两个层级，并且要有车间级
}
else
{
foreach (var level in identitylLevel)
{
if (!controlLevel.Contains((SKDepartmentTypeEnum)level))
{
throw new Exception("缺少管控层级，请添加管控层级:" + ((SKDepartmentTypeEnum)level).GetDescription());
}
}
}
}
if (entity.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险)
{
if (count >= 1 && controlLevel.Contains(SKDepartmentTypeEnum.班组级))
{
//低风险管控层级必须有一个层级，并且要有班组级
}
else
{
foreach (var level in identitylLevel)
{
if (!controlLevel.Contains((SKDepartmentTypeEnum)level))
{
throw new Exception("缺少管控层级，请添加管控层级:" + ((SKDepartmentTypeEnum)level).GetDescription());
}
}
}
}
if (controlLevel != null && controlLevel.Any())
{
foreach (var level in controlLevel)
{
if (!checkLevel.Contains(level))
{
throw new Exception("管控层级与检查层级不一致，请添加检查层级:" + level.GetDescription());
}
}
}
else
{
throw new Exception("管控层级不能为空");
}
if (checkLevel != null && checkLevel.Any())
{
foreach (var level in checkLevel)
{
if (!controlLevel.Contains(level))
{
throw new Exception("检查层级与管控层级不一致，请添加管控层级:" + level.GetDescription());
}
}
}
else
{
throw new Exception("检查部门不能为空");
}
//更新岗位清单表的检查内容
//List<T_SK_CHECK_SET_CONTENTS> setContentList = new List<T_SK_CHECK_SET_CONTENTS>();
//List<T_SK_CHECK_SET_CONTENTS_HIDDEN> setContentHiddenList = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
//var checkType = this.GetEntity<T_SK_CHECK_TYPE>(t => t.NAME == "岗位排查");
//if (checkType == null)
//{
// throw new Exception("请到系统管理维护检查类型：岗位排查！");
//}
//var sets = this.GetEntities<T_SK_CHECK_SET>(t =>t.CHECK_TYPE_ID == checkType.ID, new BaseFilter(entity.ORG_ID)).ToList();
//var setIds = sets.Select(t=>t.ID).ToList();
//var setContents = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => setIds.Contains(t.CHECK_SET_ID), new BaseFilter(entity.ORG_ID)).ToList();
//if (postList.Any())
//{
// foreach (var item in postList)
// {
// var setFirst = sets.FirstOrDefault(t => t.POST_ID == item.POST_ID && t.CHECK_TYPE_ID == item.Nav_DetailDepart?.CHECK_TYPE_ID);
// if (setFirst != null)
// {
// var contentFirst = setContents.FirstOrDefault(t => t.CHECK_SET_ID == setFirst.ID && t.CHECK_CONTENTS_ID == item.Nav_DetailDepart?.Nav_DetailContent?.CHECK_CONTENTS_ID);
// if (contentFirst == null)
// {
// //添加检查内容
// T_SK_CHECK_SET_CONTENTS con = new T_SK_CHECK_SET_CONTENTS();
// con.ORG_ID = setFirst.ORG_ID;
// con.CHECK_CONTENTS_ID = item.Nav_DetailDepart?.Nav_DetailContent?.CHECK_CONTENTS_ID;
// con.CHECK_CONTENT = item.Nav_DetailDepart?.Nav_DetailContent?.CHECK_CONTENT;
// con.CHECK_SET_ID = setFirst.ID;
// setContentList.Add(con);
// if (item.Nav_DetailDepart!=null && item.Nav_DetailDepart.Nav_DetailContent != null && item.Nav_DetailDepart.Nav_DetailContent.Nav_DetailHiddens!=null &&item.Nav_DetailDepart.Nav_DetailContent.Nav_DetailHiddens.Any())
// {
// foreach (var item2 in item.Nav_DetailDepart.Nav_DetailContent.Nav_DetailHiddens)
// {
// T_SK_CHECK_SET_CONTENTS_HIDDEN hid = new T_SK_CHECK_SET_CONTENTS_HIDDEN();
// hid.ORG_ID = entity.ORG_ID;
// hid.CHECK_CONTENTS_SET_ID = con.ID;
// hid.CHECK_QUESTION_ID = item2.CHECK_QUESTION_ID;
// hid.RECTIFICATION_MEASURES = item2.RECTIFICATION_MEASURES;
// hid.HIDDEN_DESCRIPTION = item2.HIDDEN_DESCRIPTION;
// hid.HIDDEN_LEVEL = (SKHiddenLevel)item2.HIDDEN_LEVEL;
// setContentHiddenList.Add(hid);
// }
// }
// }
// }
// }
//}
//postList.ForEach(t => t.Nav_DetailDepart = null);
List<Guid> libraryIds = new List<Guid>();
List<Guid> basicDetailIds = new List<Guid>();
List<Guid> basicContentIds = new List<Guid>();
@ -329,12 +564,12 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DEPART>(libraryDepartIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (departs != null && departs.Any())
BantchSaveEntityNoCommit(departs);
if (posts != null && posts.Any())
BantchSaveEntityNoCommit(posts);
if (libraryDetail != null && libraryDetail.Any())
BantchSaveEntityNoCommit(libraryDetail);
if (libraryDepart != null && libraryDepart.Any())
BantchSaveEntityNoCommit(libraryDepart);
if (libraryPost != null && libraryPost.Any())
BantchSaveEntityNoCommit(libraryPost);
if (libraryPostList != null && libraryPostList.Any())
BantchSaveEntityNoCommit(libraryPostList);
if (contentList != null && contentList.Any())
@ -367,6 +602,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(libraryHiddenList);
if (libraryBasicList != null && libraryBasicList.Any())
BantchSaveEntityNoCommit(libraryBasicList);
//if (setContentList != null && setContentList.Any())
// BantchSaveEntityNoCommit(setContentList);
//if (setContentHiddenList != null && setContentHiddenList.Any())
// BantchSaveEntityNoCommit(setContentHiddenList);
});
return true;
});
@ -401,7 +640,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var item in result.Data)
{
//管控措施
var detailStr = new List<string>();
var detailStr = new List<string>();
if (item.Nav_Details != null && item.Nav_Details.Any())
{
var i = 1;
@ -721,8 +960,8 @@ namespace APT.SK.WebApi.Controllers.Api
i++;
}
}
}
}
if (controlLevelStr.Any())
{
controlLevelStr = controlLevelStr.Distinct().ToList();
@ -904,6 +1143,7 @@ namespace APT.SK.WebApi.Controllers.Api
item.AREA_ID = item.Nav_LibraryDetail.Nav_Library.AREA_ID;
item.Nav_Contents = item.Nav_Contents;
item.Nav_Area = item.Nav_LibraryDetail.Nav_Library.Nav_Area;
item.RISK_NAME = item.Nav_LibraryDetail.Nav_Library.RISK_NAME;
}
}
var userPosts = this.GetEntities<T_FM_USER_POST>(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId)).ToList();
@ -918,7 +1158,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.CHECK_CONTENT }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.AREA_NAME).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();
checkTempList.Add(item2);
}
checkList.Data = checkTempList;
@ -1544,11 +1784,11 @@ namespace APT.SK.WebApi.Controllers.Api
if (checkList.Data != null && checkList.Data.Any())
{
var libraryIds = postLists.Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => libraryIds.Contains(t.ID), new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_Details");
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => libraryIds.Contains(t.ID), new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_Details", "Nav_Photo.Nav_ImgFile");
foreach (var item in checkList.Data)
{
var tempIds = postLists.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.POST_NAME == item.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();
item.Nav_Librarys = librarys.Where(t => tempIds.Contains(t.ID)).ToList();
item.Nav_Librarys = librarys.Where(t => tempIds.Contains(t.ID)).OrderBy(m => m.EVALUATE_LEVEL).ToList();
}
}
checkList.TotalCount = checkList.Data.Count;
@ -1828,49 +2068,49 @@ namespace APT.SK.WebApi.Controllers.Api
return SafeExecute(() =>
{
var result = new T_SK_ENTERPRISE_LIBRARY();
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID")?.Value.ToString();
var mineType = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "MineType");
var areaId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "AREA_ID");
var typeId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TYPE_ID");
//var typeId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TYPE_ID");
var riskName = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "RISK_NAME");
var riskDes = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "RISK_DESCRIPTION");
//var riskDes = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "RISK_DESCRIPTION");
filter.IgnoreDataRule = true;
if (!string.IsNullOrEmpty(id))
{
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"});
}
else if (mineType != null && areaId != null && typeId != null && riskName != null && riskDes != null)
else if (mineType != null && areaId != null && riskName != null)//&& typeId != null && riskDes!=null
{
var temp = SKProductionUnit.All;
switch (mineType.Value)
switch (mineType.Value.ToString())
{
case 0:
case "0":
temp = SKProductionUnit.All;
break;
case 10:
case "10":
temp = SKProductionUnit.MineChoose;
break;
case 20:
case "20":
temp = SKProductionUnit.Minelast;
break;
case 30:
case "30":
temp = SKProductionUnit.Mine;
break;
case 40:
case "40":
temp = SKProductionUnit.MineUnderGround;
break;
case 31:
case "31":
temp = SKProductionUnit.Department;
break;
case 32:
case "32":
temp = SKProductionUnit.Nonmetallic;
break;
default:
default:
temp = SKProductionUnit.All;
break;
}
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == temp && t.AREA_ID == (Guid)areaId.Value && t.TYPE_ID == (Guid)typeId.Value && t.RISK_NAME == riskName.Value.ToString() && t.RISK_DESCRIPTION == riskDes.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == temp && t.AREA_ID == Guid.Parse(areaId.Value.ToString()) && t.RISK_NAME == riskName.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"});
}
if (result != null)
@ -1938,5 +2178,317 @@ namespace APT.SK.WebApi.Controllers.Api
result = GetOrderPageEntities<T_FM_DEPARTMENT>(null, pageFilter);
return result;
}
[HttpPost, Route("GetCheckListOld")]
public JsonActionResult<List<CheckListNew>> GetCheckListOld([FromBody] KeywordFilter filter)
{
var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
List<string> selectMinetype = new List<string>();
var minetype = departs.FirstOrDefault(t => t.ID == loginDepart)?.MineType;
switch (minetype)
{
case 0:
selectMinetype.Add(SKProductionUnit.All.GetDescription());
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
selectMinetype.Add(SKProductionUnit.Department.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
case 10:
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
case 20:
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
break;
case 30:
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
break;
case 40:
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
break;
default:
selectMinetype.Add(SKProductionUnit.All.GetDescription());
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
selectMinetype.Add(SKProductionUnit.Department.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
}
//List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
//DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
var checkList = new JsonActionResult<List<CheckListNew>>();
List<CheckListNew> list = new List<CheckListNew>();
var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME == "岗位排查", new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_DetailContent.Nav_LibraryDetail.Nav_Library", "Nav_CheckType", "Nav_Department").ToList();
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_LibraryDetail.Nav_Library.Nav_Area", "Nav_Contents").ToList();
var libraryIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).Select(m => m.ENTERPRISE_LIBRARY_ID).ToList();
var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_PostDetails.Nav_Post").ToList();
if (detailContents != null && detailContents.Any())
{
detailContents.ForEach(t => t.MineType = t.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.MineType);
var group = detailContents.GroupBy(t => new { t.MineType, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPARTMENT_ID, t.CHECK_TYPE_ID }).ToList();
foreach (var item in group)
{
var detail = detailContents.FirstOrDefault(t => t.MineType == item.Key.MineType && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID);
CheckListNew listNew = new CheckListNew();
listNew.MineType = item.Key.MineType.GetDescription();
listNew.CheckType = detail?.Nav_CheckType?.NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
listNew.Num = (int)item.Key.CHECK_TYPE;
listNew.CheckDepart = detail?.Nav_Department?.NAME;
if (checkTypeIds != null && checkTypeIds.Any() && item.Key.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.Key.CHECK_TYPE_ID))
{
var itemTemp = posts.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == detail.Nav_DetailContent.Nav_LibraryDetail.Nav_Library.ID && t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID)?.Nav_PostDetails;
if (itemTemp != null && itemTemp.Any())
{
var lists = itemTemp.Select(t => t.Nav_Post?.NAME).Distinct().ToList();
listNew.CheckPost = string.Join(",", lists);
}
else
{
listNew.CheckPost = detail?.Nav_Department?.NAME + "辨识岗位未配置";
}
}
else
{
if (item.Key.CHECK_TYPE == SKDepartmentTypeEnum.班组级)
{
listNew.CheckPost = "班组负责人";
}
else if (item.Key.CHECK_TYPE == SKDepartmentTypeEnum.车间级)
{
listNew.CheckPost = "车间安全员";
}
else if (item.Key.CHECK_TYPE == SKDepartmentTypeEnum.部门级)
{
listNew.CheckPost = "部门安全员";
}
else
{
listNew.CheckPost = "安环部安全员";
}
}
var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.MineType == item.Key.MineType).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList();
var temps = contents.Where(t => depathaveIds.Contains(t.ID)).ToList();
if (temps.Any())
{
List<CheckListDetail> listDetail = new List<CheckListDetail>();
foreach (var tem in temps)
{
CheckListDetail checkListDetail = new CheckListDetail();
checkListDetail.CHECK_CONTENTS_ID = tem.CHECK_CONTENTS_ID;
checkListDetail.CHECK_CONTENTS_NAME = tem.Nav_Contents?.CHECKCONTENT;
checkListDetail.RISK_NAME = tem.Nav_LibraryDetail?.Nav_Library?.RISK_NAME;
checkListDetail.RISK_AREA_ID = tem.Nav_LibraryDetail?.Nav_Library?.AREA_ID;
checkListDetail.RISK_AREA_NAME = tem.Nav_LibraryDetail?.Nav_Library?.Nav_Area?.NAME;
checkListDetail.CHECKPROOF = tem.CHECK_BASIC;
checkListDetail.CHECKSTANDARD = tem.CHECK_STANDARD;
listDetail.Add(checkListDetail);
}
listNew.details = listDetail.OrderBy(t => t.RISK_AREA_NAME).ThenBy(m => m.RISK_NAME).ToList();
}
list.Add(listNew);
}
checkList.Data = list.Where(t => selectMinetype.Contains(t.MineType)).GroupBy(t => new { t.MineType, t.CheckType, t.CheckCycle, t.CheckLevel, t.CheckDepart, t.CheckPost }).Select(m => m.FirstOrDefault()).OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(y => y.CheckType).ToList();
checkList.TotalCount = checkList.Data.Count;
}
return checkList;
}
[HttpPost, Route("GetCheckListNew")]
public JsonActionResult<List<CheckListNew>> GetCheckListNew([FromBody] KeywordFilter filter)
{
var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
List<string> selectMinetype = new List<string>();
var minetype = departs.FirstOrDefault(t => t.ID == loginDepart)?.MineType;
switch (minetype)
{
case 0:
selectMinetype.Add(SKProductionUnit.All.GetDescription());
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
selectMinetype.Add(SKProductionUnit.Department.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
case 10:
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
case 20:
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
break;
case 30:
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
break;
case 40:
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
break;
default:
selectMinetype.Add(SKProductionUnit.All.GetDescription());
selectMinetype.Add(SKProductionUnit.MineChoose.GetDescription());
selectMinetype.Add(SKProductionUnit.MineUnderGround.GetDescription());
selectMinetype.Add(SKProductionUnit.Minelast.GetDescription());
selectMinetype.Add(SKProductionUnit.Mine.GetDescription());
selectMinetype.Add(SKProductionUnit.Department.GetDescription());
selectMinetype.Add(SKProductionUnit.Nonmetallic.GetDescription());
break;
}
//List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
//DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
var checkList = new JsonActionResult<List<CheckListNew>>();
List<CheckListNew> list = new List<CheckListNew>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> detailContents = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME == "岗位排查", new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var users = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Person").ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").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();
var posts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_PostDetails.Nav_Post").ToList();
if (librarys != null && librarys.Any())
{
foreach (var item in librarys)
{
var libraryPost = posts.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
var details = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
var detailIds = details.Select(t => t.ID).ToList();
var contentTemps = contents.Where(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID)).ToList();
var contentTempIds = contentTemps.Select(t => t.ID).ToList();
var contentDepartTemps = contentDeparts.Where(t => contentTempIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID)).ToList();
if (contentDepartTemps != null && contentDepartTemps.Any())
{
foreach (var depart in contentDepartTemps)
{
var first = libraryPost.FirstOrDefault(t => t.DEPARTMENT_ID == depart.DEPARTMENT_ID)?.Nav_PostDetails?.Select(m => m.Nav_Post).OrderBy(n => n?.NAME).ToList();
var contentFirst = contentTemps.FirstOrDefault(t => t.ID == depart.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID);
if (first != null && first.Any())
{
foreach (var post in first)
{
var userRole = users.FirstOrDefault(t => t.Nav_Person != null && t.Nav_Person.POST_ID == post?.ID).APPROVE_ROLE_ID;
if (userRole == null)
{
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.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
de.TYPE_NAME = depart.Nav_CheckType?.NAME;
de.DEPART_NAME = depart.Nav_Department?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = depart.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID;
de.CHECK_CYCLE = depart.CHECK_CYCLE;
de.CHECK_TYPE_ID = depart.CHECK_TYPE_ID;
de.DEPARTMENT_ID = depart.DEPARTMENT_ID;
de.CHECK_TYPE = depart.CHECK_TYPE;
detailContents.Add(de);
}
}
}
else
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = "未配置辨识岗位";
de.MineType = item.MineType;
de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
de.TYPE_NAME = depart.Nav_CheckType?.NAME;
de.DEPART_NAME = depart.Nav_Department?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = depart.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID;
de.CHECK_CYCLE = depart.CHECK_CYCLE;
de.CHECK_TYPE_ID = depart.CHECK_TYPE_ID;
de.DEPARTMENT_ID = depart.DEPARTMENT_ID;
de.CHECK_TYPE = depart.CHECK_TYPE;
detailContents.Add(de);
}
}
}
}
}
if (detailContents != null && detailContents.Any())
{
foreach (var item in contents)
{
var detailLib = libraryDetails.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_ID);
var lib = librarys.FirstOrDefault(t => t.ID == detailLib?.ENTERPRISE_LIBRARY_ID);
item.RISK_NAME = lib?.RISK_NAME;
item.AREA_ID = lib?.AREA_ID;
item.Nav_Area = lib?.Nav_Area;
}
foreach (var item in detailContents)
{
if (checkTypeIds != null && checkTypeIds.Any() && item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID))
{
}
else
{
if (item.CHECK_TYPE == SKDepartmentTypeEnum.班组级)
{
item.POST_NAME = "班组负责人";
}
else if (item.CHECK_TYPE == SKDepartmentTypeEnum.车间级)
{
item.POST_NAME = "车间安全员";
}
else if (item.CHECK_TYPE == SKDepartmentTypeEnum.部门级)
{
item.POST_NAME = "部门安全员";
}
else
{
item.POST_NAME = "安环部安全员";
}
}
}
var group = detailContents.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 }).ToList();
foreach (var item in group)
{
CheckListNew listNew = new CheckListNew();
listNew.MineType = item.Key.MineType.GetDescription();
listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
listNew.Num = (int)item.Key.CHECK_TYPE;
listNew.CheckDepart = item.Key.DEPART_NAME;
listNew.CheckPost = item.Key.POST_NAME;
var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.MineType == item.Key.MineType && t.POST_NAME == item.Key.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList();
var temps = contents.Where(t => depathaveIds.Contains(t.ID)).Distinct().ToList();
if (temps.Any())
{
List<CheckListDetail> listDetail = new List<CheckListDetail>();
foreach (var tem in temps)
{
CheckListDetail checkListDetail = new CheckListDetail();
checkListDetail.CHECK_CONTENTS_ID = tem.CHECK_CONTENTS_ID;
checkListDetail.CHECK_CONTENTS_NAME = tem.Nav_Contents?.CHECKCONTENT;
checkListDetail.RISK_NAME = tem.RISK_NAME;
checkListDetail.RISK_AREA_ID = tem.AREA_ID;
checkListDetail.RISK_AREA_NAME = tem.Nav_Area?.NAME;
checkListDetail.CHECKPROOF = tem.CHECK_BASIC;
checkListDetail.CHECKSTANDARD = tem.CHECK_STANDARD;
listDetail.Add(checkListDetail);
}
listNew.details = listDetail.OrderBy(t => t.RISK_AREA_NAME).ThenBy(m => m.RISK_NAME).ToList();
}
list.Add(listNew);
}
checkList.Data = list.Where(t => selectMinetype.Contains(t.MineType)).OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
checkList.TotalCount = checkList.Data.Count;
}
return checkList;
}
}
}

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

@ -53,6 +53,10 @@ namespace APT.SK.WebApi.Controllers.Api
entity.Nav_Files = null;
var basics = entity.Nav_Basics;
entity.Nav_Basics = null;
if (string.IsNullOrEmpty(entity.HIDDEN_DESCRIPTION))
{
entity.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
}
if (photos != null && photos.Any())
{
foreach (var item in photos)
@ -99,11 +103,11 @@ namespace APT.SK.WebApi.Controllers.Api
{
var hiddenLevel = entity.HIDDEN_LEVEL;
var param = Enum.GetName(typeof(SKHiddenLevel), hiddenLevel);
var level = param == "Major" ? "重大" : "一般";
var level = (param == "Major" || param == "重大") ? "重大" : "一般";
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
param = Enum.GetName(typeof(FMDepartmentType), departmentType);
level = Enum.GetName(typeof(FMDepartmentType), departmentType);
}
//触发审批
entity.STATUS = PFStandardStatus.Approving;
@ -114,7 +118,7 @@ namespace APT.SK.WebApi.Controllers.Api
sysFilter.OrgId = entity.ORG_ID;
var codes = CodeRuleService.NewGenSerial(sysFilter);
var serialCode = codes.Split(new char[] { ',' });
MFlowPermitService.InsertApprove(serialCode[0], "SK018", param, entity.ID, "SK018_SHOWPRINT", entity.TaskID, true, () =>
MFlowPermitService.InsertApprove(serialCode[0], "SK018", level, entity.ID, "SK018_SHOWPRINT", entity.TaskID, true, () =>
{
if (entity != null)
UpdateEntityNoCommit(entity);
@ -141,7 +145,126 @@ namespace APT.SK.WebApi.Controllers.Api
return true;
});
}
[HttpPost, Route("FullUpdateYL")]
public JsonActionResult<bool> FullUpdateYL([FromBody] T_SK_HIDDEN_DANGER_CONFIRM 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;
if (entity.RECITIFY_USER_ID == null)
throw new Exception("整改责任人必须填写");
var photos = entity.Nav_Photos;
entity.Nav_Photos = null;
var files = entity.Nav_Files;
entity.Nav_Files = null;
var basics = entity.Nav_Basics;
entity.Nav_Basics = null;
if (string.IsNullOrEmpty(entity.HIDDEN_DESCRIPTION))
{
entity.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
}
if (photos != null && photos.Any())
{
foreach (var item in photos)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (files != null && files.Any())
{
foreach (var item in files)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (basics != null && basics.Any())
{
foreach (var item in basics)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
item.Nav_Law = null;
}
}
if (entity.RECITIFY_TIME.HasValue && entity.RECITIFY_TIME.Value.Date < DateTime.Now.Date)
{
throw new Exception("整改期限不得早于当前时间");
}
//var libraryIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.AREA_ID == entity.RISK_AREA_ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
//var libraryDetailIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
//var contentIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => libraryDetailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.CHECK_CONTENTS_ID).Distinct().ToList();
//if (contentIds != null && contentIds.Any() && contentIds.Contains(entity.CHECK_CONTENTS_ID))
//{
// entity.IS_STORE = SKIsStoreEnum.No;
//}
//else
//{
// entity.IS_STORE = SKIsStoreEnum.Yes;
//}
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var param = Enum.GetName(typeof(SKHiddenLevel), entity.HIDDEN_LEVEL);
var level = (param == "Major" || param == "重大") ? "重大" : "一般";
if (entity.HIDDEN_LEVEL == SKHiddenLevel.General)
{
var departmentId = this.GetEntity<T_FM_USER>(t => t.ID == entity.RECITIFY_USER_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (departmentId != null)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
level = Enum.GetName(typeof(FMDepartmentType), departmentType);
}
else
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
level = Enum.GetName(typeof(FMDepartmentType), departmentType);
}
}
//触发审批
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], "SK018", level, entity.ID, "SK018_SHOWPRINT", entity.TaskID, true, () =>
{
if (entity != null)
UpdateEntityNoCommit(entity);
if (photos != null && photos.Any())
BantchSaveEntityNoCommit(photos);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
}, null, entity.RECITIFY_USER_ID, null, null, null, "SK018_SHOWPRINT", null, level + "隐患审批");
return true;
}
this.UnifiedCommit(() =>
{
if (entity != null)
UpdateEntityNoCommit(entity);
if (photos != null && photos.Any())
BantchSaveEntityNoCommit(photos);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
});
return true;
});
}
/// <summary>
/// 获得单条实体数据
/// </summary>

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

@ -15,6 +15,11 @@ using APT.BaseData.Domain.IServices;
using System.Linq;
using System.Collections.Generic;
using System;
using APT.MS.Domain.Entities.BS;
using System.Dynamic;
using System.IO;
using static APT.Utility.FileUtils;
using System.Configuration;
namespace APT.SK.WebApi.Controllers.Api
{
@ -43,7 +48,7 @@ namespace APT.SK.WebApi.Controllers.Api
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
if(entity.ID == null)
if (entity.ID == null)
entity.ID = Guid.NewGuid();
if (entity.APPLY_USER_ID == null)
entity.APPLY_USER_ID = userId;
@ -65,7 +70,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
T_SK_HIDDEN_DANGER_CONFIRM confirm = null;
List <T_SK_HIDDEN_DANGER_CONFIRM_PHOTO> photoList = new List<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>();
List<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO> photoList = new List<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
if (entity.APPLY_USER_ID != null)
@ -99,7 +104,12 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
//发消息
var notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患确认单(" + depart?.NAME + DateTime.Now.ToShortDateString().Replace("/", "") + ")", confirm.ID, entity.ORG_ID, (Guid)sendUser, userName, DateTime.Now,
var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.ToShortDateString().Replace("/", "") + ")";
if (orgId.ToString() == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913")
{
titleName = "手动隐患上报完善";
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(titleName, confirm.ID, entity.ORG_ID, (Guid)sendUser, userName, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK018");
notices.Add(notice);
}
@ -124,5 +134,471 @@ namespace APT.SK.WebApi.Controllers.Api
return true;
});
}
#region 隐患上报 离线缓存版
/// <summary>
/// 手动隐患上报 单次 一张图片 必备输入信息 imgID = CONTENT_ID
/// </summary>
/// <returns></returns>
[HttpPost, Route("UploadFileRiskCache")]
public JsonActionResult<dynamic> UploadFileRiskCache()
{
return SafeExecute<dynamic>(() =>
{
dynamic result = new ExpandoObject();
var httpRequest = HttpContext.Request;
Microsoft.AspNetCore.Http.IFormCollection formInfo = httpRequest.Form;
var strOrgId = formInfo["OrgId"][0]; // 获取 组织
if (string.IsNullOrEmpty(strOrgId))
throw new Exception("组织不允许为空");
var orgId = new Guid(strOrgId);
var now = DateTime.Now;
var LoginID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
#region 图片处理
var strImgID = string.Empty;
if (formInfo.ContainsKey("imgFileID"))
{
strImgID = formInfo["imgFileID"][0];
}
Guid ImgID = Guid.Empty;
if (strImgID != null && !string.IsNullOrEmpty(strImgID))
{
try
{
ImgID = new Guid(strImgID.ToString());
}
catch { }
}
if (ImgID == Guid.Empty)
ImgID = Guid.NewGuid();
string filePath = GetFilePath(orgId);
var fullFilePath = $"{ConfigurationManager.AppSettings["Img_Local"]}{filePath}";
ImageConverterFactory imageConverterFactory = new ImageConverterFactory();
var host = ConfigurationManager.AppSettings["SapInvokeHost"];
List<T_PF_FILE> fileList = new List<T_PF_FILE>();
List<T_PF_IMG_FILE> imgFileList = new List<T_PF_IMG_FILE>();
List<T_PF_IMG_FILE_DETAIL> imgFileDetailList = new List<T_PF_IMG_FILE_DETAIL>();
var files = formInfo.Files;
if (!Directory.Exists(fullFilePath))
{
Directory.CreateDirectory(fullFilePath);
}
foreach (var item in files)
{
if (item != null)
{
//文件后缀
var fileExtension = Path.GetExtension(item.FileName);
var strDateTime = DateTime.Now.ToString("yyMMddhhmmssfff"); //取得时间字符串
var strRan = Convert.ToString(new Random().Next(100, 999)); //生成三位随机数
var saveName = strDateTime + strRan + fileExtension;
string fileName = item.FileName;
//插入图片数据
using (FileStream fs = System.IO.File.Create(fullFilePath + saveName))//fullFilePath + fileName wyw
{
item.CopyTo(fs);
fs.Flush();
}
if (fileExtension == ".jpg" || fileExtension == ".png" || fileExtension == ".jpeg")
{
using (FileStream inputFileStream = new FileStream(fullFilePath + saveName, FileMode.Open, FileAccess.Read))
{
MemoryStream compressedStream = CompressImageFileStream(inputFileStream);
inputFileStream.Close();
using (FileStream outputFileStream = new FileStream(fullFilePath + saveName, FileMode.Create, FileAccess.Write))
{
compressedStream.CopyTo(outputFileStream);
}
}
}
var pos = fileName.LastIndexOf(".");
var extendName = fileName.Substring(pos);
List<ConvertImageFile> list = new List<ConvertImageFile>();
bool isSuppot = imageConverterFactory.Support(extendName);
bool isSaveSelf = true;
T_PF_IMG_FILE imgFile = new T_PF_IMG_FILE
{
ID = ImgID,
FILE_NAME = fileName,
FILE_TYPE = item.ContentType,
ORG_ID = orgId,
CREATER_ID = LoginID,
CREATE_TIME = now
};
var inputStream = item.OpenReadStream();
//支持转换时，按类型转为图片，否则直接存储
if (isSuppot)
{
if (!string.IsNullOrEmpty(host))
{
ConvertImageFileParam param = new ConvertImageFileParam();
param.FileName = fileName;
Byte[] fileData = new Byte[(int)item.Length];
Stream sr = inputStream;//创建数据流对象
sr.Read(fileData, 0, (int)item.Length);
param.FileData = fileData;
string url = host + "ImageConvert/ImageConvert";
ConvertImageFileParam retModel =
WebUtils.Execute<ConvertImageFileParam>(url, param, string.Empty, SendType.Post);
if (retModel != null && retModel.Files != null && retModel.Files.Any())
list.AddRange(retModel.Files);
}
else
{
var convert = imageConverterFactory.CreateImageConverter(fileName);
convert.ConvertToImage(fileName, inputStream, list);
}
if (isSaveSelf)//保存自身数据
{
Byte[] fileData = new Byte[(int)item.Length];
Stream sr = inputStream;//创建数据流对象
sr.Read(fileData, 0, (int)item.Length);
T_PF_FILE file = new T_PF_FILE
{
FILE_NAME = fileName,
FILE_TYPE = item.ContentType,
//FILE_DATA = fileData,
ORG_ID = orgId,
//FILE_PATH = filePath + fileName
FILE_PATH = filePath + saveName,//wyw,
CREATER_ID = LoginID,
CREATE_TIME = now
};
imgFile.FILE_ID = file.ID;
imgFile.Nav_File = file;
fileList.Add(file);
}
}
else
{
ConvertImageFile tmpImgFile = new ConvertImageFile();
//tmpImgFile.FileName = fileName;
tmpImgFile.FileName = saveName;//wyw
tmpImgFile.FileType = item.ContentType;
Byte[] fileData = new Byte[(int)item.Length];
Stream sr = inputStream;//创建数据流对象
sr.Read(fileData, 0, (int)item.Length);
tmpImgFile.FileData = fileData;
list.Add(tmpImgFile);
}
//保存文件数据
if (list.Any())
{
int i = 1;
foreach (var fileitem in list)
{
T_PF_FILE file = new T_PF_FILE
{
ID = Guid.NewGuid(),
FILE_NAME = fileitem.FileName,
FILE_TYPE = fileitem.FileType,
//FILE_DATA = fileitem.FileData,
//FILE_PATH = filePath + fileName,
FILE_PATH = filePath + saveName,//wyw,
ORG_ID = orgId,
CREATER_ID = LoginID,
CREATE_TIME = now
};
if (!isSuppot && isSaveSelf)
{
imgFile.FILE_ID = file.ID;
imgFile.Nav_File = file;
}
if (string.IsNullOrEmpty(imgFile.FILE_PATH) && !string.IsNullOrEmpty(file.FILE_PATH))
imgFile.FILE_PATH = file.FILE_PATH;
T_PF_IMG_FILE_DETAIL detail = new T_PF_IMG_FILE_DETAIL
{
ORG_ID = orgId,
IMG_FILE_ID = imgFile.ID,
FILE_ID = file.ID,
NUM = i,
CREATER_ID = LoginID,
CREATE_TIME = now
};
i++;
fileList.Add(file);
imgFileDetailList.Add(detail);
}
}
imgFileList.Add(imgFile);
result.imgFileID = imgFile.ID;
result.imgFilePath = imgFile.Nav_File?.FILE_PATH;
}
}
#endregion
#region 隐患上报处理
T_SK_HIDDEN_DANGER_HAND_REPORT risk = new T_SK_HIDDEN_DANGER_HAND_REPORT();
List<T_SK_HIDDEN_DANGER_HAND_REPORT_FILE> listFiles = new List<T_SK_HIDDEN_DANGER_HAND_REPORT_FILE>();
T_SK_HIDDEN_DANGER_CONFIRM confirm = new T_SK_HIDDEN_DANGER_CONFIRM();
List<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO> listPhotos = new List<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>();
#region risk 赋值
risk.ID = Guid.NewGuid();
risk.ORG_ID = orgId;
risk.CREATE_TIME = DateTime.Now;
risk.CREATER_ID = LoginID;
try
{
risk.RISK_AREA_ID = new Guid(formInfo["RISK_AREA_ID"]);
risk.HIDDEN_PLACE = formInfo["HIDDEN_PLACE"];
risk.HIDDEN_DESCRIPTION = formInfo["HIDDEN_DESCRIPTION"];
risk.APPLY_USER_ID = new Guid(formInfo["APPLY_USER_ID"]);
risk.APPLY_DEPARTMENT_ID = new Guid(formInfo["APPLY_DEPARTMENT_ID"]);
var minetype = int.Parse(formInfo["MineType"]);
switch (minetype)
{
case 0:
risk.MineType = SKProductionUnit.All;
break;
case 10:
risk.MineType = SKProductionUnit.MineChoose;
break;
case 20:
risk.MineType = SKProductionUnit.Minelast;
break;
case 30:
risk.MineType = SKProductionUnit.Mine;
break;
case 31:
risk.MineType = SKProductionUnit.Department;
break;
case 32:
risk.MineType = SKProductionUnit.Nonmetallic;
break;
case 40:
risk.MineType = SKProductionUnit.MineUnderGround;
break;
default:
risk.MineType = SKProductionUnit.All;
break;
}
}
catch { }
if (!risk.RISK_AREA_ID.HasValue)
{
throw new Exception("检查区域不能为空！");
}
if (string.IsNullOrEmpty(risk.HIDDEN_PLACE))
{
throw new Exception("隐患地点不能为空！");
}
if (string.IsNullOrEmpty(risk.HIDDEN_DESCRIPTION))
{
throw new Exception("隐患描述不能为空！");
}
else if (risk.HIDDEN_DESCRIPTION.Length > 500)
{
throw new Exception("隐患描述不能超过500字！");
}
risk.STATUS = PFStandardStatus.Archived;
if (risk.APPLY_DEPARTMENT_ID == null || risk.APPLY_DEPARTMENT_ID == Guid.Empty)
risk.APPLY_DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.DepartmentID;
if (risk.APPLY_USER_ID == null || risk.APPLY_USER_ID == Guid.Empty)
risk.APPLY_USER_ID = LoginID;
#endregion
#region 隐患确认单 赋值
confirm.ID = Guid.NewGuid();
confirm.HIDDEN_DANGER_HAND_REPORT_ID = risk.ID;
confirm.ORG_ID = orgId;
confirm.CREATE_TIME = DateTime.Now;
confirm.CREATER_ID = LoginID;
confirm.APPLY_USER_ID = risk.APPLY_USER_ID;
confirm.APPLY_DEPARTMENT_ID = risk.APPLY_DEPARTMENT_ID;
confirm.MineType = risk.MineType;
confirm.RISK_AREA_ID = risk.RISK_AREA_ID;
confirm.HIDDEN_PLACE = risk.HIDDEN_PLACE;
confirm.HIDDEN_DESCRIPTION = risk.HIDDEN_DESCRIPTION;
confirm.STATUS = PFStandardStatus.Draft;
#endregion
#region 待办 日志 等 赋值处理
T_FM_NOTIFICATION_TASK taskMaster = null;
T_FM_NOTIFICATION_TASK taskEnd = null;
//手动上报 保存并发送 通知安全员
if (risk.STATUS == PFStandardStatus.Archived)
{
Guid UserId = Guid.Empty;
string userName = String.Empty;
#region 版本 2 本层级找 安全员 找不到就找负责人 （如果是负责人 就是自己）
var master = GetEntity<T_FM_USER>(risk.APPLY_USER_ID.Value, "Nav_Department");
if (master.Nav_Department == null)
{
throw new Exception("未获取到您的组织信息，操作失败！");
}
if (master.Nav_Department.USER_ID.HasValue && master.Nav_Department.USER_ID.Value == risk.APPLY_USER_ID.Value)
{
//如果自己是负责人 就是自己
UserId = risk.APPLY_USER_ID.Value;
userName = master.NAME;
}
else
{
//找安全员 如果没有 找负责人
// 班组 班长 否则 安全员 FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
if (master.Nav_Department.DEPARTMENT_TYPE == 2)
{
if (master.Nav_Department.USER_ID.HasValue)
{
UserId = master.Nav_Department.USER_ID.Value;
userName = GetEntity<T_FM_USER>(UserId)?.NAME;
}
else
{
var userSafe = GetEntity<T_FM_USER>(e => !e.IS_DELETED && e.DEPARTMENT_ID == master.DEPARTMENT_ID && e.Nav_ApproveRole.NAME.Contains("负责人"));
if (userSafe != null)
{
UserId = userSafe.ID;
userName = userSafe.NAME;
}
}
}
else
{
var userSafe = GetEntity<T_FM_USER>(e => !e.IS_DELETED && e.DEPARTMENT_ID == master.DEPARTMENT_ID && e.Nav_ApproveRole.NAME.Contains("安全员"));
if (userSafe != null)
{
UserId = userSafe.ID;
userName = userSafe.NAME;
}
else
{
userSafe = GetEntity<T_FM_USER>(e => !e.IS_DELETED && e.DEPARTMENT_ID == master.DEPARTMENT_ID && e.Nav_ApproveRole.NAME.Contains("负责人"));
if (userSafe != null)
{
UserId = userSafe.ID;
userName = userSafe.NAME;
}
}
}
}
if (UserId == Guid.Empty)//没找到给自己
{
UserId = risk.APPLY_USER_ID.Value;
userName = master.NAME;
}
#endregion
taskMaster = NotificationTaskService.InsertUserNoticeTaskModel("隐患确认单(离线触发)", confirm.ID, confirm.ORG_ID, UserId, userName, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK018");
if (risk.TaskID != Guid.Empty)
{
taskEnd = NotificationTaskService.GetEntityTask(risk.TaskID, "SK016_SHOWPRINT");
}
}
#endregion
#region CONTENT_FILE 赋值
//隐患上报信息附件
foreach (var item in imgFileList)
{
listFiles.Add(new T_SK_HIDDEN_DANGER_HAND_REPORT_FILE()
{
ID = Guid.NewGuid(),
ORG_ID = orgId,
CREATE_TIME = now,
CREATER_ID = LoginID,
HIDDEN_DANGER_HAND_REPORT_ID = risk.ID,
IMG_FILE_ID = item.ID
});
listPhotos.Add(new T_SK_HIDDEN_DANGER_CONFIRM_PHOTO()
{
ID = Guid.NewGuid(),
ORG_ID = orgId,
CREATE_TIME = now,
CREATER_ID = LoginID,
HIDDEN_DANGER_CONFIRM_ID = confirm.ID,
IMG_FILE_ID = item.ID
});
}
#endregion
#endregion
#region 数据操作
try
{
//为了不让隐患上报数据冲突 entity.ID 前端直接传入
this.UnifiedCommit(() =>
{
if (fileList != null && fileList.Any())
BantchSaveEntityNoCommit(fileList);
if (imgFileList != null && imgFileList.Any())
BantchSaveEntityNoCommit(imgFileList);
if (imgFileDetailList != null && imgFileDetailList.Any())
BantchSaveEntityNoCommit(imgFileDetailList);
if (risk != null)
UpdateEntityNoCommit(risk);
if (confirm != null)
UpdateEntityNoCommit(confirm);
if (taskMaster != null)
UpdateEntityNoCommit(taskMaster);
if (taskEnd != null)
UpdateEntityNoCommit(taskEnd);
if (listFiles != null && listFiles.Any())
BantchSaveEntityNoCommit(listFiles);
if (listPhotos != null && listPhotos.Any())
BantchSaveEntityNoCommit(listPhotos);
});
}
catch
{
//提交错误
result.imgFileID = "";
result.imgFilePath = "";
}
#endregion
return result;
});
}
/// <summary>
/// 根据OrgId获取文件夹名称
/// </summary>
/// <param name="OrgId"></param>
/// <returns></returns>
private string GetFilePath(Guid OrgId)
{
string orgid = OrgId.ToString().ToUpperInvariant();
string pathHead = "";
if (OrgId != new Guid())
{
List<EnumberEntity> listHead = EnumToList<FilePathHead>();
var info = listHead.FirstOrDefault(e => e.Desction == orgid);
if (info != null)
{
pathHead = info.EnumName;
}
}
DateTime dtNow = DateTime.Now;
var filePath = string.Format("/{0}/{1}/{2}/", dtNow.ToString("yyyy"), dtNow.ToString("yyyyMM"), dtNow.ToString("yyyyMMdd"));
return string.IsNullOrEmpty(pathHead) ? filePath : "/" + pathHead + filePath;
}
#endregion
}
}

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

@ -43,7 +43,7 @@ namespace APT.SK.WebApi.Controllers.Api
entity.APPLY_DEPARTMENT_ID = departId;
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);
var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.ID == entity.HIDDEN_DANGER_RECTIFY_RECORD_ID);
if (record != null)
{
var hiddenLevel = record.HIDDEN_LEVEL;
@ -68,7 +68,7 @@ namespace APT.SK.WebApi.Controllers.Api
UpdateEntityNoCommit(entity);
}, null, null, null, null, null, "SK024_SHOWPRINT", null, level + "延期整改申请审批");
return true;
}
}
}
this.UnifiedCommit(() =>
{
@ -77,9 +77,9 @@ namespace APT.SK.WebApi.Controllers.Api
});
return true;
});
}
}
/// <summary>
/// 获得单条实体数据
/// </summary>
@ -113,7 +113,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
T_FM_NOTIFICATION_TASK task = null;
var apply = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_DELAY_APPLY>(entity.ID);
if(apply != null)
if (apply != null)
apply.STATUS = PFStandardStatus.Archived;
if (entity.TaskID != Guid.Empty)
{

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

@ -109,7 +109,7 @@ namespace APT.SK.WebApi.Controllers.Api
basic.LAW_ID = item2.LAW_ID;
basic.Nav_Law = null;
basicList.Add(basic);
}
}
}
}
item.Nav_RectifyDetailBasics = null;
@ -134,7 +134,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
entity.STATUS = PFStandardStatus.Sign;
var userIds = details == null ? null : details.Where(m=> m.ACCEPT_USER_ID != null).Select(t => (Guid)t.ACCEPT_USER_ID).Distinct().ToList();
var userIds = details == null ? null : details.Where(m => m.ACCEPT_USER_ID != null).Select(t => (Guid)t.ACCEPT_USER_ID).Distinct().ToList();
if (userIds != null && userIds.Any())
{
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
@ -182,7 +182,209 @@ namespace APT.SK.WebApi.Controllers.Api
return true;
});
}
[HttpPost, Route("FullUpdateYL")]
public JsonActionResult<bool> FullUpdateYL([FromBody] T_SK_HIDDEN_DANGER_RECTIFY_NOTICE 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_RectifyDetails;
entity.Nav_RectifyDetails = null;
var files = entity.Nav_RectifyFiles;
entity.Nav_RectifyFiles = null;
List<Guid> deleteFileIds = new List<Guid>();
List<Guid> deleteBasicIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE> fileList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC> basicList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC>();
if (details != null && details.Any())
{
var evaluationIsExist = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(t => t.ID == entity.ID, new string[] { "Nav_RectifyDetails", "Nav_RectifyDetails.Nav_RectifyDetailFiles", "Nav_RectifyDetails.Nav_RectifyDetailBasics" });
if (evaluationIsExist != null && evaluationIsExist.Nav_RectifyDetails != null && evaluationIsExist.Nav_RectifyDetails.Any())
{
evaluationIsExist.Nav_RectifyDetails.ForEach(t =>
{
if (t.Nav_RectifyDetailFiles != null && t.Nav_RectifyDetailFiles.Any())
{
var tempIds = t.Nav_RectifyDetailFiles.Select(m => m.ID).ToList();
deleteFileIds.AddRange(tempIds);
}
if (t.Nav_RectifyDetailBasics != null && t.Nav_RectifyDetailBasics.Any())
{
var tempIds = t.Nav_RectifyDetailBasics.Select(m => m.ID).ToList();
deleteBasicIds.AddRange(tempIds);
}
deleteDetailIds.Add(t.ID);
});
}
foreach (var item in details)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_RECTIFY_NOTICE_ID = entity.ID;
if (item.RECITIFY_USER_ID == null)
throw new Exception("整改责任人丢失，请联系管理员排查");
if (item.IMPLEMENT_USER_ID == item.ACCEPT_USER_ID)
throw new Exception("验收人与整改落实人不能为同一人");
if (item.Nav_RectifyDetailFiles != null && item.Nav_RectifyDetailFiles.Any())
{
foreach (var item2 in item.Nav_RectifyDetailFiles)
{
if (!item2.IS_DELETED)
{
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE file = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE();
file.ORG_ID = entity.ORG_ID;
file.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = item.ID;
file.IMG_FILE_ID = item2.IMG_FILE_ID;
file.Nav_ImgFile = null;
fileList.Add(file);
}
}
}
if (item.Nav_RectifyDetailBasics != null && item.Nav_RectifyDetailBasics.Any())
{
foreach (var item2 in item.Nav_RectifyDetailBasics)
{
if (!item2.IS_DELETED)
{
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC basic = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC();
basic.ORG_ID = entity.ORG_ID;
basic.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = item.ID;
basic.LAW_ID = item2.LAW_ID;
basic.Nav_Law = null;
basicList.Add(basic);
}
}
}
item.Nav_RectifyDetailBasics = null;
item.Nav_RectifyDetailFiles = null;
item.Nav_Contents = null;
item.Nav_RecitifyUser = null;
item.Nav_AcceptUser = null;
item.Nav_ImplementUser = null;
}
}
if (files != null && files.Any())
{
foreach (var item in files)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_RECTIFY_NOTICE_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
T_FM_NOTIFICATION_TASK task = null;
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> records = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA> photoList = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
entity.STATUS = PFStandardStatus.Archived;
if (details != null && details.Any())
{
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用, new BaseFilter(entity.ORG_ID));
foreach (var detail in details)
{
if (detail.IMPLEMENT_USER_ID != null)
{
var user = users.FirstOrDefault(t => t.ID == detail.IMPLEMENT_USER_ID);
if (user != null)
{
//发消息
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
record.APPLY_USER_ID = entity.APPLY_USER_ID;
record.ORG_ID = entity.ORG_ID;
record.HIDDEN_DANGER_REPORT_ID = entity.HIDDEN_DANGER_REPORT_ID;
record.HIDDEN_DANGER_REPORT_DETAIL_ID = entity.HIDDEN_DANGER_REPORT_DETAIL_ID;
record.HIDDEN_DANGER_CONFIRM_ID = entity.HIDDEN_DANGER_CONFIRM_ID;
record.HIDDEN_DANGER_RECTIFY_NOTICE_ID = entity.ID;
record.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = detail.ID;
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
record.MineType = entity.MineType;
record.RISK_AREA_ID = detail.RISK_AREA_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;
record.CHECKCONTENT = detail.CHECKCONTENT;
record.CHECKPROOF = detail.CHECKPROOF;
record.CHECKSTANDARD = detail.CHECKSTANDARD;
record.HIDDEN_PLACE = detail.HIDDEN_PLACE;
record.HIDDEN_DESCRIPTION = detail.HIDDEN_DESCRIPTION;
record.HIDDEN_LEVEL = detail.HIDDEN_LEVEL;
record.RECTIFICATION_MEASURES = detail.RECTIFICATION_MEASURES;
record.RECITIFY_TIME = detail.RECITIFY_TIME;
record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = detail.ACCEPT_USER_ID;
record.IMPLEMENT_USER_ID = detail.IMPLEMENT_USER_ID;
record.STATUS = PFStandardStatus.Draft;
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_TIME = entity.CHECK_TIME;
records.Add(record);
if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any())
{
foreach (var item in detail.Nav_RectifyDetailFiles)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA();
file.ORG_ID = item.ORG_ID;
file.IMG_FILE_ID = item.IMG_FILE_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
photoList.Add(file);
}
}
var endtime = DateTime.Now.AddDays(3);
if (record.RECITIFY_TIME != null && record.RECITIFY_TIME != DateTime.MinValue)
{
endtime = DateTime.Parse(record.RECITIFY_TIME.Value.ToShortDateString() + " 23:59:59");
}
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录表(" + detail.HIDDEN_LEVEL.GetDescription() + ")", record.ID, record.ORG_ID, user.ID, user.NAME, DateTime.Now,
endtime, (int)FMNoticeTypeEnum.消息, "SK022");
notices.Add(sendNotice);
}
}
}
}
if (entity.TaskID != Guid.Empty)
{
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK020_SHOWPRINT";
}
}
this.UnifiedCommit(() =>
{
if (deleteBasicIds != null && deleteBasicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC>(deleteBasicIds);
if (deleteFileIds != null && deleteFileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE>(deleteFileIds);
if (deleteDetailIds != null && deleteDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(deleteDetailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (task != null)
UpdateEntityNoCommit(task);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices);
if (fileList != null && fileList.Any())
BantchSaveEntityNoCommit(fileList);
if (basicList != null && basicList.Any())
BantchSaveEntityNoCommit(basicList);
if (records != null && records.Any())
this.BantchSaveEntityNoCommit(records);
if (photoList != null && photoList.Any())
this.BantchSaveEntityNoCommit(photoList);
});
return true;
});
}
/// <summary>
/// 获得单条实体数据
/// </summary>
@ -350,7 +552,7 @@ namespace APT.SK.WebApi.Controllers.Api
record.HIDDEN_DANGER_CONFIRM_ID = notice.HIDDEN_DANGER_CONFIRM_ID;
record.HIDDEN_DANGER_RECTIFY_NOTICE_ID = notice.ID;
record.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = detail.ID;
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "")+ random.Next(1, 999);
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + random.Next(1, 999);
record.MineType = notice.MineType;
record.RISK_AREA_ID = detail.RISK_AREA_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
@ -420,7 +622,7 @@ namespace APT.SK.WebApi.Controllers.Api
public PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE> FullOrderPaged([FromBody] KeywordPageFilter pageFilter)
{
var result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(null, pageFilter);
if (result != null && result.Data!=null && result.Data.Any())
if (result != null && result.Data != null && result.Data.Any())
{
var ids = result.Data.Select(t => t.ID).ToList();
var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => ids.Contains(t.HIDDEN_DANGER_RECTIFY_NOTICE_ID), new BaseFilter(pageFilter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ImplementUser", "Nav_AcceptUser").ToList();

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

@ -52,12 +52,12 @@ namespace APT.SK.WebApi.Controllers
{
throw new Exception("验收人和落实人不能是同一个人");
}
if (entity.ACCEPT_RESULTE == SKAcceptResultEnum.No && string.IsNullOrEmpty(entity.ACCEPT_OPINION))
if (entity.ACCEPT_RESULTE == SKAcceptResultEnum.No && string.IsNullOrEmpty(entity.ACCEPT_OPINION))
{
throw new Exception("不合格验收意见必须填写");
}
if (string.IsNullOrEmpty(entity.CODE))
entity.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1,999);
entity.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(entity.ID);
if (record != null)
{
@ -144,7 +144,7 @@ namespace APT.SK.WebApi.Controllers
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.IMPLEMENT_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-驳回", entity.ID, entity.ORG_ID, (Guid)entity.IMPLEMENT_USER_ID, user?.NAME, DateTime.Now,
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-驳回", entity.ID, entity.ORG_ID, (Guid)entity.IMPLEMENT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
else
@ -200,8 +200,195 @@ namespace APT.SK.WebApi.Controllers
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK022_SHOWPRINT";
}
}
this.UnifiedCommit(() =>
{
if (entity != null)
UpdateEntityNoCommit(entity);
if (task != null)
UpdateEntityNoCommit(task);
if (photoas != null && photoas.Any())
BantchSaveEntityNoCommit(photoas);
if (photobs != null && photobs.Any())
BantchSaveEntityNoCommit(photobs);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
if (notice != null)
UpdateEntityNoCommit(notice);
});
return true;
});
}
[HttpPost, Route("FullUpdateYL")]
public JsonActionResult<bool> FullUpdateYL([FromBody] T_SK_HIDDEN_DANGER_RECTIFY_RECORD 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;
if (entity.IMPLEMENT_USER_ID == entity.ACCEPT_USER_ID)
{
throw new Exception("验收人和落实人不能是同一个人");
}
if (entity.ACCEPT_RESULTE == SKAcceptResultEnum.No && string.IsNullOrEmpty(entity.ACCEPT_OPINION))
{
throw new Exception("不合格验收意见必须填写");
}
if (string.IsNullOrEmpty(entity.CODE))
entity.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(entity.ID, "Nav_RectifyPhotoas");
if (record != null)
{
entity.HIDDEN_DANGER_REPORT_ID = record.HIDDEN_DANGER_REPORT_ID;
entity.HIDDEN_DANGER_REPORT_DETAIL_ID = record.HIDDEN_DANGER_REPORT_DETAIL_ID;
entity.HIDDEN_DANGER_CONFIRM_ID = record.HIDDEN_DANGER_CONFIRM_ID;
entity.HIDDEN_DANGER_RECTIFY_NOTICE_ID = record.HIDDEN_DANGER_RECTIFY_NOTICE_ID;
entity.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = record.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID;
entity.RECITIFY_USER_ID = record.RECITIFY_USER_ID;
entity.ACCEPT_USER_ID = record.ACCEPT_USER_ID;
entity.IMPLEMENT_USER_ID = record.IMPLEMENT_USER_ID;
entity.CHECK_TIME = record.CHECK_TIME;
entity.CHECK_PERSON = record.CHECK_PERSON;
entity.Nav_RectifyPhotoas = record.Nav_RectifyPhotoas;
}
var photoas = entity.Nav_RectifyPhotoas;
entity.Nav_RectifyPhotoas = null;
var photobs = entity.Nav_RectifyPhotobs;
entity.Nav_RectifyPhotobs = null;
var files = entity.Nav_RectifyFiles;
entity.Nav_RectifyFiles = null;
var basics = entity.Nav_RectifyBasics;
entity.Nav_RectifyBasics = null;
if (photoas != null && photoas.Any())
{
foreach (var item in photoas)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (photobs != null && photobs.Any())
{
foreach (var item in photobs)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (files != null && files.Any())
{
foreach (var item in files)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (basics != null && basics.Any())
{
foreach (var item in basics)
{
item.ORG_ID = entity.ORG_ID;
item.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
item.Nav_Law = null;
}
}
T_FM_NOTIFICATION_TASK notice = null;
T_FM_NOTIFICATION_TASK task = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
if (entity.STATUS == PFStandardStatus.Draft || entity.STATUS == PFStandardStatus.Rejected)
{
if (entity.ACCEPT_USER_ID != null)
{
entity.STATUS = PFStandardStatus.Sign;
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.ACCEPT_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + departName + DateTime.Now.ToShortDateString().Replace("/", "") + ")-验收", entity.ID, entity.ORG_ID, (Guid)entity.ACCEPT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
}
else if (entity.STATUS == PFStandardStatus.Sign)
{
if (entity.ACCEPT_RESULTE == MS.Domain.Enums.SK.SKAcceptResultEnum.No)
{
if (entity.IMPLEMENT_USER_ID != null)
{
//驳回给整改落实人
entity.STATUS = PFStandardStatus.Rejected;
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.IMPLEMENT_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-驳回", entity.ID, entity.ORG_ID, (Guid)entity.IMPLEMENT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
else
{
//驳回给整改责任人
entity.STATUS = PFStandardStatus.Rejected;
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.RECITIFY_USER_ID);
//发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-驳回", entity.ID, entity.ORG_ID, (Guid)entity.RECITIFY_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
}
}
else
{
//触发审批
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[] { ',' });
var param = Enum.GetName(typeof(SKHiddenLevel), entity.HIDDEN_LEVEL);
var level = (param == "Major" || param == "重大") ? "重大" : "一般";
if (entity.HIDDEN_LEVEL == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
level = Enum.GetName(typeof(FMDepartmentType), departmentType);
}
MFlowPermitService.InsertApprove(serialCode[0], "SK022", level, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () =>
{
if (entity != null)
UpdateEntityNoCommit(entity);
if (photoas != null && photoas.Any())
BantchSaveEntityNoCommit(photoas);
if (photobs != null && photobs.Any())
BantchSaveEntityNoCommit(photobs);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
if (notice != null)
UpdateEntityNoCommit(notice);
}, null, entity.APPLY_USER_ID, null, null, null, "SK022_SHOWPRINT", null);
return true;
}
}
if (entity.TaskID != Guid.Empty)
{
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK022_SHOWPRINT";
}
}
this.UnifiedCommit(() =>
{
if (entity != null)
@ -237,7 +424,7 @@ namespace APT.SK.WebApi.Controllers
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea","Nav_Contents","Nav_Question",
"Nav_RecitifyUser","Nav_ImplementUser","Nav_AcceptUser","Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyBasics.Nav_Law"});
"Nav_RecitifyUser.Nav_Department","Nav_RecitifyUser.Nav_UserSignFiles","Nav_ImplementUser.Nav_UserSignFiles","Nav_AcceptUser.Nav_UserSignFiles","Nav_AcceptUser","Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyBasics.Nav_Law"});
if (result != null && result.STATUS == PFStandardStatus.Rejected)
{
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);
@ -323,26 +510,26 @@ namespace APT.SK.WebApi.Controllers
var areaList = this.GetEntities<T_SK_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
var contentList = this.GetEntities<T_SK_CHECK_CONTENTS>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
var records = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId), "Nav_RiskArea", "Nav_Contents");
var groupRecords= records.GroupBy(m => new { m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.HIDDEN_DESCRIPTION, m.HIDDEN_LEVEL })
.Select(m => m.FirstOrDefault()).ToList();
//.Select(m => new T_SK_HIDDEN_DANGER_RECTIFY_RECORD
//{
// RISK_AREA_ID = m.Key.RISK_AREA_ID,
// Nav_RiskArea = areaList.FirstOrDefault(t => t.ID == m.Key.RISK_AREA_ID),
// CHECK_CONTENTS_ID = m.Key.CHECK_CONTENTS_ID,
// Nav_Contents = contentList.FirstOrDefault(t => t.ID == m.Key.CHECK_CONTENTS_ID),
// HIDDEN_DESCRIPTION = m.Key.HIDDEN_DESCRIPTION,
// HIDDEN_LEVEL = m.Key.HIDDEN_LEVEL,
// QTY = m.Count(p => p.RISK_AREA_ID == m.Key.RISK_AREA_ID && p.CHECK_CONTENTS_ID == m.Key.CHECK_CONTENTS_ID && p.HIDDEN_DESCRIPTION == m.Key.HIDDEN_DESCRIPTION && p.HIDDEN_LEVEL == m.Key.HIDDEN_LEVEL),
//}).ToList();
var groupRecords = records.GroupBy(m => new { m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.HIDDEN_DESCRIPTION, m.HIDDEN_LEVEL })
.Select(m => m.FirstOrDefault()).ToList();
//.Select(m => new T_SK_HIDDEN_DANGER_RECTIFY_RECORD
//{
// RISK_AREA_ID = m.Key.RISK_AREA_ID,
// Nav_RiskArea = areaList.FirstOrDefault(t => t.ID == m.Key.RISK_AREA_ID),
// CHECK_CONTENTS_ID = m.Key.CHECK_CONTENTS_ID,
// Nav_Contents = contentList.FirstOrDefault(t => t.ID == m.Key.CHECK_CONTENTS_ID),
// HIDDEN_DESCRIPTION = m.Key.HIDDEN_DESCRIPTION,
// HIDDEN_LEVEL = m.Key.HIDDEN_LEVEL,
// QTY = m.Count(p => p.RISK_AREA_ID == m.Key.RISK_AREA_ID && p.CHECK_CONTENTS_ID == m.Key.CHECK_CONTENTS_ID && p.HIDDEN_DESCRIPTION == m.Key.HIDDEN_DESCRIPTION && p.HIDDEN_LEVEL == m.Key.HIDDEN_LEVEL),
//}).ToList();
if (groupRecords != null && groupRecords.Any())
{
foreach (var record in groupRecords)
foreach (var record in groupRecords)
{
record.QTY = records.Count(p => p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.HIDDEN_DESCRIPTION == record.HIDDEN_DESCRIPTION && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL);
}
var data = groupRecords.OrderBy(t=>t.RISK_AREA_ID).ThenBy(m=>m.CHECK_CONTENTS_ID).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
var data = groupRecords.OrderBy(t => t.RISK_AREA_ID).ThenBy(m => m.CHECK_CONTENTS_ID).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
result.Data = data;
result.TotalCount = groupRecords.Count;
}
@ -434,8 +621,8 @@ namespace APT.SK.WebApi.Controllers
if (result != null && result.Data != null && result.Data.Any())
{
result.Data.ForEach(t =>
{
{
if (t.HIDDEN_DANGER_CONFIRM_ID != null)
{
t.REMARK = "手动上报";

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

@ -91,7 +91,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
foreach (var item in details)
{
var isExsists = details.FirstOrDefault(t => t.CHECK_QUESTION_ID==null);
var isExsists = details.FirstOrDefault(t => t.CHECK_QUESTION_ID == null);
if (isExsists != null)
{
throw new Exception("每行的隐患描述都必须填写");
@ -219,8 +219,8 @@ namespace APT.SK.WebApi.Controllers.Api
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK014_SHOWPRINT";
}
}
}
this.UnifiedCommit(() =>
{
if (deleteBasicIds != null && deleteBasicIds.Any())
@ -263,7 +263,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents","Nav_ReportDetails.Nav_Question","Nav_ReportDetails.Nav_ReportDetailBasics.Nav_Law",
"Nav_ReportDetails.Nav_RecitifyUser", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile",
"Nav_ReportDetails.Nav_RecitifyUser.Nav_UserSignFiles", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile",
"Nav_ReportFiles","Nav_ReportFiles.Nav_ImgFile"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null
@ -298,15 +298,15 @@ namespace APT.SK.WebApi.Controllers.Api
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null
{
result.CHECK_PERSON = string.IsNullOrEmpty(result.CHECK_PERSON) ? "" : result.CHECK_PERSON;
//var detailTemps = result.Nav_CheckRecordDetails.Where(c => c.Nav_CheckRecordDetailUsers != null && c.Nav_CheckRecordDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).ToList();
var details = result.Nav_ReportDetails.GroupBy(t => t.RISK_AREA_ID).Select(g => g.First()).ToList();
result.CHECK_PERSON = string.IsNullOrEmpty(result.CHECK_PERSON) ? "" : result.CHECK_PERSON;
//var detailTemps = result.Nav_CheckRecordDetails.Where(c => c.Nav_CheckRecordDetailUsers != null && c.Nav_CheckRecordDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).ToList();
var details = result.Nav_ReportDetails.GroupBy(t => t.RISK_AREA_ID).Select(g => g.First()).ToList();
if (details != null && details.Any())
{
foreach (var item in details)
{
item.Nav_DetailContents = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL>();
item.Nav_DetailContents = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL>();
var safeCheck1 = result.Nav_ReportDetails.Where(t => t.RISK_AREA_ID == item.RISK_AREA_ID).ToList();
if (safeCheck1 != null && safeCheck1.Any())
{
@ -321,7 +321,7 @@ namespace APT.SK.WebApi.Controllers.Api
ddd.CHECKCONTENT = item2.CHECKCONTENT;
ddd.CHECKPROOF = item2.CHECKPROOF;
ddd.CHECKSTANDARD = item2.CHECKSTANDARD;
ddd.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item2.HIDDEN_DESCRIPTION) ? "" : item2.HIDDEN_DESCRIPTION;
ddd.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item2.HIDDEN_DESCRIPTION) ? item2.Nav_Question?.DESCREPTION : item2.HIDDEN_DESCRIPTION;
ddd.HIDDEN_LEVEL = item2.HIDDEN_LEVEL;
ddd.HIDDEN_PLACE = string.IsNullOrEmpty(item2.HIDDEN_PLACE) ? "" : item2.HIDDEN_PLACE;
ddd.Nav_RecitifyUser = item2.Nav_RecitifyUser;
@ -340,11 +340,11 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
ddd.Nav_ReportDetailBasics = lawTemps;
item.Nav_DetailContents.Add(ddd);
item.Nav_DetailContents.Add(ddd);
}
}
}
}
result.Nav_ReportDetails = details;
}
@ -567,7 +567,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents"
});
if (result == null)
{
{
var confirm = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_RiskArea",
"Nav_Contents","Nav_CheckType"});
if (confirm != null)
@ -606,7 +606,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())
{
var detailIds = result.Nav_ReportDetails.Select(t => t.ID).ToList();
var noticeDetailIds = new List<Guid>() ;
var noticeDetailIds = new List<Guid>();
var noticeDetails = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>();
var notice = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(t => detailIds.Contains((Guid)t.HIDDEN_DANGER_REPORT_DETAIL_ID), "Nav_RectifyDetails");
if (notice != null && notice.Nav_RectifyDetails != null && notice.Nav_RectifyDetails.Any())
@ -637,15 +637,15 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item in result.Nav_ReportDetails)
{
var status = rectifys.FirstOrDefault(t =>(t.HIDDEN_DANGER_REPORT_DETAIL_ID == item.ID || t.HIDDEN_DANGER_CONFIRM_ID == item.ID) && t.CHECK_CONTENTS_ID == item.CHECK_CONTENTS_ID && t.RISK_AREA_ID == item.RISK_AREA_ID);
var status = rectifys.FirstOrDefault(t => (t.HIDDEN_DANGER_REPORT_DETAIL_ID == item.ID || t.HIDDEN_DANGER_CONFIRM_ID == item.ID) && t.CHECK_CONTENTS_ID == item.CHECK_CONTENTS_ID && t.RISK_AREA_ID == item.RISK_AREA_ID);
if (status != null)
{
item.STATUS = status.STATUS;
item.HIDDEN_DANGER_RECTIFY_RECORD_ID = status.ID;
}
}
}
}
}
return result;
});
@ -674,7 +674,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
fileIds = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_FILE>(t => t.HIDDEN_DANGER_REPORT_ID == report.ID, new BaseFilter(report.ORG_ID)).Select(m => m.ID).ToList();
detailIds = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == report.ID, new BaseFilter(report.ORG_ID)).Select(m => m.ID).ToList();
detailFileIds = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE>(t => detailIds.Contains( t.HIDDEN_DANGER_REPORT_DETAIL_ID), new BaseFilter(report.ORG_ID)).Select(m => m.ID).ToList();
detailFileIds = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE>(t => detailIds.Contains(t.HIDDEN_DANGER_REPORT_DETAIL_ID), new BaseFilter(report.ORG_ID)).Select(m => m.ID).ToList();
detailBasicIds = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC>(t => detailIds.Contains(t.HIDDEN_DANGER_REPORT_DETAIL_ID), new BaseFilter(report.ORG_ID)).Select(m => m.ID).ToList();
approveIds = this.GetEntities<T_PF_APPROVE>(t => t.DATA_ID == report.ID, new BaseFilter(report.ORG_ID)).Select(m => m.ID).ToList();
approveDetailIds = this.GetEntities<T_PF_APPROVE_DETAIL>(t => approveIds.Contains(t.APPROVE_ID), new BaseFilter(report.ORG_ID)).Select(m => m.ID).ToList();

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

@ -55,6 +55,7 @@ namespace APT.SK.WebApi.Controllers.Api
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)
@ -66,17 +67,17 @@ namespace APT.SK.WebApi.Controllers.Api
{
throw new Exception("辨识人员不能为空");
}
if (details != null && details.Any())
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())
{
var detailIds = details.Select(t => t.ID).ToList();
deleteUserIds = this.GetEntities<T_SK_IDENTIFY_EVALUATION_PLAN_DETAIL_USER>(t => detailIds.Contains(t.IDENTIFY_EVALUATION_PLAN_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details)
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.Any())
if (item.Nav_DetailUsers != null && item.Nav_DetailUsers.Where(t => !t.IS_DELETED).Any())
{
foreach (var item2 in item.Nav_DetailUsers)
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;
@ -118,6 +119,8 @@ namespace APT.SK.WebApi.Controllers.Api
{
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())
@ -128,12 +131,14 @@ namespace APT.SK.WebApi.Controllers.Api
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())
@ -169,7 +174,7 @@ namespace APT.SK.WebApi.Controllers.Api
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");
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();

42
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskAreaController.cs
View File

@ -1,8 +1,13 @@
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Entities.SK;
using APT.MS.Domain.Enums;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Linq;
namespace APT.SK.WebApi.Controllers.Api
{
@ -44,5 +49,42 @@ namespace APT.SK.WebApi.Controllers.Api
return true;
});
}
/// <summary>
/// 区域最小单元
/// </summary>
/// <param name="pageFilter"></param>
/// <returns></returns>
[HttpPost, Route("GetAreaList")]
public PagedActionResult<T_SK_RISK_AREA> GetAreaList([FromBody] KeywordPageFilter pageFilter)
{
return SafeGetPagedData<T_SK_RISK_AREA>((result) =>
{
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.ToString();
List<Guid> ids = new List<Guid>();
Expression<Func<T_SK_RISK_AREA, bool>> expression = e => !e.IS_DELETED;
var areas = this.GetEntities<T_SK_RISK_AREA>(expression, new BaseFilter(pageFilter.OrgId)).ToList();
if (areas != null & areas.Any())
{
var parentIds = areas.Where(m => m.PARENT_ID != null).Select(t => t.PARENT_ID).ToList();
foreach (var item in areas)
{
if (!parentIds.Contains(item.ID))
{
ids.Add(item.ID);
}
}
}
Expression<Func<T_SK_RISK_AREA, bool>> expressionArea = e => !e.IS_DELETED;
if (ids != null && ids.Any())
{
expressionArea = expressionArea.And(t => ids.Contains(t.ID));
}
var info = this.GetOrderPageEntities<T_SK_RISK_AREA>(expressionArea, pageFilter, null);
result.TotalCount = info.TotalCount;
result.Data = info.Data;
result.IsSuccessful = info.IsSuccessful;
});
}
}
}

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

@ -62,25 +62,29 @@ namespace APT.SK.WebApi.Controllers.Api
var record = this.GetEntity<T_SK_RISK_EVALUATION>(t => t.ID == entity.ID, "Nav_Details");
if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any())
{
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);
}
if (t.Nav_DetailDeparts != null && t.Nav_DetailDeparts.Any())
{
var tempIds = t.Nav_DetailDeparts.Select(m => m.ID).ToList();
deleteDepartIds.AddRange(tempIds);
}
if (t.Nav_DetailPosts != null && t.Nav_DetailPosts.Any())
{
var tempIds = t.Nav_DetailPosts.Select(m => m.ID).ToList();
deletePostIds.AddRange(tempIds);
}
deleteDetailIds.Add(t.ID);
});
deleteDetailIds = record.Nav_Details.Select(t => t.ID).ToList();
deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_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);
// }
// if (t.Nav_DetailDeparts != null && t.Nav_DetailDeparts.Any())
// {
// var tempIds = t.Nav_DetailDeparts.Select(m => m.ID).ToList();
// deleteDepartIds.AddRange(tempIds);
// }
// if (t.Nav_DetailPosts != null && t.Nav_DetailPosts.Any())
// {
// var tempIds = t.Nav_DetailPosts.Select(m => m.ID).ToList();
// deletePostIds.AddRange(tempIds);
// }
// deleteDetailIds.Add(t.ID);
//});
}
if (details != null && details.Any())
{
@ -120,28 +124,28 @@ namespace APT.SK.WebApi.Controllers.Api
item.Nav_DetailPosts = null;
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险)
{
if (!item.DEPARTMENT_TYPE.Contains("公司级"))
if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("公司级"))
{
throw new Exception("第"+item.NUM+"行，重大风险管控层级必须包含公司级");
throw new Exception("第" + item.NUM + "行，重大风险管控层级必须包含公司级");
}
}
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险)
{
if (!item.DEPARTMENT_TYPE.Contains("部门级") &&!item.DEPARTMENT_TYPE.Contains("公司级"))
if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级"))
{
throw new Exception("第" + item.NUM + "行，较大风险管控层级必须大于部门级");
}
}
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险)
{
if (!item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级") && !item.DEPARTMENT_TYPE.Contains("车间级"))
if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级") && !item.DEPARTMENT_TYPE.Contains("车间级"))
{
throw new Exception("第" + item.NUM + "行，一般风险管控层级必须大于车间级");
}
}
if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险)
{
if (!item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级") && !item.DEPARTMENT_TYPE.Contains("车间级") && !item.DEPARTMENT_TYPE.Contains("班组级"))
if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级") && !item.DEPARTMENT_TYPE.Contains("车间级") && !item.DEPARTMENT_TYPE.Contains("班组级"))
{
throw new Exception("第" + item.NUM + "行，低风险管控层级必须大于班组级");
}

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

@ -161,7 +161,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName","Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC");
var details = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC");
if (details.Any())
{
var detailIds = details.Select(t => t.ID).ToList();
@ -183,7 +183,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.Nav_DetailPosts = postTemps.OrderBy(t => t.POST_ID).ToList();
}
}
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m=>m.AREA_ID).ThenBy(n=>n.TYPE_ID).ToList();
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m => m.AREA_ID).ThenBy(n => n.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);

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

@ -47,7 +47,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t=> t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
var details = entity.Nav_Details;
entity.Nav_Details = null;
var files = entity.Nav_Files;
@ -59,15 +59,17 @@ namespace APT.SK.WebApi.Controllers.Api
var record = this.GetEntity<T_SK_RISK_IDENTIFY>(t => t.ID == entity.ID, "Nav_Details");
if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any())
{
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);
});
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.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
@ -181,7 +183,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
newData.Add(company);
}
var other = result.Data.Where(t=>t.Nav_ApplyDepartment != null && t.Nav_ApplyDepartment.DEPARTMENT_TYPE != 3).OrderBy(n => n.Nav_ApplyDepartment.DEPARTMENT_TYPE).ThenBy(m => m.APPLY_DEPARTMENT_ID).ToList();
var other = result.Data.Where(t => t.Nav_ApplyDepartment != null && t.Nav_ApplyDepartment.DEPARTMENT_TYPE != 3).OrderBy(n => n.Nav_ApplyDepartment.DEPARTMENT_TYPE).ThenBy(m => m.APPLY_DEPARTMENT_ID).ToList();
if (other.Any())
{
newData.AddRange(other);
@ -208,7 +210,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type","Nav_RiskName");
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{

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

@ -62,25 +62,29 @@ namespace APT.SK.WebApi.Controllers.Api
var record = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(t => t.ID == entity.ID, "Nav_Details");
if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any())
{
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);
}
if (t.Nav_DetailDeparts != null && t.Nav_DetailDeparts.Any())
{
var tempIds = t.Nav_DetailDeparts.Select(m => m.ID).ToList();
deleteDepartIds.AddRange(tempIds);
}
if (t.Nav_DetailPosts != null && t.Nav_DetailPosts.Any())
{
var tempIds = t.Nav_DetailPosts.Select(m => m.ID).ToList();
deletePostIds.AddRange(tempIds);
}
deleteDetailIds.Add(t.ID);
});
deleteDetailIds = record.Nav_Details.Select(t => t.ID).ToList();
deleteMeasureIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_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);
// }
// if (t.Nav_DetailDeparts != null && t.Nav_DetailDeparts.Any())
// {
// var tempIds = t.Nav_DetailDeparts.Select(m => m.ID).ToList();
// deleteDepartIds.AddRange(tempIds);
// }
// if (t.Nav_DetailPosts != null && t.Nav_DetailPosts.Any())
// {
// var tempIds = t.Nav_DetailPosts.Select(m => m.ID).ToList();
// deletePostIds.AddRange(tempIds);
// }
// deleteDetailIds.Add(t.ID);
//});
foreach (var item in details)
{
var temp = record.Nav_Details.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
@ -220,15 +224,15 @@ namespace APT.SK.WebApi.Controllers.Api
return SafeExecute(() =>
{
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
this.ThrowError("060010");
if (string.IsNullOrEmpty(id))
this.ThrowError("060010");
filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile"});
if (result != null)
{
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t=>t.AREA_ID).ThenBy(x=>x.TYPE_ID).ToList();
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected)
{
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);

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

@ -60,8 +60,8 @@ namespace APT.SK.WebApi.Controllers.Api
var detailIds = details.Select(t => t.ID).ToList();
deleteMeasureIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details)
deletePostIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details)
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_RESULT_SUMMARY_ID = entity.ID;

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

@ -127,13 +127,13 @@ namespace APT.SK.WebApi.Controllers.Api
entity.APPLY_DEPARTMENT_ID = departId;
if (entity.CHECK_TYPE_ID == null)
throw new Exception("检查类型不能为空");
if (entity.CHECK_TIME == null|| entity.CHECK_TIME == DateTime.MinValue)
if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
throw new Exception("检查时间必须填写");
var details = entity.Nav_CheckNoticeDetails;
entity.Nav_CheckNoticeDetails = null;
var files = entity.Nav_CheckNoticeFiles;
entity.Nav_CheckNoticeFiles = null;
List<Guid>userIds = new List<Guid>();
List<Guid> userIds = new List<Guid>();
List<Guid> deleteUserIds = new List<Guid>();
List<Guid> deleteBasicIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
@ -170,7 +170,7 @@ namespace APT.SK.WebApi.Controllers.Api
item2.ORG_ID = entity.ORG_ID;
item2.SECURITY_INSPECTION_NOTICE_DETAIL_ID = item.ID;
item2.Nav_User = null;
item2.ISMAINCHECK = i==1?true:false;
item2.ISMAINCHECK = i == 1 ? true : false;
if (item2.USER_ID != null)
{
userIds.Add((Guid)item2.USER_ID);
@ -211,8 +211,8 @@ namespace APT.SK.WebApi.Controllers.Api
}
if (string.IsNullOrEmpty(entity.CHECK_PERSON))
{
var detailUserIds = userList.Select(t => t.USER_ID).Distinct().ToList();
var userNames = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && detailUserIds.Contains(t.ID), new BaseFilter(entity.ORG_ID)).Select(m=>m.NAME).ToList();
var detailUserIds = userList.Where(m => !m.IS_DELETED).Select(t => t.USER_ID).Distinct().ToList();
var userNames = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && detailUserIds.Contains(t.ID), new BaseFilter(entity.ORG_ID)).Select(m => m.NAME).ToList();
entity.CHECK_PERSON = string.Join(",", userNames);
}
T_FM_NOTIFICATION_TASK task = null;
@ -256,7 +256,7 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(files);
if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices);
}, null, null, null, null, null, "SK006_SHOWPRINT", null, entity.DEPARTMENT_TYPE.GetDescription()+"安全检查通知"+ date + entity.Nav_CheckType?.NAME+"待审批");
}, null, null, null, null, null, "SK006_SHOWPRINT", null, entity.DEPARTMENT_TYPE.GetDescription() + "安全检查通知" + date + entity.Nav_CheckType?.NAME + "待审批");
return true;
}
this.UnifiedCommit(() =>
@ -310,7 +310,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
detail.Nav_CheckNoticeDetailUsers = detail.Nav_CheckNoticeDetailUsers.OrderByDescending(t => t.ISMAINCHECK).ToList();
}
result.Nav_CheckNoticeDetails = result.Nav_CheckNoticeDetails.OrderBy(t => t.RISK_AREA_ID).ThenBy(m=>m.NUM).ToList();//.Where(c => c.Nav_CheckNoticeDetailUsers != null && c.Nav_CheckNoticeDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).OrderBy(m=>m.RISK_AREA_ID).ToList();
result.Nav_CheckNoticeDetails = result.Nav_CheckNoticeDetails.OrderBy(t => t.RISK_AREA_ID).ThenBy(m => m.NUM).ToList();//.Where(c => c.Nav_CheckNoticeDetailUsers != null && c.Nav_CheckNoticeDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).OrderBy(m=>m.RISK_AREA_ID).ToList();
}
return result;
});
@ -354,7 +354,7 @@ namespace APT.SK.WebApi.Controllers.Api
T_SK_SECURITY_INSPECTION_NOTICE_DETAIL ddd = new T_SK_SECURITY_INSPECTION_NOTICE_DETAIL();
ddd.CHECK_CONTENTS_ID = item2.CHECK_CONTENTS_ID;
ddd.Nav_Contents = item2.Nav_Contents;
ddd.CHECKCONTENT = item2.Nav_Contents!=null? item2.Nav_Contents.CHECKCONTENT:item2.CHECKCONTENT;
ddd.CHECKCONTENT = item2.Nav_Contents != null ? item2.Nav_Contents.CHECKCONTENT : item2.CHECKCONTENT;
ddd.CHECKPROOF = item2.CHECKPROOF;
ddd.CHECKSTANDARD = item2.CHECKSTANDARD;
if (item2.Nav_CheckNoticeDetailBasics != null && item2.Nav_CheckNoticeDetailBasics.Any())
@ -382,8 +382,8 @@ namespace APT.SK.WebApi.Controllers.Api
userTemps.Add(uuu);
}
}
}
}
}
}
item.Nav_CheckNoticeDetailUsers = userTemps;
@ -470,7 +470,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var detail in details)
{
var userTemps = users.Where(t => t.SECURITY_INSPECTION_NOTICE_DETAIL_ID == detail.ID).ToList();
detail.Nav_CheckNoticeDetailUsers = userTemps.OrderByDescending(t=>t.ISMAINCHECK).ToList();
detail.Nav_CheckNoticeDetailUsers = userTemps.OrderByDescending(t => t.ISMAINCHECK).ToList();
}
}
result.Nav_CheckNoticeDetails = details.OrderBy(t => t.RISK_AREA_ID).ThenBy(m => m.NUM).ToList();
@ -543,7 +543,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
else if (filter.Parameter3 == "4")
{
departType = SKDepartmentTypeEnum.岗位级;
departType = SKDepartmentTypeEnum.班组级;
}
else
{
@ -651,7 +651,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
else if (filter.Parameter3 == "4")
{
departType = SKDepartmentTypeEnum.岗位级;
departType = SKDepartmentTypeEnum.班组级;
}
else
{
@ -661,7 +661,7 @@ namespace APT.SK.WebApi.Controllers.Api
var departIds = posts.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).ToList();
var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => departIds.Contains(t.ID) && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType, new BaseFilter(filter.OrgId));
var contentIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t=> contentIds.Contains(t.ID), new BaseFilter(filter.OrgId),new string[] {"Nav_Contents","Nav_LibraryDetail",
var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => contentIds.Contains(t.ID), new BaseFilter(filter.OrgId), new string[] {"Nav_Contents","Nav_LibraryDetail",
"Nav_LibraryDetail.Nav_Library.Nav_Area"});
if (libraryContents != null && libraryContents.Any())
{
@ -692,13 +692,13 @@ namespace APT.SK.WebApi.Controllers.Api
detail.Nav_RiskArea = mmm?.Nav_RiskArea;
detail.Nav_CheckNoticeDetailUsers = null;
var ttt = dataList.Where(t => t.RISK_AREA_ID == temp).ToList();
if(ttt.Any())
if (ttt.Any())
{
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL> contents = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
foreach (var hh in ttt)
{
T_SK_SECURITY_INSPECTION_NOTICE_DETAIL content = new T_SK_SECURITY_INSPECTION_NOTICE_DETAIL();
content.ORG_ID= filter.OrgId;
content.ORG_ID = filter.OrgId;
content.CHECK_CONTENTS_ID = hh.CHECK_CONTENTS_ID;
content.CHECKCONTENT = hh.CHECKCONTENT;
content.CHECKPROOF = hh.CHECKPROOF;
@ -712,7 +712,7 @@ namespace APT.SK.WebApi.Controllers.Api
result.Data = newList.OrderBy(t => t.RISK_AREA_ID).ToList();
}
}
}
}
return result;
}
@ -815,7 +815,7 @@ namespace APT.SK.WebApi.Controllers.Api
RecordID = recordTemp.ID;
sourceIds.Add(recordTemp.ID);
var recordSummaryTemp = GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_RECORD_ID != null && e.SECURITY_INSPECTION_RECORD_ID == recordTemp.ID);
if(recordSummaryTemp != null)
if (recordSummaryTemp != null)
{
RecordSummaryID = recordSummaryTemp.ID;
sourceIds.Add(recordSummaryTemp.ID);
@ -944,8 +944,8 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
}
}
}
List<List<OperateLogDto>> result = new List<List<OperateLogDto>>();
if (NoticeID == null && RecordID == null && ReportID == null)
{
@ -953,7 +953,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
var approves = new List<T_PF_APPROVE>();
var approveIds = new List<Guid>();
if (sourceIds!=null && sourceIds.Any())
if (sourceIds != null && sourceIds.Any())
{
approves = GetEntities<T_PF_APPROVE>(e => sourceIds.Contains(e.DATA_ID), null, null).ToList();
approveIds = approves.Select(m => m.ID).ToList();
@ -975,7 +975,7 @@ namespace APT.SK.WebApi.Controllers.Api
#region 安全检查通知
if (NoticeID != null)
{
var tempIds = approves.Where(t => t.DATA_ID == NoticeID).OrderBy(m=>m.CREATE_TIME).Select(x => x.ID).ToList();
var tempIds = approves.Where(t => t.DATA_ID == NoticeID).OrderBy(m => m.CREATE_TIME).Select(x => x.ID).ToList();
var temp1 = tasks.Where(t => t.SOURCE_DATA_ID == NoticeID || tempIds.Contains(t.SOURCE_DATA_ID.Value)).OrderBy(t => t.CREATE_TIME).ToList();
if (temp1.Any())
{
@ -990,12 +990,12 @@ namespace APT.SK.WebApi.Controllers.Api
{
start.OPERATEPOINT = SKOPERATEPOINT_Enums.NoticeReject;
}
else
else
{
start.OPERATEPOINT = SKOPERATEPOINT_Enums.NoticeAudit;
}
}
else
else
{
if (item.NOTICE_TITLE.Contains("确认"))
{
@ -1030,7 +1030,7 @@ namespace APT.SK.WebApi.Controllers.Api
start.DATA_ID = NoticeID.Value;
start.OPERATEPOINT = SKOPERATEPOINT_Enums.NoticeAudit;
start.USER_ID = approveDetailTemp.APPROVE_USER_ID.Value;
start.USRTNAME = users.FirstOrDefault(t=>t.ID == approveDetailTemp.APPROVE_USER_ID)?.NAME;
start.USRTNAME = users.FirstOrDefault(t => t.ID == approveDetailTemp.APPROVE_USER_ID)?.NAME;
start.OPERTETIME = approveDetailTemp.NODE_APPROVE_TIME;
start.ORDERTIME = approveDetailTemp.CREATE_TIME;
start.ISINTTIME = true;
@ -1502,7 +1502,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
}
resultRiskEnd = resultRiskEnd.OrderBy(e => e.ORDERTIME).ThenBy(m => m.OPERTETIME).ThenBy(n=>n.OPERATEPOINT).ToList();
resultRiskEnd = resultRiskEnd.OrderBy(e => e.ORDERTIME).ThenBy(m => m.OPERTETIME).ThenBy(n => n.OPERATEPOINT).ToList();
if (resultRiskEnd.Any())
{
result.Add(resultRiskEnd);

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

@ -35,13 +35,13 @@ namespace APT.SK.WebApi.Controllers.Api
IFMNotificationTaskService NotificationTaskService { get; set; }
IFMFlowPermitService MFlowPermitService { get; set; }
IPFCodeRuleService CodeRuleService { get; set; }
public SecurityInspectionRecordController(IFMNotificationTaskService notificationTaskService,IFMFlowPermitService mFlowPermitService, IPFCodeRuleService codeRuleService)
public SecurityInspectionRecordController(IFMNotificationTaskService notificationTaskService, IFMFlowPermitService mFlowPermitService, IPFCodeRuleService codeRuleService)
{
NotificationTaskService = notificationTaskService;
MFlowPermitService = mFlowPermitService;
CodeRuleService = codeRuleService;
}
}
[HttpPost, Route("FullUpdateOld")]
public JsonActionResult<bool> FullUpdateOld([FromBody] T_SK_SECURITY_INSPECTION_RECORD entity)
{
@ -185,11 +185,12 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE> summaryDetailFiles = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var summaryExsis = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(t => t.SECURITY_INSPECTION_NOTICE_ID == entity.SECURITY_INSPECTION_NOTICE_ID);
var checkNotice = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(t => t.ID == entity.SECURITY_INSPECTION_NOTICE_ID);
var summaryExsis = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(t => t.SECURITY_INSPECTION_NOTICE_ID == entity.SECURITY_INSPECTION_NOTICE_ID);
BaseFilter filter = new BaseFilter(entity.ORG_ID);
filter.IgnoreDataRule = true;
Expression<Func<T_SK_SECURITY_INSPECTION_RECORD, bool>> expression = t => t.IS_DELETED == false && t.SECURITY_INSPECTION_NOTICE_ID == entity.SECURITY_INSPECTION_NOTICE_ID;
List<T_SK_SECURITY_INSPECTION_RECORD> records = this.GetOrderEntities(expression, filter,new string[] { "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles", "Nav_CheckRecordFiles" }).ToList();
List<T_SK_SECURITY_INSPECTION_RECORD> records = this.GetOrderEntities(expression, filter, new string[] { "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles", "Nav_CheckRecordFiles" }).ToList();
var recordIds = records.Select(m => m.ID).ToList();
var taskUser = this.GetEntity<T_FM_NOTIFICATION_TASK>(t => recordIds.Contains((Guid)t.SOURCE_DATA_ID) && t.SOURCE_DATA_ID != entity.ID && t.NOTICE_STATUS == 0);
if (taskUser != null)
@ -220,8 +221,8 @@ namespace APT.SK.WebApi.Controllers.Api
summary.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
summary.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
summary.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
summary.CHECK_PERSON = entity.CHECK_PERSON;
summary.CHECK_TIME = entity.CHECK_TIME;
summary.CHECK_PERSON = checkNotice != null ? checkNotice.CHECK_PERSON : entity.CHECK_PERSON;
summary.CHECK_TIME = checkNotice != null ? checkNotice.CHECK_TIME : entity.CHECK_TIME;
summary.STATUS = PFStandardStatus.Draft;
var recordTemps = records.Where(t => t.ID != entity.ID).ToList();
if (recordTemps.Any())
@ -237,7 +238,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryFile.Nav_ImgFile = null;
summaryFiles.Add(summaryFile);
}
foreach (var itemDetail in item.Nav_CheckRecordDetails.OrderBy(t=>t.NUM))
foreach (var itemDetail in item.Nav_CheckRecordDetails.OrderBy(t => t.NUM))
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL summaryDetail = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL();
summaryDetail.ORG_ID = item.ORG_ID;
@ -249,7 +250,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.CHECKPROOF = itemDetail.CHECKPROOF;
summaryDetail.CHECKSTANDARD = itemDetail.CHECKSTANDARD;
summaryDetail.CHECK_RESULT = itemDetail.CHECK_RESULT;
summaryDetail.HIDDEN_DESCRIPTION = itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
@ -321,7 +322,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.CHECKPROOF = itemDetail.CHECKPROOF;
summaryDetail.CHECKSTANDARD = itemDetail.CHECKSTANDARD;
summaryDetail.CHECK_RESULT = itemDetail.CHECK_RESULT;
summaryDetail.HIDDEN_DESCRIPTION = itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
@ -366,10 +367,10 @@ namespace APT.SK.WebApi.Controllers.Api
}
if (sumdetails.Any())
{
var detailTemps = sumdetails.Where(t => t.CHECK_RESULT != SKCheckResultEnum.Yes).Distinct(m => new { m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.CHECKCONTENT, m.CHECKSTANDARD, m.CHECK_QUESTION_ID,m.CHECK_RESULT, m.HIDDEN_DESCRIPTION, m.HIDDEN_LEVEL, m.HIDDEN_PLACE }).ToList();
var detailTempNews = sumdetails.Where(t => t.CHECK_RESULT == SKCheckResultEnum.Yes).ToList();
summaryDetails.AddRange(detailTemps);
summaryDetails.AddRange(detailTempNews);
var detailTemps = sumdetails.Where(t => t.CHECK_RESULT != SKCheckResultEnum.Yes).Distinct(m => new { m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.CHECKCONTENT, m.CHECKSTANDARD, m.CHECK_QUESTION_ID, m.CHECK_RESULT, m.HIDDEN_DESCRIPTION, m.HIDDEN_LEVEL, m.HIDDEN_PLACE }).ToList();
summaryDetails.AddRange(detailTemps);
var detailIds = summaryDetails.Select(m => m.ID).ToList();
summaryDetailBasics = summaryDetailBasics.Where(t => detailIds.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).ToList();
summaryDetailFiles = summaryDetailFiles.Where(t => detailIds.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).ToList();
@ -611,7 +612,8 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> reportDetailBasics = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
if (entity.DEPARTMENT_TYPE != SKDepartmentTypeEnum.岗位级)
var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME.Contains("岗位排查"), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
if (entity.CHECK_TYPE_ID != null && !checkTypeIds.Contains((Guid)entity.CHECK_TYPE_ID))
{
var summaryExsis = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(t => t.SECURITY_INSPECTION_NOTICE_ID == entity.SECURITY_INSPECTION_NOTICE_ID);
BaseFilter filter = new BaseFilter(entity.ORG_ID);
@ -689,7 +691,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.CHECKPROOF = itemDetail.CHECKPROOF;
summaryDetail.CHECKSTANDARD = itemDetail.CHECKSTANDARD;
summaryDetail.CHECK_RESULT = itemDetail.CHECK_RESULT;
summaryDetail.HIDDEN_DESCRIPTION = itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
@ -748,7 +750,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.CHECKPROOF = itemDetail.FirstOrDefault().CHECKPROOF;
summaryDetail.CHECKSTANDARD = itemDetail.FirstOrDefault().CHECKSTANDARD;
summaryDetail.CHECK_RESULT = itemDetail.FirstOrDefault().CHECK_RESULT;
summaryDetail.HIDDEN_DESCRIPTION = itemDetail.FirstOrDefault().HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.FirstOrDefault().HIDDEN_DESCRIPTION) ? itemDetail.FirstOrDefault().Nav_Question?.DESCREPTION : itemDetail.FirstOrDefault().HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.FirstOrDefault().HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.FirstOrDefault().HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.FirstOrDefault().MARK;
@ -825,7 +827,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.CHECKPROOF = itemDetail.CHECKPROOF;
summaryDetail.CHECKSTANDARD = itemDetail.CHECKSTANDARD;
summaryDetail.CHECK_RESULT = itemDetail.CHECK_RESULT;
summaryDetail.HIDDEN_DESCRIPTION = itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
@ -899,7 +901,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.CHECKPROOF = itemDetail.CHECKPROOF;
summaryDetail.CHECKSTANDARD = itemDetail.CHECKSTANDARD;
summaryDetail.CHECK_RESULT = itemDetail.CHECK_RESULT;
summaryDetail.HIDDEN_DESCRIPTION = itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
@ -972,7 +974,7 @@ namespace APT.SK.WebApi.Controllers.Api
userList.Where(m => !m.ISCHECK).ForEach(t => { t.ISCHECK = true; t.CHECKTIME = DateTime.Now; });
}
var haveHiddens = details.Where(t => t.CHECK_RESULT == SKCheckResultEnum.Yes).ToList();
if (haveHiddens != null && haveHiddens.Any() && monitor!=null)
if (haveHiddens != null && haveHiddens.Any() && monitor != null)
{
//触发隐患上报
report = new T_SK_HIDDEN_DANGER_REPORT();
@ -997,7 +999,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
@ -1156,14 +1158,14 @@ namespace APT.SK.WebApi.Controllers.Api
result.Nav_CheckRecordDetails = detailTemps.GroupBy(t => t.RISK_AREA_ID).Select(g => g.First()).ToList();
if (result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())
{
foreach (var item in result.Nav_CheckRecordDetails.OrderBy(t=>t.RISK_AREA_ID).ThenBy(m => m.NUM))
foreach (var item in result.Nav_CheckRecordDetails.OrderBy(t => t.RISK_AREA_ID).ThenBy(m => m.NUM))
{
item.Nav_DetailContents = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>();
var userTemps = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER>();
var safeCheck1 = detailTemps.Where(t => t.RISK_AREA_ID == item.RISK_AREA_ID).ToList();
if (safeCheck1 != null && safeCheck1.Any())
{
foreach (var item2 in safeCheck1.OrderBy(t=>t.RISK_AREA_ID).ThenBy(m=>m.NUM))
foreach (var item2 in safeCheck1.OrderBy(t => t.RISK_AREA_ID).ThenBy(m => m.NUM))
{
var lawTemps = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_BASIC>();
T_SK_SECURITY_INSPECTION_RECORD_DETAIL ddd = new T_SK_SECURITY_INSPECTION_RECORD_DETAIL();
@ -1174,7 +1176,7 @@ namespace APT.SK.WebApi.Controllers.Api
ddd.CHECKCONTENT = item2.CHECKCONTENT;
ddd.CHECKPROOF = item2.CHECKPROOF;
ddd.CHECKSTANDARD = item2.CHECKSTANDARD;
ddd.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item2.HIDDEN_DESCRIPTION) ? "" : item2.HIDDEN_DESCRIPTION;
ddd.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item2.HIDDEN_DESCRIPTION) ? item2.Nav_Question?.DESCREPTION : item2.HIDDEN_DESCRIPTION;
ddd.HIDDEN_LEVEL = item2.HIDDEN_LEVEL;
ddd.CHECK_RESULT = item2.CHECK_RESULT;
ddd.HIDDEN_PLACE = string.IsNullOrEmpty(item2.HIDDEN_PLACE) ? "" : item2.HIDDEN_PLACE;
@ -1204,12 +1206,12 @@ namespace APT.SK.WebApi.Controllers.Api
userTemps.Add(uuu);
}
}
}
}
}
}
item.Nav_CheckRecordDetailUsers = userTemps;
item.Nav_CheckRecordDetailUsers = userTemps;
}
}
}
@ -1247,7 +1249,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.Nav_CheckRecordDetailUsers = userTemps.OrderByDescending(t => t.ISMAINCHECK).ToList();
}
}
result.Nav_CheckRecordDetails = details.OrderBy(m => m.RISK_AREA_ID).ThenBy(n=>n.NUM).ToList();
result.Nav_CheckRecordDetails = details.OrderBy(m => m.RISK_AREA_ID).ThenBy(n => n.NUM).ToList();
//.Where(c => c.Nav_CheckRecordDetailUsers != null && c.Nav_CheckRecordDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId)
}
return result;
@ -1315,7 +1317,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
else if (filter.Parameter3 == "4")
{
departType = SKDepartmentTypeEnum.岗位级;
departType = SKDepartmentTypeEnum.班组级;
}
else
{
@ -1325,7 +1327,7 @@ namespace APT.SK.WebApi.Controllers.Api
var departIds = posts.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID).ToList();
var departs = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => departIds.Contains(t.ID) && t.CHECK_TYPE_ID == Guid.Parse(filter.Parameter2) && t.CHECK_TYPE == departType, new BaseFilter(filter.OrgId));
var contentIds = departs.Select(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).ToList();
var libraryIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == mineType && t.TYPE_ID == Guid.Parse(filter.Parameter4), new BaseFilter(filter.OrgId)).Select(m=>m.ID).ToList();
var libraryIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.MineType == mineType && t.TYPE_ID == Guid.Parse(filter.Parameter4), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var libraryDetailIds = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var libraryContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => contentIds.Contains(t.ID) && libraryDetailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), new string[] {"Nav_Contents","Nav_LibraryDetail",
"Nav_LibraryDetail.Nav_Library.Nav_Area"});

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

@ -180,85 +180,85 @@ namespace APT.SK.WebApi.Controllers.Api
else
{
entity.STATUS = PFStandardStatus.Archived;
var recordDetails = entity.Nav_CheckRecordDetails.Where(t => t.CHECK_RESULT == MS.Domain.Enums.SK.SKCheckResultEnum.Yes).ToList();
if (recordDetails != null && recordDetails.Any())
{
//触发隐患上报表，汇总触发一条
report = new T_SK_HIDDEN_DANGER_REPORT();
report.ORG_ID = entity.ORG_ID;
report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = entity.ID;
report.APPLY_USER_ID = entity.APPLY_USER_ID;
report.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
report.MineType = entity.MineType;
report.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
report.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
report.CHECK_TIME = entity.CHECK_TIME;
report.STATUS = PFStandardStatus.Draft;
//if (record.Nav_CheckRecordFiles != null && record.Nav_CheckRecordFiles.Any())
//{
// foreach (var item in record.Nav_CheckRecordFiles)
// {
// T_SK_HIDDEN_DANGER_REPORT_FILE file = new T_SK_HIDDEN_DANGER_REPORT_FILE();
// file.ORG_ID = item.ORG_ID;
// file.IMG_FILE_ID = item.IMG_FILE_ID;
// file.HIDDEN_DANGER_REPORT_ID = report.ID;
// reportFiles.Add(file);
// }
//}
foreach (var item in recordDetails)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL detail = new T_SK_HIDDEN_DANGER_REPORT_DETAIL();
detail.ORG_ID = item.ORG_ID;
detail.HIDDEN_DANGER_REPORT_ID = report.ID;
detail.RISK_AREA_ID = item.RISK_AREA_ID;
detail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
detail.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID;
detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();
detail.CHECK_PERSON = string.Join(",", itemUserList);
}
reportDetails.Add(detail);
if (item.Nav_CheckRecordDetailFiles != null && item.Nav_CheckRecordDetailFiles.Any())
{
foreach (var item2 in item.Nav_CheckRecordDetailFiles)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE file = new T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE();
file.ORG_ID = item2.ORG_ID;
file.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
file.IMG_FILE_ID = item2.IMG_FILE_ID;
file.Nav_ImgFile = null;
reportDetailFiles.Add(file);
}
}
if (item.Nav_CheckRecordDetailBasics != null && item.Nav_CheckRecordDetailBasics.Any())
{
foreach (var item2 in item.Nav_CheckRecordDetailBasics)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC file = new T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC();
file.ORG_ID = item2.ORG_ID;
file.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
file.LAW_ID = item2.LAW_ID;
file.Nav_Law = null;
reportDetailBasics.Add(file);
}
}
}
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
//发消息
var notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报(" + departName + entity.Nav_CheckType?.NAME+ ")", report.ID, report.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK014");
notices.Add(notice);
}
var recordDetails = details.Where(t => t.CHECK_RESULT == MS.Domain.Enums.SK.SKCheckResultEnum.Yes).ToList();
if (recordDetails != null && recordDetails.Any())
{
//触发隐患上报表，汇总触发一条
report = new T_SK_HIDDEN_DANGER_REPORT();
report.ORG_ID = entity.ORG_ID;
report.SECURITY_INSPECTION_RECORD_SUMMARY_ID = entity.ID;
report.APPLY_USER_ID = entity.APPLY_USER_ID;
report.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
report.MineType = entity.MineType;
report.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
report.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
report.CHECK_TIME = entity.CHECK_TIME;
report.STATUS = PFStandardStatus.Draft;
//if (record.Nav_CheckRecordFiles != null && record.Nav_CheckRecordFiles.Any())
//{
// foreach (var item in record.Nav_CheckRecordFiles)
// {
// T_SK_HIDDEN_DANGER_REPORT_FILE file = new T_SK_HIDDEN_DANGER_REPORT_FILE();
// file.ORG_ID = item.ORG_ID;
// file.IMG_FILE_ID = item.IMG_FILE_ID;
// file.HIDDEN_DANGER_REPORT_ID = report.ID;
// reportFiles.Add(file);
// }
//}
foreach (var item in recordDetails)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL detail = new T_SK_HIDDEN_DANGER_REPORT_DETAIL();
detail.ORG_ID = item.ORG_ID;
detail.HIDDEN_DANGER_REPORT_ID = report.ID;
detail.RISK_AREA_ID = item.RISK_AREA_ID;
detail.CHECK_CONTENTS_ID = item.CHECK_CONTENTS_ID;
detail.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID;
detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();
detail.CHECK_PERSON = string.Join(",", itemUserList);
}
reportDetails.Add(detail);
if (item.Nav_CheckRecordDetailFiles != null && item.Nav_CheckRecordDetailFiles.Any())
{
foreach (var item2 in item.Nav_CheckRecordDetailFiles)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE file = new T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE();
file.ORG_ID = item2.ORG_ID;
file.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
file.IMG_FILE_ID = item2.IMG_FILE_ID;
file.Nav_ImgFile = null;
reportDetailFiles.Add(file);
}
}
if (item.Nav_CheckRecordDetailBasics != null && item.Nav_CheckRecordDetailBasics.Any())
{
foreach (var item2 in item.Nav_CheckRecordDetailBasics)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC file = new T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC();
file.ORG_ID = item2.ORG_ID;
file.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
file.LAW_ID = item2.LAW_ID;
file.Nav_Law = null;
reportDetailBasics.Add(file);
}
}
}
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
//发消息
var notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报(" + departName + entity.Nav_CheckType?.NAME + ")", report.ID, report.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK014");
notices.Add(notice);
}
}
if (entity.TaskID != Guid.Empty)
{
@ -267,7 +267,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
details.ForEach(t => {
t.Nav_CheckRecordDetailFiles = null;
t.Nav_CheckRecordDetailFiles = null;
t.Nav_CheckRecordDetailBasics = null;
t.Nav_CheckRecordDetailUsers = null;
});
@ -386,7 +386,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
@ -495,7 +495,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == record.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
record.STATUS = PFStandardStatus.Archived;
var hidden= record.Nav_CheckRecordDetails.Where(t => t.CHECK_RESULT == MS.Domain.Enums.SK.SKCheckResultEnum.Yes).ToList();
var hidden = record.Nav_CheckRecordDetails.Where(t => t.CHECK_RESULT == MS.Domain.Enums.SK.SKCheckResultEnum.Yes).ToList();
if (hidden != null && hidden.Any())
{
foreach (var item in hidden)
@ -520,7 +520,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
@ -599,7 +599,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
result.Nav_CheckRecordDetails = result.Nav_CheckRecordDetails.ToList();//Where(c => c.Nav_CheckRecordDetailUsers != null && c.Nav_CheckRecordDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).ToList();
}
result?.Nav_CheckRecordDetails?.OrderBy(m=>m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList();
result?.Nav_CheckRecordDetails?.OrderBy(m => m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList();
return result;
});
}
@ -621,8 +621,8 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"});
// var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"});
// var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null
{
result.CHECK_PERSON = string.IsNullOrEmpty(result.CHECK_PERSON) ? "" : result.CHECK_PERSON;
@ -630,11 +630,11 @@ namespace APT.SK.WebApi.Controllers.Api
var details = result.Nav_CheckRecordDetails.GroupBy(t => t.RISK_AREA_ID).Select(g => g.First()).ToList();
if (details != null && details.Any())
{
foreach (var item in details.OrderBy(t=>t.RISK_AREA_ID))
foreach (var item in details.OrderBy(t => t.RISK_AREA_ID))
{
item.Nav_DetailContents = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>();
var userTemps = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER>();
var userTemps = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER>();
var safeCheck1 = result.Nav_CheckRecordDetails.Where(t => t.RISK_AREA_ID == item.RISK_AREA_ID).ToList();
if (safeCheck1 != null && safeCheck1.Any())
{
@ -649,7 +649,7 @@ namespace APT.SK.WebApi.Controllers.Api
ddd.CHECKCONTENT = item2.CHECKCONTENT;
ddd.CHECKPROOF = item2.CHECKPROOF;
ddd.CHECKSTANDARD = item2.CHECKSTANDARD;
ddd.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item2.HIDDEN_DESCRIPTION) ? "" : item2.HIDDEN_DESCRIPTION;
ddd.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item2.HIDDEN_DESCRIPTION) ? item2.Nav_Question?.DESCREPTION : item2.HIDDEN_DESCRIPTION;
ddd.HIDDEN_LEVEL = item2.HIDDEN_LEVEL;
ddd.CHECK_RESULT = item2.CHECK_RESULT;
ddd.HIDDEN_PLACE = string.IsNullOrEmpty(item2.HIDDEN_PLACE) ? "" : item2.HIDDEN_PLACE;
@ -679,22 +679,22 @@ namespace APT.SK.WebApi.Controllers.Api
userTemps.Add(uuu);
}
}
}
}
}
}
item.Nav_CheckRecordDetailUsers = userTemps;
item.Nav_CheckRecordDetailUsers = userTemps;
}
result.Nav_CheckRecordDetails = details;
}
}
return result;
});
}
}
/// <summary>
/// 获得单条实体数据
/// </summary>
@ -728,7 +728,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
return result;
});
}
}
}
}

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

@ -53,8 +53,8 @@ namespace APT.SK.WebApi.Controllers.Api
entity.WEEKDATA = null;
entity.RUNSETTIME = null;
break;
}
}
this.UnifiedCommit(() =>
{
if (entity != null)