From 9596316ae9f13b043665b231b22f7f1fdad11427 Mon Sep 17 00:00:00 2001
From: wjn <xmwjn@qq.com>
Date: Fri, 7 Jun 2024 15:02:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs
index d8b8235..0a5aa7d 100644
--- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs
+++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs
@@ -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";

From 9b4e8b6892fa5b9d97c5f64557c7b0389704cf54 Mon Sep 17 00:00:00 2001
From: wjn <xmwjn@qq.com>
Date: Thu, 20 Jun 2024 13:51:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9B=E8=89=B2?=
 =?UTF-8?q?=E5=9B=BE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/EvaluateRiskController.cs | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs
index 4490146..30b98d8 100644
--- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs
+++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs
@@ -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()))//危险源
                 {