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:
何美荣 2026-03-26 16:38:27 +08:00
parent fac79612d9
commit a06f5e4496
5 changed files with 74587 additions and 73135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13211,6 +13211,10 @@ builder.Property(t => t.MEASURE_CODE).HasMaxLength(500);
builder.HasOne(t => t.Nav_ProductionUnit).WithMany().HasForeignKey(t => t.PRODUCTION_UNIT_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_ProductionUnit).WithMany().HasForeignKey(t => t.PRODUCTION_UNIT_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.CHECKCONTENT).HasMaxLength(500); builder.Property(t => t.CHECKCONTENT).HasMaxLength(500);
builder.Property(t => t.CHECK_STANDARD).HasMaxLength(500); builder.Property(t => t.CHECK_STANDARD).HasMaxLength(500);
builder.Ignore(t => t.CHECK_BASICS);
builder.Ignore(t => t.DESCREPTION);
builder.Ignore(t => t.QUESTION_LEVEL_SHOW);
builder.Ignore(t => t.DEMAND);
builder.HasOne(t => t.Nav_Area).WithMany().HasForeignKey(t => t.AREA_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_Area).WithMany().HasForeignKey(t => t.AREA_ID).OnDelete(DeleteBehavior.Restrict);
} }
} }

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

@ -57,7 +57,24 @@ namespace APT.MS.Domain.Entities.SK
/// 判定标准 /// 判定标准
/// </summary> /// </summary>
[Description("判定标准")] [Description("判定标准")]
public string CHECK_STANDARD { get; set; } public string CHECK_STANDARD { get; set; }
[Description("检查依据")]
[NotMapped]
[DataFieldIngore]
public string CHECK_BASICS { get; set; }
[Description("隐患描述")]
[NotMapped]
[DataFieldIngore]
public string DESCREPTION { get; set; }
[Description("问题等级")]
[NotMapped]
[DataFieldIngore]
public string QUESTION_LEVEL_SHOW { get; set; }
[Description("整改措施")]
[NotMapped]
[DataFieldIngore]
public string DEMAND { get; set; }
[Description("辨识区域")] [Description("辨识区域")]
[DataFieldForeignKey("Nav_Area")] [DataFieldForeignKey("Nav_Area")]

147662
APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

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

@ -985,7 +985,7 @@ namespace APT.SK.WebApi.Controllers
{ {
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME)) if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
{ {
var temp = item2.NUM + "*" + item2.MEASURES_NAME + "。"; var temp = item2.NUM + "*" + item2.MEASURES_NAME;
item.MINE_NAME = item.MINE_NAME + temp; item.MINE_NAME = item.MINE_NAME + temp;
item.MEASURE = item.MEASURE + temp; item.MEASURE = item.MEASURE + temp;
var conListTemp = ""; var conListTemp = "";
@ -995,7 +995,7 @@ namespace APT.SK.WebApi.Controllers
{ {
if (con != null && con.Nav_Contents != null) if (con != null && con.Nav_Contents != null)
{ {
var conTemp = item2.NUM +"."+con.NUM + "*"+con.Nav_Contents?.CHECKCONTENT +"？"; var conTemp = item2.NUM +"."+con.NUM + "*"+con.Nav_Contents?.CHECKCONTENT;
conListTemp = conListTemp + conTemp; conListTemp = conListTemp + conTemp;
} }
} }

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

@ -45,14 +45,43 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
pageFilter.Sort = ""; pageFilter.Sort = "";
} }
var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "reset"); var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "reset");
if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString())) if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString()))
{ {
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
} }
pageFilter.Include.Add("Nav_ListCheckQuestion"); pageFilter.Include.Add("Nav_ListCheckQuestion");
return WitOrderPaged(null, pageFilter); pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.NUM");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.DESCREPTION");
pageFilter.SelectField.Add("Nav_ListCheckQuestion.DEMAND");
pageFilter.SelectField.Add("Nav_ContentsBasics.Nav_Law.NAME");
var result = GetOrderPageEntities<T_SK_CHECK_CONTENTS>(null, pageFilter);
if (result != null && result.Data != null && result.Data.Any())
{
foreach (var item in result.Data)
{
if (item.Nav_ListCheckQuestion != null && item.Nav_ListCheckQuestion.Any())
{
foreach (var item2 in item.Nav_ListCheckQuestion.OrderBy(t => t.NUM))
{
if (item2 != null && !string.IsNullOrEmpty(item2.DESCREPTION) && !string.IsNullOrEmpty(item2.DEMAND))
{
var tempD = item2.NUM + "、" + item2.DESCREPTION;
item.DESCREPTION = item.DESCREPTION + tempD;
item.QUESTION_LEVEL_SHOW = item2.QUESTION_LEVEL.GetDescription();
var tempM = item2.NUM + "、" + item2.DEMAND;
item.DEMAND = item.DEMAND + tempM;
}
}
}
if (item.Nav_ContentsBasics != null && item.Nav_ContentsBasics.Any())
{
item.CHECK_BASICS = string.Join(",", item.Nav_ContentsBasics.Select(t=>t.Nav_Law?.NAME));
}
}
}
return result;
} }