2023-08-04
This commit is contained in:
@@ -105,11 +105,11 @@ namespace BLL
|
||||
return db.Project_HJGLData_HJGL.FirstOrDefault(x => x.Id == Id);
|
||||
}
|
||||
|
||||
public static List<Model.Project_HJGLData_HJGL> GetProject_HJGLData_HJGLByProjectid (string Projectid)
|
||||
public static List<Model.Project_HJGLData_HJGL> GetProject_HJGLData_HJGLByProjectid(string Projectid)
|
||||
{
|
||||
var q =( from x in db.Project_HJGLData_HJGL
|
||||
where x.ProjectId == Projectid
|
||||
select x).ToList();
|
||||
var q = (from x in db.Project_HJGLData_HJGL
|
||||
where x.ProjectId == Projectid
|
||||
select x).ToList();
|
||||
return q;
|
||||
}
|
||||
public static void AddProject_HJGLData_HJGL(Model.Project_HJGLData_HJGL newtable)
|
||||
@@ -226,9 +226,14 @@ namespace BLL
|
||||
/// </summary>
|
||||
/// <param name="projectid">项目id</param>
|
||||
/// <param name="hJGLDateType">数据类型</param>
|
||||
public static void StatisticalData(string projectid,HJGLDateType hJGLDateType)
|
||||
public static void StatisticalData(string projectid, HJGLDateType hJGLDateType)
|
||||
{
|
||||
string thisUnitId = BLL.Const.UnitId_SEDIN;
|
||||
string thisUnitId = string.Empty;
|
||||
var thisUnit = CommonService.GetIsThisUnit();
|
||||
if (thisUnit != null)
|
||||
{
|
||||
thisUnitId = thisUnit.UnitId;
|
||||
}
|
||||
var base_Unit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
|
||||
Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL();
|
||||
if (IsReportByToday(projectid))
|
||||
@@ -237,7 +242,7 @@ namespace BLL
|
||||
}
|
||||
else
|
||||
{
|
||||
table.Id = SQLHelper.GetNewID();
|
||||
table.Id = SQLHelper.GetNewID();
|
||||
}
|
||||
table.UnitId = thisUnitId;
|
||||
table.CollCropCode = base_Unit.CollCropCode;
|
||||
@@ -245,7 +250,7 @@ namespace BLL
|
||||
table.ProjectId = projectid;
|
||||
table.ReportDate = DateTime.Now.Date;
|
||||
|
||||
if (hJGLDateType== HJGLDateType.TotalNumberOfWelders|| hJGLDateType == HJGLDateType.All)
|
||||
if (hJGLDateType == HJGLDateType.TotalNumberOfWelders || hJGLDateType == HJGLDateType.All)
|
||||
{
|
||||
table.WelderNum = GetWelderNum(projectid);
|
||||
|
||||
@@ -265,9 +270,9 @@ namespace BLL
|
||||
}
|
||||
if (hJGLDateType == HJGLDateType.DefectAnalysis || hJGLDateType == HJGLDateType.All)
|
||||
{
|
||||
Project_HJGLData_DefectService.StatisticalData(projectid);
|
||||
// Project_HJGLData_DefectService.StatisticalData(projectid);
|
||||
}
|
||||
|
||||
|
||||
if (IsReportByToday(projectid))
|
||||
{
|
||||
UpdateProject_HJGLData_HJGL(table);
|
||||
@@ -320,7 +325,7 @@ namespace BLL
|
||||
{
|
||||
int result = (from x in Funs.DB.HJGL_Batch_NDEItem
|
||||
join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
|
||||
where y.ProjectId == projectid
|
||||
where y.ProjectId == projectid
|
||||
select x.TotalFilm).ToList().Sum(x => x.Value);
|
||||
return result;
|
||||
}
|
||||
@@ -332,7 +337,7 @@ namespace BLL
|
||||
{
|
||||
int result = (from x in Funs.DB.HJGL_Batch_NDEItem
|
||||
join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
|
||||
where y.ProjectId == projectid
|
||||
where y.ProjectId == projectid
|
||||
select x.PassFilm).ToList().Sum(x => x.Value);
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user