Compare commits

..

No commits in common. "2384e6937552a85ed5fea5c18d445d4f6c18d68a" and "cfa70a19a8bc8f230a08e14c4f78c171c1b7da93" have entirely different histories.

2 changed files with 147 additions and 160 deletions

View File

@ -153,9 +153,11 @@
<div class="bw-b-bottom-up">
<div class="tab-wrap">
<div class="tab" data-value="2">
<div class="t-item active">施工分包商</div>
<div class="t-item ">施工分包商</div>
<div class="spline"></div>
<div class="t-item">单位工程</div>
<div class="t-item active">安装单位工程</div>
<div class="spline"></div>
<div class="t-item">建筑单位工程</div>
<div class="spline"></div>
<div class="t-item">专业</div>
</div>
@ -191,7 +193,9 @@
<div class="bw-b-bottom-up">
<div class="tab-wrap">
<div class="tab" data-value="4">
<div class="t-item active">单位工程</div>
<div class="t-item active">安装单位工程</div>
<div class="spline"></div>
<div class="t-item">建筑单位工程</div>
</div>
</div>
<div class="bw-item-content">
@ -292,7 +296,7 @@
var one2 =<%=One2 %>
var one3 =<%=One3 %>
category_One('one1', "质量验收一次合格率", one1, one1 + "%")
category_One('one2', "焊接一次拍片合格率", one2, one2 + "%")
category_One('one2', "施工资料同步率", one2, one2 + "%")
category_One('one3', "质量问题整改完成率", one3, one3 + "%")
</script>
<script type="text/javascript">
@ -583,7 +587,7 @@
textStyle: {
color: 'rgba(255, 255, 255, 0.8)'
}
},
}
},
series: data,
grid: {
@ -604,7 +608,7 @@
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option)
}
var two2 =<%=Two %>;
var two2 =<%=Two2 %>;
//var xArr = ["分包1", "分包2", "分包3", "分包4", "分包5", "分包6", "分包7", "分包8", "分包9"]
var xArr = two2.categories
var data = [
@ -615,15 +619,6 @@
barWidth: 40,
//data: [3, 5, 8, 10, 6, 4, 5, 9, 12],
data: two2.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(162,63,21, 1)' } }
},
{
@ -633,15 +628,6 @@
barWidth: 40,
//data: [2, 7, 5, 9, 12, 9, 2, 8, 10],
data: two2.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(206,143,135,1)' } }
}
]
@ -742,7 +728,7 @@
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
},
{
name: '焊接一次拍片合格率',
name: '施工资料同步率',
type: 'bar',
data: three.series[1].data,
barCategoryGap: 10,
@ -863,16 +849,15 @@
barWidth: 30,
barGap: 0,
data: four.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
},
{
name: '施工资料同步率',
type: 'bar',
data: four.series[1].data,
barWidth: 30,
//barCategoryGap:20,
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
}];
category('four', xArr, series)
</script>
@ -907,15 +892,6 @@
stack: '总量',
//data: [3, 5, 8, 10, 6, 4, 5, 9, 12],
data: two.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(162,63,21, 1)' } }
},
{
@ -924,15 +900,6 @@
stack: '总量',
//data: [2, 7, 5, 9, 12, 9, 2, 8, 10],
data: two.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(206,143,135,1)' } }
}
];
@ -947,15 +914,6 @@
stack: '总量',
//data: [13, 5, 18, 10, 6, 4, 5, 9, 22],
data: two2.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(162,63,21, 1)' } }
},
{
@ -964,21 +922,35 @@
stack: '总量',
//data: [2, 7, 15, 9, 12, 29, 12, 18, 10],
data: two2.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(206,143,135,1)' } }
}
];
num = two2.xFontNum;
}
else if (index == 4) {
//xArr = ["专业1", "专业2", "专业3", "专业4", "专业5", "专业6", "专业7", "专业8", "专业9"]
xArr = two4.categories
data = [
{
name: '未整改',
type: 'bar',
stack: '总量',
//data: [23, 25, 18, 10, 16, 4, 5, 29, 2],
data: two4.series[0].data,
itemStyle: { normal: { color: 'rgba(162,63,21, 1)' } }
},
{
name: '已整改',
type: 'bar',
stack: '总量',
//data: [2, 27, 15, 9, 12, 29, 32, 18, 1],
data: two4.series[1].data,
itemStyle: { normal: { color: 'rgba(206,143,135,1)' } }
}
];
num = two4.xFontNum;
}
else if (index == 6) {
//xArr = ["专业1", "专业2", "专业3", "专业4", "专业5", "专业6", "专业7", "专业8", "专业9"]
xArr = two3.categories
data = [
@ -988,15 +960,6 @@
stack: '总量',
//data: [23, 25, 18, 10, 16, 4, 5, 29, 2],
data: two3.series[0].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(162,63,21, 1)' } }
},
{
@ -1005,15 +968,6 @@
stack: '总量',
//data: [2, 27, 15, 9, 12, 29, 32, 18, 1],
data: two3.series[1].data,
label: { //柱体上显示数值
show: true,//开启显示
position: ['0%', '50%'],//在上方显示
textStyle: {//数值样式
fontSize: '20px',
color: '#fff'
},
formatter: '{c}',
},
itemStyle: { normal: { color: 'rgba(206,143,135,1)' } }
}
];

