diff --git a/APT.BaseData.Services/Services/FM/FMDepartmentService.cs b/APT.BaseData.Services/Services/FM/FMDepartmentService.cs index 6c61a01..061d7f3 100644 --- a/APT.BaseData.Services/Services/FM/FMDepartmentService.cs +++ b/APT.BaseData.Services/Services/FM/FMDepartmentService.cs @@ -180,7 +180,15 @@ namespace APT.BaseData.Services.Services.FM document.VALID_TIME = VALID_TIME; if (document.Nav_Details != null) { - versionNum = document.Nav_Details.OrderByDescending(t => t.VERSION).FirstOrDefault().VERSION; + var version = document.Nav_Details.OrderByDescending(t => t.VERSION).FirstOrDefault(); + if (version != null) + { + versionNum = version.VERSION; + } + else + { + versionNum = 0; + } } foreach (var item in document.Nav_Details) { diff --git a/APT.MS.Domain/Enums/HM/HMEnmu.cs b/APT.MS.Domain/Enums/HM/HMEnmu.cs index ab10b07..c6eabb9 100644 --- a/APT.MS.Domain/Enums/HM/HMEnmu.cs +++ b/APT.MS.Domain/Enums/HM/HMEnmu.cs @@ -58,13 +58,13 @@ namespace APT.MS.Domain.Enums } public enum EvaluateLevelEnum { - [Description("1级")] + [Description("重大风险")] 一级 = 10, - [Description("2级")] + [Description("较大风险")] 二级 = 20, - [Description("3级")] + [Description("一般风险")] 三级 = 30, - [Description("4级")] + [Description("低风险")] 四级 = 40, } public enum HazardLevelEnum diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs index 30b98d8..5bd9b6f 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs @@ -363,9 +363,10 @@ namespace APT.HM.WebApi.Controllers.Api { item.RISK_PLACE = dtSource.Rows[i][6].ToString().Trim(); } - if (!string.IsNullOrEmpty(dtSource.Rows[i][7].ToString().Trim()))//L + var scoreL = dtSource.Rows[i][7].ToString().Trim(); + if (!string.IsNullOrEmpty(scoreL))//L { - item.EVALUATE_L = decimal.Parse(dtSource.Rows[i][7].ToString().Trim()); + item.EVALUATE_L = decimal.Parse(scoreL); } if (!string.IsNullOrEmpty(dtSource.Rows[i][8].ToString().Trim()))//E { @@ -381,19 +382,19 @@ namespace APT.HM.WebApi.Controllers.Api } if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim()))//风险等级 { - if (dtSource.Rows[i][11].ToString().Trim() == "一级") + if (dtSource.Rows[i][11].ToString().Trim() == "重大风险") { item.EVALUATE_LEVEL = EvaluateLevelEnum.一级; } - else if (dtSource.Rows[i][11].ToString().Trim() == "二级") + else if (dtSource.Rows[i][11].ToString().Trim() == "较大风险") { item.EVALUATE_LEVEL = EvaluateLevelEnum.二级; } - else if (dtSource.Rows[i][11].ToString().Trim() == "三级") + else if (dtSource.Rows[i][11].ToString().Trim() == "一般风险") { item.EVALUATE_LEVEL = EvaluateLevelEnum.三级; } - else if (dtSource.Rows[i][11].ToString().Trim() == "四级") + else if (dtSource.Rows[i][11].ToString().Trim() == "低风险") { item.EVALUATE_LEVEL = EvaluateLevelEnum.四级; }