From 538f2965d2c0568db6d2e078a670bc9df17e5a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Fri, 10 Oct 2025 09:06:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AE=A1=E6=8E=A7=E6=8E=AA?= =?UTF-8?q?=E6=96=BD=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/BasicLibraryController.cs | 7 +-- .../Api/EnterpriseLibraryController.cs | 48 ++++++++++--------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs index 0750ab7..c8d616a 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs @@ -254,7 +254,8 @@ namespace APT.SK.WebApi.Controllers pageFilter.Include.Add("Nav_SCOREL"); pageFilter.Include.Add("Nav_SCOREE"); 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"); var result = WitOrderPaged(null, pageFilter); 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)) { - var temp = i + "、" + item2.MEASURES_NAME + Environment.NewLine; + var temp = item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine; item.MINE_NAME = item.MINE_NAME + temp; 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; } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index 612cbb0..6ffd4ce 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -629,6 +629,7 @@ namespace APT.SK.WebApi.Controllers.Api } pageFilter.Include.Add("Nav_RiskName"); pageFilter.Include.Add("Nav_Details"); + pageFilter.Include.Add("Nav_ProductionUnit"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); var users = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person"); var userPosts = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId)); @@ -641,7 +642,7 @@ namespace APT.SK.WebApi.Controllers.Api foreach (var item in result.Data) { //管控措施 - var detailStr = new List(); + var detailStr = new List(); var detailNum = new List(); if (item.Nav_Details != null && item.Nav_Details.Any()) { var i = 1; @@ -650,26 +651,27 @@ namespace APT.SK.WebApi.Controllers.Api if (item2 != null && !string.IsNullOrEmpty(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; i++; } } } - if (detailStr.Any()) - { - detailStr = detailStr.Distinct().ToList(); - var i = 1; - foreach (var item2 in detailStr) - { - if (!string.IsNullOrEmpty(item2)) - { - var temp = i + "、" + item2 + "\r\n"; - item.MEASURE = item.MEASURE + temp; - i++; - } - } - } + //if (detailStr.Any()) + //{ + // detailStr = detailStr.Distinct().ToList(); + // var i = 1; + // foreach (var item2 in detailStr) + // { + // if (!string.IsNullOrEmpty(item2)) + // { + // var temp = i + "、" + item2 + "\r\n"; + // item.MEASURE = item.MEASURE + temp; + // i++; + // } + // } + //} //辨识层级、部门、岗位 var levelStr = new List(); var departIds = new List(); @@ -695,23 +697,23 @@ namespace APT.SK.WebApi.Controllers.Api { if (!string.IsNullOrEmpty(item2)) { - var type = 0; + var type = 20; switch (item2) { case "部门": - type = 0; + type = 10; break; case "车间": - type = 1; + type = 15; break; case "班组": - type = 2; + type = 20; break; case "公司": - type = 3; + type = 5; break; default: - type = 0; + type = 20; break; } 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.MineType).ThenBy(m => m.EVALUATE_LEVEL); + result.Data.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenBy(m => m.EVALUATE_LEVEL); } return result; }