升级

SUBQHSE/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs

@@ -74,6 +74,7 @@ namespace BLL
             newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
             newHazardRegister.Requirements = hazardRegister.Requirements;
             newHazardRegister.ControlId = hazardRegister.ControlId;
+            newHazardRegister.PunishPerson = hazardRegister.PunishPerson;
 
             newHazardRegister.CheckItemDetailId = hazardRegister.CheckItemDetailId;
             db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
@@ -118,6 +119,8 @@ namespace BLL
                 newHazardRegister.RegisterTypesId = hazardRegister.RegisterTypesId;
                 newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
                 newHazardRegister.Requirements = hazardRegister.Requirements;
+                newHazardRegister.PunishPerson = hazardRegister.PunishPerson;
+
                 newHazardRegister.IsUpdate = null;
                 //把附件表的路径复制过来
                 Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
@@ -222,5 +225,28 @@ namespace BLL
         {
             return (from x in Funs.DB.HSSE_Hazard_HazardRegister where x.CheckTime >= startTime && x.CheckTime < endTime && x.ProjectId == projectId select x).Count();
         }
+        /// <summary>
+        /// 根据危险观察登记主键删除一个危险观察登记信息
+        /// </summary>
+        /// <param name="hazardRegisterId">危险观察登记主键</param>
+        public static void DeleteHazardRegisterByCheckSpecialId(string checkSpecialId)
+        {
+            Model.SUBQHSEDB db = Funs.DB;
+            List<Model.HSSE_Hazard_HazardRegister> hazardRegisters = db.HSSE_Hazard_HazardRegister.Where(e => e.CheckSpecialId == checkSpecialId).ToList();
+            if (hazardRegisters.Count > 0)
+            {
+                foreach (var hazardRegister in hazardRegisters)
+                {
+                    if (hazardRegister.IsUpdate != true)
+                    {
+                        BLL.UploadFileService.DeleteFile(Funs.RootPath, hazardRegister.ImageUrl);//删除整改前图片
+                        BLL.UploadFileService.DeleteFile(Funs.RootPath, hazardRegister.RectificationImageUrl);//删除整改后图片
+                        db.HSSE_Hazard_HazardRegister.DeleteOnSubmit(hazardRegister);
+                        db.SubmitChanges();
+                    }
+                }
+            }
+        }
+
     }
 }