提交代码

SGGL/BLL/Common/Const.cs

@@ -2674,6 +2674,14 @@ namespace BLL
         /// </summary>
         public const string ProjectCheckSpecialMenuId = "1B08048F-93ED-4E84-AE65-DB7917EA2DFB"; 
         /// <summary>
+        /// 安全专检
+        /// </summary>
+        public const string SafetyInspectionMenuId = "CAAD533A-D199-4CFB-BCC1-980FBE1085EC"; 
+        /// <summary>
+        /// 安全专检
+        /// </summary>
+        public const string ProjectSafetyInspectionMenuId = "0DAAF731-D058-41E9-9C8A-0647DF82E0D0"; 
+        /// <summary>
         /// HSSE综合检查
         /// </summary>
         public const string ProjectCheckColligationMenuId = "C198EBA8-9E23-4654-92E1-09C61105C522";

SGGL/BLL/OfficeCheck/Inspect/Inspect_InspectionService.cs

@@ -64,14 +64,10 @@ namespace BLL.OfficeCheck.Inspect
                 RectificationResults = InspectionItem.RectificationResults,
                 States = InspectionItem.States,
                 CompileMan = InspectionItem.CompileMan,
-                CompileTime = InspectionItem.CompileTime,
-
+                CompileTime = DateTime.Now,
             };
             db.Inspect_InspectionItem.InsertOnSubmit(newInspectionItem);
             db.SubmitChanges();
-            // ////增加一条编码记录
-            // BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectSafetyInspectionMenuId,
-            //     InspectionItem.ProjectId, null, InspectionItem.InspectionItemId, new DateTime());
         }
 
 
@@ -114,12 +110,26 @@ namespace BLL.OfficeCheck.Inspect
                 newInspection.InspectTime = Inspection.InspectTime;
                 newInspection.Description = Inspection.Description;
                 newInspection.States = Inspection.States;
-                newInspection.InspectMan = Inspection.InspectMan;
-                newInspection.InspectType = Inspection.InspectType;
-                newInspection.InspectItemSetId = Inspection.InspectItemSetId;
                 db.SubmitChanges();
             }
         }
+        
+        /// <summary>
+        /// 修改安全专项检查状态信息
+        /// </summary>
+        /// <param name="Inspection"></param>
+        public static void UpdateInspectionStates(string InspectionId, string States)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Inspect_Inspection newInspection =
+                db.Inspect_Inspection.FirstOrDefault(e => e.InspectionId == InspectionId);
+            if (newInspection != null)
+            {
+                newInspection.States = States;
+                db.SubmitChanges();
+            }
+        }
+        
         /// <summary>
         /// 修改安全专项检查明细
         /// </summary>
@@ -306,6 +316,7 @@ namespace BLL.OfficeCheck.Inspect
         {
             var list = (from x in Funs.DB.Inspect_InspectionItem
                         where x.InspectionId == InspectionId
+                        orderby x.CompileTime descending
                         select x).ToList();
             return list;
         }