修改专项检查

SGGL/BLL/API/HSSE/APICheckSpecialService.cs

@@ -282,6 +282,10 @@ namespace BLL
                                   CompleteStatus = x.CompleteStatus,
                                   CompleteStatusName = x.CompleteStatus == true ? "已整改" : "待整改",
                                   AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialDetailId, null),
+
+                                  CheckItemDetailSetId=x.CheckItemSetId,
+                                  CheckItemDetailContent=x.CheckItemSetContent,
+                                  Rectification_Date=x.Rectification_Date
                               };
                 return getInfo.First();
             }
@@ -316,6 +320,11 @@ namespace BLL
                         WorkArea = newDetail.WorkArea,
                         CheckArea = newDetail.WorkAreaId,
                         CheckContent = newDetail.CheckContent,
+
+                        //整改日期、检查内容、检查内容id
+                        CheckItemSetId= newDetail.CheckItemDetailSetId,
+                        CheckItemSetContent= newDetail.CheckItemDetailContent,
+                        Rectification_Date=newDetail.Rectification_Date
                     };
                     if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
                     {
@@ -357,6 +366,11 @@ namespace BLL
                         updateDetail.WorkArea = newCheckSpecialDetail.WorkArea;    
                         updateDetail.CheckArea = newCheckSpecialDetail.CheckArea;
                         updateDetail.CheckContent = newCheckSpecialDetail.CheckContent;
+
+                        //整改日期、检查内容、检查内容id
+                        updateDetail.CheckItemSetId = newDetail.CheckItemDetailSetId;
+                        updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
+                        updateDetail.Rectification_Date = newDetail.Rectification_Date;
                         db.SubmitChanges();
                     }
                     ////保存附件

SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs

@@ -58,6 +58,9 @@ namespace BLL
                 WorkArea = checkSpecialDetail.WorkArea,
                 CheckContent = checkSpecialDetail.CheckContent,
                 HiddenHazardType=checkSpecialDetail.HiddenHazardType,
+                CheckItemSetId= checkSpecialDetail.CheckItemSetId,
+                CheckItemSetContent= checkSpecialDetail.CheckItemSetContent,
+                Rectification_Date= checkSpecialDetail.Rectification_Date
             };
             db.Check_CheckSpecialDetail.InsertOnSubmit(newCheckSpecialDetail);
             db.SubmitChanges();
@@ -87,6 +90,10 @@ namespace BLL
                 newCheckSpecialDetail.Suggestions = CheckSpecialDetail.Suggestions;
                 newCheckSpecialDetail.WorkArea = CheckSpecialDetail.WorkArea;
                 newCheckSpecialDetail.CheckContent = CheckSpecialDetail.CheckContent;
+
+                newCheckSpecialDetail.CheckItemSetId = CheckSpecialDetail.CheckItemSetId;
+                newCheckSpecialDetail.CheckItemSetContent = CheckSpecialDetail.CheckItemSetContent;
+                newCheckSpecialDetail.Rectification_Date = CheckSpecialDetail.Rectification_Date;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs

@@ -155,5 +155,26 @@ namespace BLL
             }
             return name;
         }
+
+        /// <summary>
+        ///  检查项明细下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitCheckItemDetailDropDownList(FineUIPro.DropDownList dropName, string checkItemSetId, bool isShowPlease)
+        {
+            dropName.DataValueField = "CheckContent";
+            dropName.DataTextField = "CheckContent";
+            dropName.DataSource = (from x in Funs.DB.Technique_CheckItemDetail
+                                   where x.CheckItemSetId == checkItemSetId
+                                   orderby x.SortIndex
+                                   select x).ToList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
     }
 }