lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2023-12-01 12:11:50 +08:00
parent 66a8cb638a
commit 23c2b9fedd
8 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs
+14 -4
View File
@@ -21,7 +21,8 @@ namespace BLL
/// <returns></returns>
public static Model.HJGL_WeldTask GetWeldTaskByWeldJointId(string weldJointId)
{
return Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.WeldJointId == weldJointId);
Model.SGGLDB db = Funs.DB;
return db.HJGL_WeldTask.FirstOrDefault(e => e.WeldJointId == weldJointId);
}
/// <summary>
@@ -64,12 +65,21 @@ namespace BLL
return code;
}
public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, DateTime taskDate)
public static List<Model.View_HJGL_WeldingTask> GetWeldingTaskList(string ProjectId, string UnitWorkId, DateTime taskDate,string canWelder)
{
return (from x in Funs.DB.View_HJGL_WeldingTask
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).ToList();
select x;
if (canWelder == "0")
{
q = q.Where(x => x.CanWelderId == null);
}
else if(canWelder == "1")
{
q=q.Where(x => x.CanWelderId != null);
}
return q.ToList();
}
/// <summary>