ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wyw 2024-06-20 14:57:03 +08:00
commit ad7faf75e6
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs
View File

@ -74,6 +74,66 @@ namespace APT.HM.WebApi.Controllers.Api
});
}
}
public class levelCountData
{
public List<riskLevelCountModel> RISKLEVELCOUNTS { get; set; }
}
public class riskLevelCountModel
{
public string NAME { get; set; }
public int LEVEL { get; set; }
public int LEVEL1 { get; set; }
public int LEVEL2 { get; set; }
public int LEVEL3 { get; set; }
public int LEVEL4 { get; set; }
}
/// <summary>
/// 风险库统计
/// </summary>
/// <param name="pageFilter">返回系统用户数</param>
/// <returns></returns>
[HttpPost, Route("getRiskLevelCountData")]
public JsonActionResult<levelCountData> getRiskLevelCountData([FromBody] KeywordFilter filter)
{
return SafeExecute<levelCountData>(() =>
{
var riskFilter = new BaseFilter(filter.GetOrgId());
riskFilter.SelectField = new string[] { "AREA_ID", "Nav_Area.NAME", "EVALUATE_LEVEL" };
IEnumerable<T_HM_EVALUATE_RISK> allrisk = null;
allrisk = GetEntities<T_HM_EVALUATE_RISK>(t => t.STATUS == (int)HMOperationStepEnum.有效, riskFilter);
var distinctArea = GetEntities<T_HM_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId()));
levelCountData riskData = new levelCountData();
List<riskLevelCountModel> item1s = new List<riskLevelCountModel>();
foreach (var itemArea in distinctArea)
{
riskLevelCountModel item = new riskLevelCountModel();
item.NAME = itemArea.NAME;
item.LEVEL1 = allrisk.Count(t => t.AREA_ID == itemArea.ID && t.EVALUATE_LEVEL == EvaluateLevelEnum.一级);
item.LEVEL2 = allrisk.Count(t => t.AREA_ID == itemArea.ID && t.EVALUATE_LEVEL == EvaluateLevelEnum.二级);
item.LEVEL3 = allrisk.Count(t => t.AREA_ID == itemArea.ID && t.EVALUATE_LEVEL == EvaluateLevelEnum.三级);
item.LEVEL4 = allrisk.Count(t => t.AREA_ID == itemArea.ID && t.EVALUATE_LEVEL == EvaluateLevelEnum.四级);
if (item.LEVEL1 > 0)
{
item.LEVEL = 1;
}
else if (item.LEVEL1 == 0 && item.LEVEL2 > 0)
{
item.LEVEL = 2;
}
else if (item.LEVEL1 == 0 && item.LEVEL2 == 0 && item.LEVEL3 > 0)
{
item.LEVEL = 3;
}
else if (item.LEVEL1 == 0 && item.LEVEL2 == 0 && item.LEVEL3 == 0)
{
item.LEVEL = 4;
}
item1s.Add(item);
}
riskData.RISKLEVELCOUNTS = item1s;
return riskData;
});
}
/// <summary>
/// 获取导入数据
/// 参考 [Route("api/PF/Import")]
@ -263,7 +323,7 @@ namespace APT.HM.WebApi.Controllers.Api
}
}
}
if (!string.IsNullOrEmpty(dtSource.Rows[i][4].ToString().Trim()))//危险源
{

2
APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs
View File

@ -30,7 +30,7 @@ namespace APT.PF.WebApiControllers.Api.PF
{
BaseFilter filter = new BaseFilter();
filter.IsSpecifyDb = true;
filter.SpecifyTenant = "0001";
filter.SpecifyTenant = "01";
filter.IgnoreOrgRule = true;
filter.Order = DbOrder.DESC;
filter.Sort = "CREATE_TIME";