This commit is contained in:
wjn 2024-06-25 14:46:31 +08:00
parent 6b51f7315b
commit ca898f934d
3 changed files with 20 additions and 11 deletions

View File

@ -180,7 +180,15 @@ namespace APT.BaseData.Services.Services.FM
document.VALID_TIME = VALID_TIME; document.VALID_TIME = VALID_TIME;
if (document.Nav_Details != null) 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) foreach (var item in document.Nav_Details)
{ {

View File

@ -58,13 +58,13 @@ namespace APT.MS.Domain.Enums
} }
public enum EvaluateLevelEnum public enum EvaluateLevelEnum
{ {
[Description("1级")] [Description("重大风险")]
= 10, = 10,
[Description("2级")] [Description("较大风险")]
= 20, = 20,
[Description("3级")] [Description("一般风险")]
= 30, = 30,
[Description("4级")] [Description("低风险")]
= 40, = 40,
} }
public enum HazardLevelEnum public enum HazardLevelEnum

View File

@ -363,9 +363,10 @@ namespace APT.HM.WebApi.Controllers.Api
{ {
item.RISK_PLACE = dtSource.Rows[i][6].ToString().Trim(); 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 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 (!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.; item.EVALUATE_LEVEL = EvaluateLevelEnum.;
} }
else if (dtSource.Rows[i][11].ToString().Trim() == "二级") else if (dtSource.Rows[i][11].ToString().Trim() == "较大风险")
{ {
item.EVALUATE_LEVEL = EvaluateLevelEnum.; item.EVALUATE_LEVEL = EvaluateLevelEnum.;
} }
else if (dtSource.Rows[i][11].ToString().Trim() == "三级") else if (dtSource.Rows[i][11].ToString().Trim() == "一般风险")
{ {
item.EVALUATE_LEVEL = EvaluateLevelEnum.; item.EVALUATE_LEVEL = EvaluateLevelEnum.;
} }
else if (dtSource.Rows[i][11].ToString().Trim() == "四级") else if (dtSource.Rows[i][11].ToString().Trim() == "低风险")
{ {
item.EVALUATE_LEVEL = EvaluateLevelEnum.; item.EVALUATE_LEVEL = EvaluateLevelEnum.;
} }