123

2026-06-04 14:34:48 +08:00
parent 451101c60a
commit 648c93e289
16 changed files with 97 additions and 30 deletions
@@ -355,11 +355,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
            if (!string.IsNullOrEmpty(rData4))
            {
                //Consequence = rData4;
-                if (!validConsequenceStrings.Any(x => x == rData4))
+                rData4 = rData4.Replace(",", "、").Replace("，", "、").Replace("；", "、");
+                int err = 0;
+                var Consequences = rData4.Split('、');
+                foreach (var obj in Consequences)
                {
-                    lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "只能是[人员伤亡/财产损失/环境破坏/公司声誉]！" });
+                    string item = obj.ToString().Trim();
+                    if (!validConsequenceStrings.Any(x => x == item))
+                    {
+                        err++;
+                        lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = $"[{item}]错误，只能是[人员伤亡/财产损失/环境破坏/公司声誉]！" });
+                    }
                }
-                else
+                if (err == 0)
                {
                    Consequence = rData4;
                }
@@ -475,7 +483,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
            var entity = new Model.HazardFactor_OccHealth
            {
                ID = SQLHelper.GetNewID(typeof(Model.HazardFactor_OccHealth)),
-                CompileDate=DateTime.Now,
+                CompileDate = DateTime.Now,
                CompileMan = this.CompileMan,
                CompileManName = this.CompileManName,
                State = int.Parse(BLL.Const.State_1),//默认已提交