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-10-10 09:06:58 +08:00
parent 62f2491ca4
commit 538f2965d2
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,8 @@ namespace APT.SK.WebApi.Controllers
pageFilter.Include.Add("Nav_SCOREL"); pageFilter.Include.Add("Nav_SCOREL");
pageFilter.Include.Add("Nav_SCOREE"); pageFilter.Include.Add("Nav_SCOREE");
pageFilter.Include.Add("Nav_SCOREC"); pageFilter.Include.Add("Nav_SCOREC");
pageFilter.Include.Add("Nav_Type"); pageFilter.Include.Add("Nav_Type");
pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
var result = WitOrderPaged(null, pageFilter); var result = WitOrderPaged(null, pageFilter);
if (result != null && result.Data != null && result.Data.Any()) if (result != null && result.Data != null && result.Data.Any())
@ -270,14 +271,14 @@ namespace APT.SK.WebApi.Controllers
{ {
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME)) if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
{ {
var temp = i + "、" + item2.MEASURES_NAME + Environment.NewLine; var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp; item.MINE_NAME = item.MINE_NAME + temp;
i++; i++;
} }
} }
} }
} }
result.Data.OrderBy(t => t.MineType).ThenBy(m => m.EVALUATE_LEVEL); result.Data.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.EVALUATE_LEVEL);
} }
return result; return result;
} }

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

@ -629,6 +629,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
pageFilter.Include.Add("Nav_RiskName"); pageFilter.Include.Add("Nav_RiskName");
pageFilter.Include.Add("Nav_Details"); pageFilter.Include.Add("Nav_Details");
pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person"); var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person");
var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId)); var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId));
@ -641,7 +642,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var item in result.Data) foreach (var item in result.Data)
{ {
//管控措施 //管控措施
var detailStr = new List<string>(); var detailStr = new List<string>(); var detailNum = new List<int?>();
if (item.Nav_Details != null && item.Nav_Details.Any()) if (item.Nav_Details != null && item.Nav_Details.Any())
{ {
var i = 1; var i = 1;
@ -650,26 +651,27 @@ namespace APT.SK.WebApi.Controllers.Api
if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME)) if (item2 != null && !string.IsNullOrEmpty(item2.MEASURES_NAME))
{ {
detailStr.Add(item2.MEASURES_NAME); detailStr.Add(item2.MEASURES_NAME);
var temp = i + "、" + item2.MEASURES_NAME + Environment.NewLine; detailNum.Add(item2.NUM);
var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
item.MINE_NAME = item.MINE_NAME + temp; item.MINE_NAME = item.MINE_NAME + temp;
i++; i++;
} }
} }
} }
if (detailStr.Any()) //if (detailStr.Any())
{ //{
detailStr = detailStr.Distinct().ToList(); // detailStr = detailStr.Distinct().ToList();
var i = 1; // var i = 1;
foreach (var item2 in detailStr) // foreach (var item2 in detailStr)
{ // {
if (!string.IsNullOrEmpty(item2)) // if (!string.IsNullOrEmpty(item2))
{ // {
var temp = i + "、" + item2 + "\r\n"; // var temp = i + "、" + item2 + "\r\n";
item.MEASURE = item.MEASURE + temp; // item.MEASURE = item.MEASURE + temp;
i++; // i++;
} // }
} // }
} //}
//辨识层级、部门、岗位 //辨识层级、部门、岗位
var levelStr = new List<string>(); var levelStr = new List<string>();
var departIds = new List<Guid>(); var departIds = new List<Guid>();
@ -695,23 +697,23 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
if (!string.IsNullOrEmpty(item2)) if (!string.IsNullOrEmpty(item2))
{ {
var type = 0; var type = 20;
switch (item2) switch (item2)
{ {
case "部门": case "部门":
type = 0; type = 10;
break; break;
case "车间": case "车间":
type = 1; type = 15;
break; break;
case "班组": case "班组":
type = 2; type = 20;
break; break;
case "公司": case "公司":
type = 3; type = 5;
break; break;
default: default:
type = 0; type = 20;
break; break;
} }
var temp = i + "、" + item2 + Environment.NewLine; var temp = i + "、" + item2 + Environment.NewLine;
@ -732,7 +734,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
result.Data.OrderBy(t => t.EVALUATE_LEVEL); result.Data.OrderBy(t => t.EVALUATE_LEVEL);
} }
result.Data.OrderBy(t => t.MineType).ThenBy(m => m.EVALUATE_LEVEL); result.Data.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.EVALUATE_LEVEL);
} }
return result; return result;
} }