wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加分值D

Browse Source
This commit is contained in:
何美荣 2026-03-25 12:24:28 +08:00
parent a249ebb4dc
commit c0420dc78f
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -970,6 +970,7 @@ namespace APT.SK.WebApi.Controllers
pageFilter.Include.Add("Nav_ProductionUnit"); pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.SelectField.Add("Nav_Details.NUM"); pageFilter.SelectField.Add("Nav_Details.NUM");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
pageFilter.SelectField.Add("Nav_Details.Nav_DetailContents.NUM");
pageFilter.SelectField.Add("Nav_Details.Nav_DetailContents.Nav_Contents.CHECKCONTENT"); pageFilter.SelectField.Add("Nav_Details.Nav_DetailContents.Nav_Contents.CHECKCONTENT");
var result = GetOrderPageEntities<T_SK_BASIC_LIBRARY>(null, pageFilter); var result = GetOrderPageEntities<T_SK_BASIC_LIBRARY>(null, pageFilter);
if (result != null && result.Data != null && result.Data.Any()) if (result != null && result.Data != null && result.Data.Any())
@ -984,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 = "";
@ -2184,6 +2185,9 @@ namespace APT.SK.WebApi.Controllers
{ {
if (string.IsNullOrEmpty(dtSource.Rows[i][0].ToString().Trim()) || string.IsNullOrEmpty(dtSource.Rows[i][1].ToString().Trim()) if (string.IsNullOrEmpty(dtSource.Rows[i][0].ToString().Trim()) || string.IsNullOrEmpty(dtSource.Rows[i][1].ToString().Trim())
|| string.IsNullOrEmpty(dtSource.Rows[i][2].ToString().Trim()) || string.IsNullOrEmpty(dtSource.Rows[i][3].ToString().Trim()) || string.IsNullOrEmpty(dtSource.Rows[i][2].ToString().Trim()) || string.IsNullOrEmpty(dtSource.Rows[i][3].ToString().Trim())
|| string.IsNullOrEmpty(dtSource.Rows[i][4].ToString().Trim())
|| string.IsNullOrEmpty(dtSource.Rows[i][5].ToString().Trim())
|| string.IsNullOrEmpty(dtSource.Rows[i][6].ToString().Trim())
) )
{ {
Msg = Msg + "第" + (i + 3) + "行生产单元,风险名称，风险描述，风险类别，风险评价L，风险评价E，风险评价C不能为空，请先检查所有字段内容；"; Msg = Msg + "第" + (i + 3) + "行生产单元,风险名称，风险描述，风险类别，风险评价L，风险评价E，风险评价C不能为空，请先检查所有字段内容；";
@ -2245,21 +2249,21 @@ namespace APT.SK.WebApi.Controllers
Msg = Msg + "第" + (i + 3) + "行风险评价C" + libC + "不存在，请先到系统管理维护；"; Msg = Msg + "第" + (i + 3) + "行风险评价C" + libC + "不存在，请先到系统管理维护；";
} }
} }
//var riskLevel = dtSource.Rows[i][7].ToString().Trim(); //var riskLevel = dtSource.Rows[i][8].ToString().Trim();
//if (riskLevel != "重大风险" && riskLevel != "较大风险" && riskLevel != "一般风险" && riskLevel != "低风险") //if (riskLevel != "重大风险" && riskLevel != "较大风险" && riskLevel != "一般风险" && riskLevel != "低风险")
//{ //{
// Msg = Msg + "第" + (i + 3) + "行风险等级只能填写重大风险、较大风险、一般风险、低风险，请修改" + riskLevel + "；"; // Msg = Msg + "第" + (i + 3) + "行风险等级只能填写重大风险、较大风险、一般风险、低风险，请修改" + riskLevel + "；";
//} //}
//var controlLevel = dtSource.Rows[i][8].ToString().Trim(); //var controlLevel = dtSource.Rows[i][9].ToString().Trim();
//if (controlLevel != "_5_" && controlLevel != "_10_" && controlLevel != "_15_" && controlLevel != "_20_" //if (controlLevel != "_5_" && controlLevel != "_10_" && controlLevel != "_15_" && controlLevel != "_20_"
// && controlLevel != "_5_10_" && controlLevel != "_10_15_" && controlLevel != "_15_20_" && controlLevel != "_5_10_15_" // && controlLevel != "_5_10_" && controlLevel != "_10_15_" && controlLevel != "_15_20_" && controlLevel != "_5_10_15_"
// && controlLevel != "_10_15_20_" && controlLevel != "_5_10_15_20_") // && controlLevel != "_10_15_20_" && controlLevel != "_5_10_15_20_")
//{ //{
// Msg = Msg + "第" + (i + 3) + "行管控层级格式不确，请修改" + controlLevel + "；"; // Msg = Msg + "第" + (i + 3) + "行管控层级格式不确，请修改" + controlLevel + "；";
//} //}
if (!string.IsNullOrEmpty(dtSource.Rows[i][10].ToString().Trim())) if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim()))
{ {
var lists = dtSource.Rows[i][10].ToString().Trim().Split("。").ToList(); var lists = dtSource.Rows[i][11].ToString().Trim().Split("。").ToList();
if (lists != null && lists.Any()) if (lists != null && lists.Any())
{ {
foreach (var item in lists) foreach (var item in lists)
@ -2274,9 +2278,9 @@ namespace APT.SK.WebApi.Controllers
} }
} }
} }
if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim())) if (!string.IsNullOrEmpty(dtSource.Rows[i][12].ToString().Trim()))
{ {
var lists = dtSource.Rows[i][11].ToString().Trim().Split("？").ToList(); var lists = dtSource.Rows[i][12].ToString().Trim().Split("？").ToList();
if (lists != null && lists.Any()) if (lists != null && lists.Any())
{ {
foreach (var item in lists) foreach (var item in lists)
@ -2336,11 +2340,11 @@ namespace APT.SK.WebApi.Controllers
var libEFirst = string.IsNullOrEmpty(libE) ? null:libEs.FirstOrDefault(t => t.SCORE == decimal.Parse(libE)); var libEFirst = string.IsNullOrEmpty(libE) ? null:libEs.FirstOrDefault(t => t.SCORE == decimal.Parse(libE));
var libC = dtSource.Rows[i][6].ToString().Trim(); var libC = dtSource.Rows[i][6].ToString().Trim();
var libCFirst = string.IsNullOrEmpty(libC) ? null : libCs.FirstOrDefault(t => t.SCORE == decimal.Parse(libC)); var libCFirst = string.IsNullOrEmpty(libC) ? null : libCs.FirstOrDefault(t => t.SCORE == decimal.Parse(libC));
//var riskLevel = dtSource.Rows[i][7].ToString().Trim(); //var riskLevel = dtSource.Rows[i][8].ToString().Trim();
//var controlLevel = dtSource.Rows[i][8].ToString().Trim(); //var controlLevel = dtSource.Rows[i][9].ToString().Trim();
var emerg = dtSource.Rows[i][9].ToString().Trim(); var emerg = dtSource.Rows[i][10].ToString().Trim();
var mesList = dtSource.Rows[i][10].ToString().Trim(); var mesList = dtSource.Rows[i][11].ToString().Trim();
var conList = dtSource.Rows[i][11].ToString().Trim(); var conList = dtSource.Rows[i][12].ToString().Trim();
T_SK_BASIC_LIBRARY lib = new T_SK_BASIC_LIBRARY(); T_SK_BASIC_LIBRARY lib = new T_SK_BASIC_LIBRARY();
lib.ORG_ID = orgId; lib.ORG_ID = orgId;
lib.PRODUCTION_UNIT_ID = proUnitFirst.ID; lib.PRODUCTION_UNIT_ID = proUnitFirst.ID;