Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC
This commit is contained in:
commit
5a130a619b
Binary file not shown.
|
@ -1354,7 +1354,7 @@ namespace BLL
|
||||||
public static int GetCompletedNum(string projectid)
|
public static int GetCompletedNum(string projectid)
|
||||||
{
|
{
|
||||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||||
where x.ProjectId == projectid && x.States == "1" && x.IsSuperLargerHazard == false &&
|
where x.ProjectId == projectid && x.States != "0" && x.IsSuperLargerHazard == false &&
|
||||||
x.RecordTime > Const.DtmarkTime
|
x.RecordTime > Const.DtmarkTime
|
||||||
select x).Count();
|
select x).Count();
|
||||||
return result;
|
return result;
|
||||||
|
@ -1405,7 +1405,7 @@ namespace BLL
|
||||||
public static int GetSuperCompletedNum(string projectid)
|
public static int GetSuperCompletedNum(string projectid)
|
||||||
{
|
{
|
||||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||||
where x.ProjectId == projectid && x.States == "1" && x.IsSuperLargerHazard == true &&
|
where x.ProjectId == projectid && x.States != "0" && x.IsSuperLargerHazard == true &&
|
||||||
x.RecordTime > Const.DtmarkTime
|
x.RecordTime > Const.DtmarkTime
|
||||||
select x).Count();
|
select x).Count();
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in New Issue