提交代码

2023-12-04 12:11:39 +08:00
parent ea22fad037
commit 1ce0a6da17
14 changed files with 334 additions and 61 deletions
@@ -65,19 +65,23 @@ namespace BLL
            return code;
        }

-        public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, DateTime taskDate,string canWelder)
+        public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, string unitId, DateTime taskDate, string canWelder)
        {
            var q = from x in Funs.DB.View_HJGL_WeldingTask
                    where x.ProjectId == ProjectId && x.UnitWorkId == UnitWorkId
                          && x.TaskDate.Value.Date == taskDate.Date
                    select x;
+            if (!string.IsNullOrEmpty(unitId))
+            {
+                q = q.Where(x => x.UnitId == unitId);
+            }
            if (canWelder == "0")
            {
                q = q.Where(x => x.CanWelderId == null);
            }
-            else if(canWelder == "1")
+            else if (canWelder == "1")
            {
-                q=q.Where(x => x.CanWelderId != null);
+                q = q.Where(x => x.CanWelderId != null);
            }
            return q.ToList();
        }