修改安全月报

SGGL/BLL/HSSE/CostGoods/HseExpenseService.cs

@@ -102,5 +102,33 @@ namespace BLL
             var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(a => a.Id == newId);
             return result;
         }
+
+        /// <summary>
+        /// 根据时间、项目获取五环安全费用投入登记信息
+        /// </summary>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.CostGoods_HseExpense> GetPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId, string unitId)
+        {
+            return (from x in Funs.DB.CostGoods_HseExpense where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId && x.UnitId == unitId select x).ToList();
+        }
+
+        /// <summary>
+        ///  根据时间、项目获取施工分包商安全费用投入登记信息
+        /// </summary>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.CostGoods_HseExpense> GetConPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId)
+        {
+            return (from x in Funs.DB.CostGoods_HseExpense
+                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                    where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId
+                    && y.UnitTypeId == BLL.Const.UnitId_Con
+                    select x).ToList();
+        }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs

@@ -90,8 +90,12 @@ namespace BLL
         public static void DeleteAccidentSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_AccidentSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_AccidentSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_AccidentSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs

@@ -54,8 +54,12 @@ namespace BLL
         public static void DeleteCheckDetailSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_CheckDetailSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_CheckDetailSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_CheckDetailSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs

@@ -49,8 +49,10 @@ namespace BLL
         public static void DeleteDrillSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_DrillSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_DrillSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0) { 
+                db.Manager_DrillSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs

@@ -49,8 +49,9 @@ namespace BLL
         public static void DeleteEmergencySortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_EmergencySortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_EmergencySortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0) { 
+                db.Manager_EmergencySortC.DeleteAllOnSubmit(q);
+            db.SubmitChanges();}
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs

@@ -49,8 +49,13 @@ namespace BLL
         public static void DeleteHazardSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_HazardSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_HazardSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_HazardSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs

@@ -78,8 +78,11 @@ namespace BLL
         public static void DeleteHseCostsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_HseCostC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_HseCostC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_HseCostC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs

@@ -68,8 +68,11 @@ namespace BLL
         public static void DeleteIncentiveSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_IncentiveSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_IncentiveSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0)
+            {
+                db.Manager_IncentiveSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs

@@ -56,8 +56,12 @@ namespace BLL
         public static void DeleteMeetingSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_MeetingSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_MeetingSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_MeetingSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+           
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs

@@ -230,7 +230,9 @@ namespace BLL
 
                 StartDate=monthReport.StartDate,
                 EndDate=monthReport.EndDate,
-                TotalHseManhoursYear = monthReport.TotalHseManhoursYear
+                TotalHseManhoursYear = monthReport.TotalHseManhoursYear,
+
+                EmergencyManagementWorkDef=monthReport.EmergencyManagementWorkDef,
             };
 
             db.Manager_MonthReportC.InsertOnSubmit(newMonthReport);
@@ -305,6 +307,8 @@ namespace BLL
             newMonthReport.StartDate = monthReport.StartDate;
             newMonthReport.EndDate = monthReport.EndDate;
             newMonthReport.TotalHseManhoursYear = monthReport.TotalHseManhoursYear;
+
+            newMonthReport.EmergencyManagementWorkDef = monthReport.EmergencyManagementWorkDef;
             db.SubmitChanges();
         }
 

SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs

@@ -48,8 +48,11 @@ namespace BLL
         public static void DeleteOtherActiveSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_OtherActiveSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_OtherActiveSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count > 0)
+            {
+                db.Manager_OtherActiveSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs

@@ -49,8 +49,12 @@ namespace BLL
         public static void DeletePromotionalActiviteSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_PromotionalActiviteSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_PromotionalActiviteSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_PromotionalActiviteSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }

SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs

@@ -48,8 +48,12 @@ namespace BLL
         public static void DeleteTrainActivitySortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_TrainActivitySortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_TrainActivitySortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_TrainActivitySortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+            
         }
     }
 }