合并最新

SGGL/BLL/ProjectData/ProjectService.cs

@@ -17,7 +17,20 @@
         {
             return Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectId == projectId);
         }
+        public static Model.Base_Project GetProjectByProjectCode(string code)
+        {
+            return Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectCode == code);
+        }
 
+        /// <summary>
+        ///  获取安全经理
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static Model.Project_ProjectUser getHSSEManager(string projectId)
+        {
+            return Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.HSSEManager));
+        }
         /// <summary>
         ///根据ID获取项目名称
         /// </summary>

SGGL/BLL/ProjectData/TeamGroupService.cs

@@ -97,7 +97,7 @@ namespace BLL
         {
             Model.SGGLDB db = Funs.DB;
             return (from x in Funs.DB.SitePerson_Person
-                    where x.TeamGroupId == teamGroupId && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
+                    where x.TeamGroupId == teamGroupId && x.IsUsed == 1 && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
                     select x).Count();
         }
 
@@ -124,6 +124,11 @@ namespace BLL
                     orderby x.TeamGroupCode select x).ToList();
         }
 
+        public static Model.ProjectData_TeamGroup getTeamGroupByTeamGroupName(string projectId, string unitId, string name)
+        {
+            return Funs.DB.ProjectData_TeamGroup.FirstOrDefault(x => x.ProjectId == projectId && x.UnitId == unitId && x.TeamGroupName == name);
+        }
+
         #region 表下拉框
         /// <summary>
         ///  表下拉框

SGGL/BLL/ProjectData/UnitWorkService.cs

@@ -12,6 +12,11 @@ namespace BLL
     {
         public static Model.SGGLDB db = Funs.DB;
 
+        public static Model.WBS_UnitWork GetUnitWorkByUnitWorkName(string projectId, string unitWorkName)
+        {
+            return Funs.DB.WBS_UnitWork.FirstOrDefault(e => e.ProjectId == projectId && e.UnitWorkName == unitWorkName);
+        }
+
         /// <summary>
         /// 添加单位工程信息
         /// </summary>