diff --git a/.vs/SGGL_CWCEC/v17/.wsuo b/.vs/SGGL_CWCEC/v17/.wsuo index 53e01de7..61084186 100644 Binary files a/.vs/SGGL_CWCEC/v17/.wsuo and b/.vs/SGGL_CWCEC/v17/.wsuo differ diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index 99dba82a..45bb3e9a 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -1354,7 +1354,7 @@ namespace BLL public static int GetCompletedNum(string projectid) { 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 select x).Count(); return result; @@ -1405,7 +1405,7 @@ namespace BLL public static int GetSuperCompletedNum(string projectid) { 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 select x).Count(); return result;