View File

@ -38,17 +38,20 @@ namespace FineUIPro.Web
}
#endregion
#region
#region
protected string One2
{
get
{
List<Model.View_Check_SoptCheckDetail> totalCheckDetailDataOKLists = SpotCheckDetailService.GetAllDataOkSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> totalCheckDetailOKLists = SpotCheckDetailService.GetTotalOKSpotCheckDetailListByTime1(CurrUser.LoginProjectId, DateTime.Now);
totalCheckDetailOKLists = totalCheckDetailOKLists.Where(x => x.IsShow == true).ToList(); //需要上传资料的IsShow为true
double result = 0;
var ndtList = (from x in Funs.DB.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault();
if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
if (totalCheckDetailDataOKLists.Count > 0 && totalCheckDetailOKLists.Count > 0)
{
result = Convert.ToDouble(ndtList.TotalRate) / 100;
var a = Convert.ToDouble(totalCheckDetailDataOKLists.Count);
var b = Convert.ToDouble(totalCheckDetailOKLists.Count);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
return JsonConvert.SerializeObject(result);
}
@ -80,32 +83,63 @@ namespace FineUIPro.Web
{
var db = new Model.SGGLDB(Funs.ConnString);
Model.Num num = new Model.Num();
var controlItemAndCycles = from x in db.WBS_BreakdownProject
where x.ProjectId == CurrUser.LoginProjectId && x.IsSelected == true
orderby x.BreakdownCode
select x;
var oKSpotCheckDetails = (from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement
on x.InspectionId equals y.InspectionId
join z in db.WBS_BreakdownProject
on x.ControlPointType equals z.BreakdownProjectId
where y.IsOnceQualified == true && y.ProjectId == CurrUser.LoginProjectId
select new { x.ControlPointType, z.Class }).Distinct().ToList();
var controlItemAndCycles = (from x in db.WBS_ControlItemAndCycle
where x.ProjectId == CurrUser.LoginProjectId && x.IsApprove == true
orderby x.ControlItemAndCycleCode
select x).ToList();
var oKSpotCheckDetails = (from x in db.Check_SpotCheckDetail
join y in db.Check_SpotCheck
on x.SpotCheckCode equals y.SpotCheckCode
where x.IsOK == true && y.ProjectId == CurrUser.LoginProjectId
select x).ToList();
//A类
var Alist = controlItemAndCycles.Where(x => x.Class.Contains("A"));
int a = oKSpotCheckDetails.Count(x => x.Class.Contains("A"));
var Alist = controlItemAndCycles.Where(x => x.ControlPoint.Contains("A"));
int a = 0;
foreach (var item in Alist)
{
if (item.CheckNum != 0) //检查次数为0表示一直检查
{
List<Model.Check_SpotCheckDetail> details = oKSpotCheckDetails.Where(x => x.ControlItemAndCycleId == item.ControlItemAndCycleId).ToList();
if (details.Count == item.CheckNum) //检查次数已达到最大值
{
a++;
}
}
}
num.num2 = a;
num.num3 = Alist.Count();
num.num1 = num.num3 - num.num2;
//B类
var Blist = controlItemAndCycles.Where(x => x.Class.Contains("B"));
int b = oKSpotCheckDetails.Count(x => x.Class.Contains("B"));
var Blist = controlItemAndCycles.Where(x => x.ControlPoint.Contains("B"));
int b = 0;
foreach (var item in Blist)
{
if (item.CheckNum != 0) //检查次数为0表示一直检查
{
List<Model.Check_SpotCheckDetail> details = oKSpotCheckDetails.Where(x => x.ControlItemAndCycleId == item.ControlItemAndCycleId).ToList();
if (details.Count == item.CheckNum) //检查次数已达到最大值
{
b++;
}
}
}
num.num5 = b;
num.num6 = Blist.Count();
num.num4 = num.num6 - num.num5;
//C类
var Clist = controlItemAndCycles.Where(x => x.Class.Contains("C"));
int c = oKSpotCheckDetails.Count(x => x.Class.Contains("C"));
var Clist = controlItemAndCycles.Where(x => x.ControlPoint.Contains("C"));
int c = 0;
foreach (var item in Clist)
{
if (item.CheckNum != 0) //检查次数为0表示一直检查
{
List<Model.Check_SpotCheckDetail> details = oKSpotCheckDetails.Where(x => x.ControlItemAndCycleId == item.ControlItemAndCycleId).ToList();
if (details.Count == item.CheckNum) //检查次数已达到最大值
{
c++;
}
}
}
num.num8 = c;
num.num9 = Clist.Count();
num.num7 = num.num9 - num.num8;
@ -125,9 +159,7 @@ namespace FineUIPro.Web
businessColumn.title = "质量问题统计";
businessColumn.xFontNum = 8;
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
var checks = from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.ProjectId == CurrUser.LoginProjectId
select x;
var checks = JointCheckDetailService.GetTotalJointCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
@ -137,7 +169,7 @@ namespace FineUIPro.Web
{
listCategories.Add(BLL.UnitService.GetShortUnitNameByUnitId(unit.UnitId));
var unitChecks = checks.Where(x => x.UnitId == unit.UnitId);
okNum = unitChecks.Where(x => x.State == "7").Count();
okNum = unitChecks.Where(x => x.OK == 1).Count();
listdata.Add(unitChecks.Count() - okNum);
listdata2.Add(okNum);
}
@ -161,9 +193,8 @@ namespace FineUIPro.Web
businessColumn.title = "质量问题统计";
businessColumn.xFontNum = 5;
var unitWorks = BLL.UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
var checks = from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.ProjectId == CurrUser.LoginProjectId
select x;
unitWorks = unitWorks.Where(x => x.ProjectType == "2").ToList();
var checks = JointCheckDetailService.GetTotalJointCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
@ -173,7 +204,7 @@ namespace FineUIPro.Web
{
listCategories.Add(unitWork.UnitWorkName);
var unitChecks = checks.Where(x => x.UnitWorkId == unitWork.UnitWorkId);
okNum = unitChecks.Where(x => x.State == "7").Count();
okNum = unitChecks.Where(x => x.OK == 1).Count();
listdata.Add(unitChecks.Count() - okNum);
listdata2.Add(okNum);
}
@ -197,9 +228,7 @@ namespace FineUIPro.Web
businessColumn.title = "质量问题统计";
businessColumn.xFontNum = 5;
var cns = BLL.CNProfessionalService.GetList();
var checks = from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.ProjectId == CurrUser.LoginProjectId
select x;
var checks = JointCheckDetailService.GetTotalJointCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
@ -209,7 +238,7 @@ namespace FineUIPro.Web
{
listCategories.Add(cn.ProfessionalName);
var unitChecks = checks.Where(x => x.CNProfessionalCode == cn.CNProfessionalId);
okNum = unitChecks.Where(x => x.State == "7").Count();
okNum = unitChecks.Where(x => x.OK == 1).Count();
listdata.Add(unitChecks.Count() - okNum);
listdata2.Add(okNum);
}
@ -234,9 +263,7 @@ namespace FineUIPro.Web
businessColumn.xFontNum = 5;
var unitWorks = BLL.UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
unitWorks = unitWorks.Where(x => x.ProjectType == "1").ToList();
var checks = from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.ProjectId == CurrUser.LoginProjectId
select x;
var checks = JointCheckDetailService.GetTotalJointCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
@ -246,7 +273,7 @@ namespace FineUIPro.Web
{
listCategories.Add(unitWork.UnitWorkName);
var unitChecks = checks.Where(x => x.UnitWorkId == unitWork.UnitWorkId);
okNum = unitChecks.Where(x => x.State == "7").Count();
okNum = unitChecks.Where(x => x.OK == 1).Count();
listdata.Add(unitChecks.Count() - okNum);
listdata2.Add(okNum);
}
@ -270,14 +297,10 @@ namespace FineUIPro.Web
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
businessColumn.title = "质量一次合格率";
Model.SGGLDB db = Funs.DB;
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
select x).ToList();
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailOKLists = SpotCheckDetailService.GetTotalOKSpotCheckDetailListByTime1(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailLists = SpotCheckDetailService.GetTotalAllSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> totalCheckDetailDataOKLists = SpotCheckDetailService.GetAllDataOkSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
@ -294,10 +317,13 @@ namespace FineUIPro.Web
var b = Convert.ToDouble(totalChecks.Count);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && x.UnitId == unit.UnitId && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault();
if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
var dataOkChecks = totalCheckDetailDataOKLists.Where(x => x.UnitId == unit.UnitId).ToList();
okChecks = okChecks.Where(x => x.IsShow == true).ToList(); //需要上传资料的IsShow为true
if (dataOkChecks.Count > 0 && okChecks.Count > 0)
{
result2 = Convert.ToDouble(ndtList.TotalRate);
var a = Convert.ToDouble(dataOkChecks.Count);
var b = Convert.ToDouble(okChecks.Count);
result2 = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
listdata.Add(result);
listdata2.Add(result2);
@ -323,13 +349,9 @@ namespace FineUIPro.Web
List<string> listCategories = new List<string>();
businessColumn.title = "质量一次合格率";
var cns = BLL.CNProfessionalService.GetList();
Model.SGGLDB db = Funs.DB;
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
select x).ToList();
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailOKLists = SpotCheckDetailService.GetTotalOKSpotCheckDetailListByTime1(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailLists = SpotCheckDetailService.GetTotalAllSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> totalCheckDetailDataOKLists = SpotCheckDetailService.GetAllDataOkSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
@ -338,21 +360,21 @@ namespace FineUIPro.Web
foreach (var cn in cns)
{
listCategories.Add(cn.ProfessionalName);
var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalCode == cn.CNProfessionalId).ToList();
var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalCode == cn.CNProfessionalId).ToList();
if (okChecks.Count > 0 && totalChecks.Count > 0)
{
var a = Convert.ToDouble(okChecks.Count);
var b = Convert.ToDouble(totalChecks.Count);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
if (cn.ProfessionalName.Contains("管道"))
var dataOkChecks = totalCheckDetailDataOKLists.Where(x => x.CNProfessionalCode == cn.CNProfessionalId).ToList();
okChecks = okChecks.Where(x => x.IsShow == true).ToList(); //需要上传资料的IsShow为true
if (dataOkChecks.Count > 0 && okChecks.Count > 0)
{
var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault();
if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
{
result2 = Convert.ToDouble(ndtList.TotalRate);
}
var a = Convert.ToDouble(dataOkChecks.Count);
var b = Convert.ToDouble(okChecks.Count);
result2 = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
listdata.Add(result);
listdata2.Add(result2);
@ -377,33 +399,44 @@ namespace FineUIPro.Web
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
businessColumn.title = "质量一次合格率";
Model.SGGLDB db = Funs.DB;
var unitWorks = BLL.UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
var TotalCheckDetailOKLists = from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
join z in db.WBS_BreakdownProject on x.ControlPointType equals z.BreakdownProjectId
where y.ProjectId == this.CurrUser.LoginProjectId
select new { z.UnitWorkId, y.IsOnceQualified };
unitWorks = unitWorks.Where(x => x.ProjectType == "2").ToList();
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailOKLists = SpotCheckDetailService.GetTotalOKSpotCheckDetailListByTime1(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> TotalCheckDetailLists = SpotCheckDetailService.GetTotalAllSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
List<Model.View_Check_SoptCheckDetail> totalCheckDetailDataOKLists = SpotCheckDetailService.GetAllDataOkSpotCheckDetailListByTime(CurrUser.LoginProjectId, DateTime.Now);
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
double result = 0;
List<double> listdata2 = new List<double>();
double result = 0, result2 = 0;
foreach (var unitWork in unitWorks)
{
listCategories.Add(unitWork.UnitWorkName);
var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.IsOnceQualified == true).ToList();
var totalChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
var totalChecks = TotalCheckDetailLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
if (okChecks.Count > 0 && totalChecks.Count > 0)
{
var a = Convert.ToDouble(okChecks.Count);
var b = Convert.ToDouble(totalChecks.Count);
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
var dataOkChecks = totalCheckDetailDataOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
okChecks = okChecks.Where(x => x.IsShow == true).ToList(); //需要上传资料的IsShow为true
if (dataOkChecks.Count > 0 && okChecks.Count > 0)
{
var a = Convert.ToDouble(dataOkChecks.Count);
var b = Convert.ToDouble(okChecks.Count);
result2 = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
}
listdata.Add(result);
listdata2.Add(result2);
result = 0;
result2 = 0;
}
s.data = listdata;
s2.data = listdata2;
series.Add(s);
series.Add(s2);
businessColumn.categories = listCategories;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);