Compare commits
No commits in common. "ab8edaa2a99b12a56b883cf54e9438af7544fa03" and "549b2550c4deab0ee6ee97798dcd9a0710bc8b28" have entirely different histories.
ab8edaa2a9
...
549b2550c4
|
@ -68,12 +68,7 @@ namespace FineUIPro.Web.common
|
||||||
|
|
||||||
//质量管理人员
|
//质量管理人员
|
||||||
int CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
|
int CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
|
||||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
where x.IsOnJob == true
|
||||||
where x.IsOnJob == true && y.IsCQMS == true
|
|
||||||
select x).Count() +
|
|
||||||
(from x in Funs.DB.SitePerson_Person
|
|
||||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
|
||||||
where x.IsUsed == true && y.IsCQMS == true
|
|
||||||
select x).Count();
|
select x).Count();
|
||||||
this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
|
this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
|
||||||
|
|
||||||
|
@ -451,8 +446,7 @@ namespace FineUIPro.Web.common
|
||||||
{
|
{
|
||||||
mapStr += ",";
|
mapStr += ",";
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
//获取剩余天数
|
//获取剩余天数
|
||||||
var residueDay = DateDiff(DateTime.Now, Convert.ToDateTime(item.EndDate)).ToString();
|
var residueDay = DateDiff(DateTime.Now, Convert.ToDateTime(item.EndDate)).ToString();
|
||||||
mapStr += string.Format("{0:yyyy-MM-dd}", item.EndDate) + ","+residueDay;
|
mapStr += string.Format("{0:yyyy-MM-dd}", item.EndDate) + ","+residueDay;
|
||||||
|
@ -514,8 +508,7 @@ namespace FineUIPro.Web.common
|
||||||
protected string zlzgl;
|
protected string zlzgl;
|
||||||
|
|
||||||
protected string zgzglDataValue;
|
protected string zgzglDataValue;
|
||||||
protected void getZlwt()
|
protected void getZlwt() {
|
||||||
{
|
|
||||||
zlallNumber = (from x in Funs.DB.Check_CheckControl
|
zlallNumber = (from x in Funs.DB.Check_CheckControl
|
||||||
where x.CheckDate <= DateTime.Now
|
where x.CheckDate <= DateTime.Now
|
||||||
select x).Count().ToString();
|
select x).Count().ToString();
|
||||||
|
@ -539,8 +532,7 @@ namespace FineUIPro.Web.common
|
||||||
protected string zlgjzgl;
|
protected string zlgjzgl;
|
||||||
|
|
||||||
protected string zggjzglDataValue;
|
protected string zggjzglDataValue;
|
||||||
protected void getZlgj()
|
protected void getZlgj() {
|
||||||
{
|
|
||||||
//Check_JointCheck
|
//Check_JointCheck
|
||||||
zlgjallNumber = (from x in Funs.DB.Check_JointCheck
|
zlgjallNumber = (from x in Funs.DB.Check_JointCheck
|
||||||
where x.CheckDate <= DateTime.Now
|
where x.CheckDate <= DateTime.Now
|
||||||
|
@ -625,8 +617,7 @@ namespace FineUIPro.Web.common
|
||||||
divGjsxzj.InnerHtml = znum.ToString();
|
divGjsxzj.InnerHtml = znum.ToString();
|
||||||
|
|
||||||
//到期应完成
|
//到期应完成
|
||||||
var dqnum = (from x in Funs.DB.GJSX
|
var dqnum = (from x in Funs.DB.GJSX where x.CompleteDate<=DateTime.Now
|
||||||
where x.CompleteDate <= DateTime.Now
|
|
||||||
select x).Count().ToString();
|
select x).Count().ToString();
|
||||||
divGjsxdq.InnerHtml = dqnum;
|
divGjsxdq.InnerHtml = dqnum;
|
||||||
|
|
||||||
|
@ -690,8 +681,7 @@ namespace FineUIPro.Web.common
|
||||||
#region 进度情况
|
#region 进度情况
|
||||||
protected string ProjectJd;
|
protected string ProjectJd;
|
||||||
protected string ProjectMc;
|
protected string ProjectMc;
|
||||||
protected void getJd()
|
protected void getJd() {
|
||||||
{
|
|
||||||
var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
|
var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
|
||||||
foreach (var item in list)
|
foreach (var item in list)
|
||||||
{
|
{
|
||||||
|
@ -704,8 +694,7 @@ namespace FineUIPro.Web.common
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 整改数据
|
#region 整改数据
|
||||||
protected void getZgsj()
|
protected void getZgsj() {
|
||||||
{
|
|
||||||
div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
|
div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
|
||||||
div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
|
div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
|
||||||
div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
|
div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
|
||||||
|
@ -742,8 +731,7 @@ namespace FineUIPro.Web.common
|
||||||
|
|
||||||
protected string gdclHead = "<span>项目</span><span>管子</span><span>管件</span><span>阀门</span><span>垫片</span><span>紧固件</span>";
|
protected string gdclHead = "<span>项目</span><span>管子</span><span>管件</span><span>阀门</span><span>垫片</span><span>紧固件</span>";
|
||||||
protected string sbclHead = "<span>项目</span><span>采购量</span><span>到货量</span><span>已到货百分比</span>";
|
protected string sbclHead = "<span>项目</span><span>采购量</span><span>到货量</span><span>已到货百分比</span>";
|
||||||
private void getCldh()
|
private void getCldh() {
|
||||||
{
|
|
||||||
|
|
||||||
//项目
|
//项目
|
||||||
var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
|
var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
|
||||||
|
@ -830,8 +818,7 @@ namespace FineUIPro.Web.common
|
||||||
SbcllCgl += 0;
|
SbcllCgl += 0;
|
||||||
Sbdhs += 0;
|
Sbdhs += 0;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
SbcllCgl +=Convert.ToDouble(itemCgl.C7);
|
SbcllCgl +=Convert.ToDouble(itemCgl.C7);
|
||||||
Sbdhs += Convert.ToDouble(itemCgl.C9);
|
Sbdhs += Convert.ToDouble(itemCgl.C9);
|
||||||
}
|
}
|
||||||
|
@ -845,8 +832,7 @@ namespace FineUIPro.Web.common
|
||||||
var dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
|
var dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
|
||||||
sbclHtml += "<span>" + dhbfb + "</span>";
|
sbclHtml += "<span>" + dhbfb + "</span>";
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
sbclHtml += "<span>0%</span>";
|
sbclHtml += "<span>0%</span>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue