安全管理报表

SGGL/BLL/Common/Funs.cs

@@ -539,11 +539,11 @@ namespace BLL
         public static int GetNewIntOrZero(string value)
         {
             int revalue = 0;
-            if (!String.IsNullOrEmpty(value))
+            if (!string.IsNullOrEmpty(value))
             {
                 try
                 {
-                    revalue = Int32.Parse(value);
+                    revalue = int.Parse(value);
                 }
                 catch (Exception ex)
                 {

SGGL/BLL/ReportManage/SafeEnvBudget/SafetyManagementDataService.cs

@@ -248,11 +248,23 @@ namespace BLL
         /// 根据报告日期获取安全管理数据
         /// </summary>
         /// <param name="projectId"></param>
+        /// <param name="unitId"></param>
         /// <param name="reportDate"></param>
         /// <returns></returns>
         public static Model.SafetyManagementData GetSafetyManagementDataByReportDate(string projectId, string unitId, DateTime? reportDate)
         {
             return Funs.DB.SafetyManagementData.FirstOrDefault(e => e.ProjectId == projectId && e.UnitId == unitId && e.ReportDate == reportDate);
         }
+
+        /// <summary>
+        /// 根据报告日期获取安全管理数据
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <param name="reportDate"></param>
+        /// <returns></returns>
+        public static Model.SafetyManagementData GetSafetyManagementDataByReportDate(string unitId, DateTime? reportDate)
+        {
+            return Funs.DB.SafetyManagementData.FirstOrDefault(e => e.UnitId == unitId && e.ReportDate == reportDate);
+        }
     }
 }

SGGL/BLL/SysManage/UnitService.cs

@@ -669,7 +669,7 @@ namespace BLL
         }
 
         /// <summary>
-        /// 根据项目Id获取单位名称下拉选择项
+        /// 获取分公司下拉选择项（含总公司）
         /// </summary>
         /// <param name="dropName">下拉框名字</param>
         /// <param name="isShowPlease">是否显示请选择</param>