Browse Source

mxg:数据检查,没有选中的检查项,检查结果不显示

mengxiangge 6 years ago
parent
commit
45686a48ce

+ 3 - 3
MBI/SAGA.MBI/ToolsData/DataCheck/DataCheckBase.cs

@@ -65,8 +65,8 @@ namespace SAGA.MBI.ToolsData.DataCheck
         {
             bool result = RIsChecked;
             
-            if (result)
-                result = !(results.All(t => t.IsRight));
+            //if (result)
+            //    result = !(results.All(t => t.IsRight));
             //如果有没有通过的项
             if (!result)
             {
@@ -99,7 +99,7 @@ namespace SAGA.MBI.ToolsData.DataCheck
         {
             DCRExport.SetTemplatePath(Context.TemplatePath);
             Export();
-            //SetSheetVisible();
+            SetSheetVisible();
         }
         #endregion
 

+ 3 - 10
MBI/SAGA.MBI/ToolsData/ModeCheck/ElementRangeCheck.cs

@@ -16,6 +16,8 @@ using SAGA.DotNetUtils.Others;
 using SAGA.MBI.Tools;
 using SAGA.MBI.ToolsData.CheckBase;
 using SAGA.RevitUtils.Extends;
+using NPOI.SS.Util;
+using NPOI.XSSF.UserModel;
 
 namespace SAGA.MBI.ToolsData.ModeCheck
 {
@@ -289,17 +291,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
                 //添加 共检查XXX条数据,未通过检查的如下 提示
                 IRow rowTip = sheet.CreateRow(index - 1);
                 rowTip.AddCell(0, $"总检查{Results.Count}条数据,未通过检查的如下", DataCheckNPOIStyle.Title);
-                //IRow row4 = sheet.CreateRow(index);
-                //row4.HeightInPoints = 15;
 
-                //row4.AddCell(0, "楼层本地名称", DataCheckNPOIStyle.Title);
-                //row4.AddCell(1, "文件名", DataCheckNPOIStyle.Title);
-                //row4.AddCell(2, "文件地址", DataCheckNPOIStyle.Title);
-                //row4.AddCell(3, "族名称", DataCheckNPOIStyle.Title);
-                //row4.AddCell(4, "类型", DataCheckNPOIStyle.Title);
-                //row4.AddCell(5, "ID", DataCheckNPOIStyle.Title);
-                //row4.AddCell(6, "通过", DataCheckNPOIStyle.Title);
-                //row4.AddCell(7, "备注(失败原因)", DataCheckNPOIStyle.Title);
                 foreach (ElementRangeCheckResult result in Results)
                 {
                     SagaSignCheckResult rbase = result.RBase as SagaSignCheckResult;
@@ -321,6 +313,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
                     rowN.AddCell(6, rowN4, style);
                     rowN.AddCell(7, result.RMessage, style);
                 }
+         
                 #endregion
 
             }

+ 3 - 3
MBI/SAGA.MBI/ToolsData/ModeCheck/ModeCheckBase.cs

@@ -70,8 +70,8 @@ namespace SAGA.MBI.ToolsData.ModeCheck
         {
             bool result = RIsChecked;
             
-            if (result)
-                result = !(results.All(t => t.IsRight));
+            //if (result)
+            //    result = !(results.All(t => t.IsRight));
             //如果有没有通过的项
             if (!result)
             {
@@ -104,7 +104,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
         {
             DCRExport.SetTemplatePath(Context.TemplatePath);
             Export();
-            //SetSheetVisible();
+            SetSheetVisible();
         }
         #endregion
 

+ 9 - 12
MBI/SAGA.MBI/ToolsData/ModeCheck/SagaPositionCheck.cs

@@ -56,19 +56,16 @@ namespace SAGA.MBI.ToolsData.ModeCheck
             bool sequenceResult = true;
             //标准通过率
             double rrate =m_RateValue;
-            if (RBase.Results.Count > 1)
+            foreach (SagaSignCheckResult result in RBase.Results)
             {
-                foreach (SagaSignCheckResult result in RBase.Results)
-                {
-                    double rate = result.RCPassRate;
-                    bool isright= rate.IsThanEq(rrate);
-                    string tip = isright ?"": $"构件范围检查通过率低于{rrate*100}%,请检查saga标记位置是否正确";
-                    var tempResult=new SagaPositionCheckCheckResult();
-                    tempResult.IsRight = isright;
-                    tempResult.RMessage = tip;
-                    tempResult.RBase = result;
-                    Results.Add(tempResult);
-                }
+                double rate = result.RCPassRate;
+                bool isright = rate.IsThanEq(rrate);
+                string tip = isright ? "" : $"构件范围检查通过率低于{rrate * 100}%,请检查saga标记位置是否正确";
+                var tempResult = new SagaPositionCheckCheckResult();
+                tempResult.IsRight = isright;
+                tempResult.RMessage = tip;
+                tempResult.RBase = result;
+                Results.Add(tempResult);
             }
 
             return sequenceResult;