公司级增加项目筛选，开车看板修改

2024-09-11 10:36:09 +08:00
parent d8567707cd
commit bedf5d3bdf
14 changed files with 2268 additions and 710 deletions
@@ -251,12 +251,23 @@
        /// 获取项目下拉选项
        /// </summary>
        /// <returns></returns>
-        public static List<Model.Base_Project> GetAllProjectDropDownList()
+        public static List<Model.Base_Project> GetAllProjectDropDownList(string[] pids = null)
        {
-            var list = (from x in Funs.DB.Base_Project
-                        orderby x.ProjectCode descending
-                        select x).ToList();
-            return list;
+            if (pids == null)
+            {
+                var list = (from x in Funs.DB.Base_Project
+                            orderby x.ProjectCode descending
+                            select x).ToList();
+                return list;
+            }
+            else {
+                var list = (from x in Funs.DB.Base_Project
+                            where pids.Contains(x.ProjectId)
+                            orderby x.ProjectCode descending
+                            select x).ToList();
+                return list;
+            }
+          
        }


@@ -669,5 +680,27 @@

            return list;
        }
+
+        #region 加载公司级别项目
+        public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string projectState,
+            string projectName = null, string projectCode = null) {
+            IQueryable<Model.Base_Project> projects = (from x in Funs.DB.Base_Project
+                                                       where x.ProjectState == projectState
+                                                       orderby x.ProjectCode descending
+                                                       select x);
+            if (!string.IsNullOrEmpty(projectName))
+            {
+                projects = from x in projects where x.ProjectName.Contains(projectName) select x;
+            }
+            if (!string.IsNullOrEmpty(projectCode))
+            {
+                projects = from x in projects where x.ProjectCode.Contains(projectCode) select x;
+            }
+            return (from x in projects
+                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                    select x).Distinct().ToList();
+
+        }
+        #endregion
    }
 }