代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Linq;
|
||||
using Model;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -36,7 +35,7 @@ namespace BLL
|
||||
/// <param name="endTime"></param>
|
||||
/// <param name="Grid1"></param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1)
|
||||
public static IEnumerable getDataDWList(string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1)
|
||||
{
|
||||
IQueryable<Model.Base_Project> getDataList = getDataLists;
|
||||
if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null)
|
||||
@@ -82,7 +81,7 @@ namespace BLL
|
||||
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count(); //一次合格
|
||||
// this.lbSpotCheck2.Text= okCount.ToString();
|
||||
|
||||
return all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString() + "%" : "0%";
|
||||
return all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString() + "%" : "0%";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -90,17 +89,17 @@ namespace BLL
|
||||
/// </summary>
|
||||
/// <param name="projectId"></param>
|
||||
/// <returns></returns>
|
||||
public static string getSpotCheckDataRate(string projectId)
|
||||
public static string getSpotCheckDataRate(string projectId)
|
||||
{
|
||||
var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
|
||||
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
|
||||
where (y.ProjectId == projectId || projectId == null) && y.State == "8"
|
||||
where (y.ProjectId == projectId || projectId == null) && y.State == "8"
|
||||
select x;
|
||||
/// 资料验收合格项目
|
||||
var getOKSpotCheckDetail = getSpotCheckDetail.Where(x => x.IsOK == true);
|
||||
int okYSCount = getOKSpotCheckDetail.Count(); //验收合格
|
||||
int okDateCount = getSpotCheckDetail.Where(x => x.IsDataOK == "1").Count(); //资料合格
|
||||
return okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%";
|
||||
return okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -110,7 +109,7 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static string getCheckControlStates(string projectId)
|
||||
{
|
||||
var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl
|
||||
var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl
|
||||
where (x.ProjectId == projectId || projectId == null)
|
||||
select x;
|
||||
int allCheckControlCount = getCheck_CheckControl.Count();
|
||||
@@ -136,7 +135,7 @@ namespace BLL
|
||||
int allHJCount = getJots.Count();
|
||||
var getOk = getJots.Where(x => x.CheckResult == "1");
|
||||
int okHJCount = getOk.Count();
|
||||
return allHJCount > 0 ? Math.Round(okHJCount * 100.0 / (allHJCount * 1.0)).ToString() + "%" : "0%";
|
||||
return allHJCount > 0 ? Math.Round(okHJCount * 100.0 / (allHJCount * 1.0)).ToString() + "%" : "0%";
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user