Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

SGGL/BLL/API/HSSE/APICheckSpecialService.cs

@@ -337,6 +337,8 @@ namespace BLL
                                       CheckItemDetailContent = x.CheckItemSetContent,
                                       Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
                                       CheckOpinions = x.CheckOpinions,
+
+                                      HiddenType=x.HiddenType
                                   };
                     return getInfo.ToList();
                 }
@@ -427,7 +429,8 @@ namespace BLL
                                   CheckItemDetailSetId=x.CheckItemSetId,
                                   CheckItemDetailContent=x.CheckItemSetContent,
                                   Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
-                                  CheckOpinions=x.CheckOpinions
+                                  CheckOpinions=x.CheckOpinions,
+                                  HiddenType=x.HiddenType
                               };
                 return getInfo.First();
             }
@@ -468,6 +471,7 @@ namespace BLL
                         CheckItemSetContent= newDetail.CheckItemDetailContent,
                         Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date),
                         CheckOpinions=newDetail.CheckOpinions,
+                        HiddenType=newDetail.HiddenType,
                     };
                     if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
                     {
@@ -515,6 +519,7 @@ namespace BLL
                         updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
                         updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
                         updateDetail.CheckOpinions = newDetail.CheckOpinions;
+                        updateDetail.HiddenType = newDetail.HiddenType;
                         db.SubmitChanges();
                     }
                     ////保存附件

SGGL/BLL/API/HSSE/APIHazardRegisterService.cs

@@ -80,6 +80,10 @@ namespace BLL
                     IsWx = "Y",
                     CCManIds = hazardRegister.CCManIds,
                     Requirements = hazardRegister.Requirements,
+
+                    Risk_Level = hazardRegister.Risk_Level,
+                    HiddenType= hazardRegister.HiddenType
+
                 };
                 var RegisterTypesDt = db.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(x => x.RegisterTypesId == newHazardRegister.RegisterTypesId);
                 if (RegisterTypesDt != null && RegisterTypesDt.HazardRegisterType == "4")
@@ -173,6 +177,7 @@ namespace BLL
                                            ResponsibilityManName = db.Sys_User.First(User => x.ResponsibleMan == User.UserId).UserName,
                                            RectificationTime = x.RectificationTime,
                                            Risk_Level = x.Risk_Level,
+                                           HiddenType=x.HiddenType
 
                                        }).OrderBy(x => x.CheckTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
                 return hazardRegisters;

SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs

@@ -107,6 +107,9 @@ namespace BLL
                                   IsRectify = x.IsRectify,
                                   PhotoBeforeUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#1", null),
                                   PhotoAfterUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#2", null),
+
+                                  HiddenType=x.HiddenType,
+                                  HiddenHazardType=x.HiddenHazardType
                               };
                 return getInfo.ToList();
             }
@@ -473,6 +476,9 @@ namespace BLL
                                 LimitTime = Funs.GetNewDateTime(rItem.LimitTime),
                                 RectifyResults = null,
                                 IsRectify = null,
+
+                                HiddenType=rItem.HiddenType,
+                                HiddenHazardType=rItem.HiddenHazardType
                             };
                             db.Check_RectifyNoticesItem.InsertOnSubmit(newItem);
                             db.SubmitChanges();

SGGL/BLL/Common/ConstValue.cs

@@ -423,5 +423,18 @@ namespace BLL
             }
         }
 
+        public static List<Model.DropDownItem> getHiddenTypeList(string groupid)
+        {
+            var list = (from x in Funs.DB.Sys_Const
+                        where x.GroupId== groupid
+                        orderby x.SortIndex
+                        select new Model.DropDownItem
+                        {
+                            Text = x.ConstText,
+                            Values = x.ConstValue
+                        }).ToList();
+            return list;
+        }
+
     }
 }

SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs

@@ -70,6 +70,8 @@ namespace BLL
             newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
             newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
             newHazardRegister.Type=hazardRegister.Type;
+
+            newHazardRegister.HiddenType = hazardRegister.HiddenType;
             db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
             db.SubmitChanges();
         }
@@ -112,6 +114,7 @@ namespace BLL
                     newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
                     newHazardRegister.Type = hazardRegister.Type;
 
+                    newHazardRegister.HiddenType = hazardRegister.HiddenType;
                     //把附件表的路径复制过来
                     Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
                     if (file != null)