项目当前现场人员界面补充查询条件

2025-12-08 10:02:06 +08:00
parent 2b1680c9bc
commit 3d4009617e
4 changed files with 101 additions and 10 deletions
@@ -42,7 +42,7 @@ namespace BLL
                EntryTime = teamGroup.EntryTime,
                ExitTime = teamGroup.ExitTime,
                GroupLeaderId = teamGroup.GroupLeaderId,
-                RealNamePushTime= null,
+                RealNamePushTime = null,
            };
            db.ProjectData_TeamGroup.InsertOnSubmit(newTeamGroup);
            db.SubmitChanges();
@@ -119,14 +119,28 @@ namespace BLL
        /// <returns></returns>
        public static object GetTeamGroupListByUnitId(string projectId, string unitId)
        {
-            return (from x in Funs.DB.ProjectData_TeamGroup
-                    where x.ProjectId == projectId && x.UnitId == unitId
-                    orderby x.TeamGroupCode select x).ToList();
+            //return (from x in Funs.DB.ProjectData_TeamGroup
+            //        where x.ProjectId == projectId && x.UnitId == unitId
+            //        orderby x.TeamGroupCode select x).ToList();
+
+
+            var list = (from x in Funs.DB.ProjectData_TeamGroup
+                        orderby x.TeamGroupCode
+                        select x).ToList();
+            if (!string.IsNullOrWhiteSpace(projectId))
+            {
+                list = list.Where(x => x.ProjectId == projectId).ToList();
+            }
+            if (!string.IsNullOrWhiteSpace(unitId))
+            {
+                list = list.Where(x => x.UnitId == unitId).ToList();
+            }
+            return list;
        }

-        public static Model.ProjectData_TeamGroup getTeamGroupByTeamGroupName(string projectId,string unitId, string name)
+        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);
+            return Funs.DB.ProjectData_TeamGroup.FirstOrDefault(x => x.ProjectId == projectId && x.UnitId == unitId && x.TeamGroupName == name);
        }

        #region 表下拉框