2023-09-26

This commit is contained in:
2023-09-26 15:20:47 +08:00
parent 1c28e4069e
commit d5d459bf1c
77 changed files with 10228 additions and 3160 deletions
@@ -228,7 +228,12 @@ namespace BLL
/// <param name="hJGLDateType">数据类型</param>
public static void StatisticalData(string projectid,HJGLDateType hJGLDateType)
{
string thisUnitId = BLL.Const.UnitId_CD;
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))
@@ -265,7 +270,7 @@ namespace BLL
}
if (hJGLDateType == HJGLDateType.DefectAnalysis || hJGLDateType == HJGLDateType.All)
{
Project_HJGLData_DefectService.StatisticalData(projectid);
// Project_HJGLData_DefectService.StatisticalData(projectid);
}
if (IsReportByToday(projectid))
@@ -298,7 +303,7 @@ namespace BLL
{
int result = Convert.ToInt32((from x in Funs.DB.PW_JointInfo
where x.ProjectId == projectid
select x.JOT_Size).ToList().Sum(x=>x.Value));
select x.JOT_Size).ToList().Sum());
return result;
}
/// <summary>
@@ -309,7 +314,7 @@ namespace BLL
{
int result = Convert.ToInt32((from x in Funs.DB.PW_JointInfo
where x.ProjectId == projectid
select x.JOT_DoneDin ).ToList().Sum(x => x.Value));
select x.JOT_DoneDin ).ToList().Sum());
return result;
}
/// <summary>
@@ -318,10 +323,10 @@ namespace BLL
/// <returns></returns>
public static int GetTotalFilmNum(string projectid)
{
int result = (from x in Funs.DB.CH_CheckItem
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
where y.ProjectId == projectid
select x.CHT_TotalFilm ).ToList().Sum(x => x.Value);
select x.CHT_TotalFilm ).ToList().Sum());
return result;
}
/// <summary>
@@ -330,10 +335,10 @@ namespace BLL
/// <returns></returns>
public static int GetOKFilmNum(string projectid)
{
int result = (from x in Funs.DB.CH_CheckItem
int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
where y.ProjectId == projectid
select x.CHT_PassFilm).ToList().Sum(x => x.Value);
select x.CHT_PassFilm).ToList().Sum());
return result;
}