看板质量验收数据汇总
This commit is contained in:
@@ -34,6 +34,8 @@ namespace FineUIPro.Web.common
|
||||
MainSevice mainSevice = new MainSevice(page.CurrUser.UserId);
|
||||
// 获取HSSE数据
|
||||
var hsseData = Task.Run(() => mainSevice.GetHsseDataAsync()).Result;
|
||||
//获取CQMS数据
|
||||
var cqmsData = Task.Run(() => mainSevice.GetCqmsDataAsync()).Result;
|
||||
|
||||
//班前会
|
||||
var classMeetingList = HSSEData_HSSEService.GetProjectClassMeeting(null);
|
||||
@@ -86,20 +88,20 @@ namespace FineUIPro.Web.common
|
||||
var inspectionMachineList = (from x in db.Comprehensive_InspectionMachine select x).ToList();
|
||||
|
||||
|
||||
Model.CQMSData_CQMS cqmsData = new Model.CQMSData_CQMS();
|
||||
//Model.CQMSData_CQMS cqmsData = new Model.CQMSData_CQMS();
|
||||
var getCqmsDataCqms = db.CQMSData_CQMS.OrderByDescending(x => x.ReportDate).FirstOrDefault();
|
||||
if (getCqmsDataCqms == null)
|
||||
{
|
||||
cqmsData = new Model.CQMSData_CQMS();
|
||||
//cqmsData = new Model.CQMSData_CQMS();
|
||||
}
|
||||
|
||||
if (unitType == 0)
|
||||
{
|
||||
cqmsData = getCqmsDataCqms;
|
||||
//cqmsData = getCqmsDataCqms;
|
||||
}
|
||||
else if (unitType == 1)
|
||||
{
|
||||
cqmsData = CQMSDataService.GetSubUnitCqmsDataByDate(page.CurrUser.UnitId, getCqmsDataCqms.ReportDate);
|
||||
//cqmsData = CQMSDataService.GetSubUnitCqmsDataByDate(page.CurrUser.UnitId, getCqmsDataCqms.ReportDate);
|
||||
classMeetingList = classMeetingList.Where(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitId == page.CurrUser.UnitId).ToList();
|
||||
weekMeetingList = weekMeetingList.Where(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitId == page.CurrUser.UnitId).ToList();
|
||||
designDetailsList = designDetailsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitName == page.CurrUser.UnitId).ToList();
|
||||
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.common
|
||||
}
|
||||
else if (unitType == 2)
|
||||
{
|
||||
cqmsData = new Model.CQMSData_CQMS();
|
||||
//cqmsData = new Model.CQMSData_CQMS();
|
||||
classMeetingList = new List<MeetingOutput>();
|
||||
weekMeetingList = new List<MeetingOutput>();
|
||||
designDetailsList = new List<Comprehensive_DesignDetails>();
|
||||
@@ -142,6 +144,56 @@ namespace FineUIPro.Web.common
|
||||
cqmsZGRate = "0";
|
||||
}
|
||||
|
||||
#region 质量验收数据
|
||||
|
||||
//关键工序合格率
|
||||
double keyProcessRate = cqmsData.KeyProcessOKNum > 0 ? Math.Round(100 * ((double)cqmsData.KeyProcessOKNum / (double)cqmsData.KeyProcessNum), 2) : 0;
|
||||
//特殊工程合格率
|
||||
double specialProcessRate = cqmsData.SpecialProcessOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SpecialProcessOKNum / (double)cqmsData.SpecialProcessNum), 2) : 0;
|
||||
//隐蔽工程合格率
|
||||
double concealedWorksRate = cqmsData.ConcealedWorksOKNum > 0 ? Math.Round(100 * ((double)cqmsData.ConcealedWorksOKNum / (double)cqmsData.ConcealedWorksNum), 2) : 0;
|
||||
|
||||
//单位工程合格率
|
||||
double unitProjecProcessRate = cqmsData.UnitProjectAcceptNum > 0 ? Math.Round(100 * ((double)cqmsData.UnitProjectAcceptOKNum / (double)cqmsData.UnitProjectAcceptNum), 2) : 0;
|
||||
//分部工程合格率
|
||||
double subProjectProcessRate = cqmsData.SubProjectAcceptOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SubProjectAcceptOKNum / (double)cqmsData.SubProjectAcceptNum), 2) : 0;
|
||||
//分项工程合格率
|
||||
double subdivisionalWorksRate = cqmsData.SubdivisionalWorksAcceptOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SubdivisionalWorksAcceptOKNum / (double)cqmsData.SubdivisionalWorksAcceptNum), 2) : 0;
|
||||
|
||||
//验收数
|
||||
List<int> checkAccepts = new List<int>();
|
||||
checkAccepts.Add((int)cqmsData.KeyProcessNum);
|
||||
checkAccepts.Add((int)cqmsData.SpecialProcessNum);
|
||||
checkAccepts.Add((int)cqmsData.ConcealedWorksNum);
|
||||
//合格数
|
||||
List<int> checkAcceptOKs = new List<int>();
|
||||
checkAcceptOKs.Add((int)cqmsData.KeyProcessOKNum);
|
||||
checkAcceptOKs.Add((int)cqmsData.SpecialProcessOKNum);
|
||||
checkAcceptOKs.Add((int)cqmsData.ConcealedWorksOKNum);
|
||||
//合格率
|
||||
List<double> checkAcceptOKRates = new List<double>();
|
||||
checkAcceptOKRates.Add(keyProcessRate);
|
||||
checkAcceptOKRates.Add(specialProcessRate);
|
||||
checkAcceptOKRates.Add(concealedWorksRate);
|
||||
|
||||
//验收数
|
||||
List<int> checkAccepts2 = new List<int>();
|
||||
checkAccepts2.Add((int)cqmsData.UnitProjectAcceptNum);
|
||||
checkAccepts2.Add((int)cqmsData.SubProjectAcceptNum);
|
||||
checkAccepts2.Add((int)cqmsData.SubdivisionalWorksAcceptNum);
|
||||
//合格数
|
||||
List<int> checkAcceptOKs2 = new List<int>();
|
||||
checkAcceptOKs2.Add((int)cqmsData.UnitProjectAcceptOKNum);
|
||||
checkAcceptOKs2.Add((int)cqmsData.SubProjectAcceptOKNum);
|
||||
checkAcceptOKs2.Add((int)cqmsData.SubdivisionalWorksAcceptOKNum);
|
||||
//合格率
|
||||
List<double> checkAcceptOKRates2 = new List<double>();
|
||||
checkAcceptOKRates2.Add(unitProjecProcessRate);
|
||||
checkAcceptOKRates2.Add(subProjectProcessRate);
|
||||
checkAcceptOKRates2.Add(subdivisionalWorksRate);
|
||||
|
||||
#endregion
|
||||
|
||||
// 构造返回数据
|
||||
var returnData = new
|
||||
{
|
||||
@@ -241,7 +293,13 @@ namespace FineUIPro.Web.common
|
||||
branchNum = cqmsData.SubProjectNum ?? 0,//分部工程数
|
||||
itemizeNum = cqmsData.SubdivisionalWorksNum ?? 0,//分项工程数
|
||||
},
|
||||
//质量验收数据【待汇总】
|
||||
//质量验收数据
|
||||
checkAccepts = checkAccepts,
|
||||
checkAcceptOKs = checkAcceptOKs,
|
||||
checkAcceptOKRates = checkAcceptOKRates,
|
||||
checkAccepts2 = checkAccepts2,
|
||||
checkAcceptOKs2 = checkAcceptOKs2,
|
||||
checkAcceptOKRates2 = checkAcceptOKRates2,
|
||||
specialEquipmentSys = 0,//特种设备质保体系【待汇总】
|
||||
designBriefing = designDetailsList.Count(),//图纸会审、设计交底
|
||||
hsseEduTrain = new
|
||||
|
||||
Reference in New Issue
Block a user