修改专项检查
This commit is contained in:
@@ -72,9 +72,9 @@ namespace BLL
|
||||
/// <param name="startTime"></param>
|
||||
/// <param name="endTime"></param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.ChartAnalysisItem> RectifyNoticesStatistics(string projectId, string unitId, DateTime? startTime, DateTime? endTime)
|
||||
public static List<Model.RecityNoticesItem> RectifyNoticesStatistics(string projectId, string unitId, DateTime? startTime, DateTime? endTime)
|
||||
{
|
||||
List<Model.ChartAnalysisItem> GetCheckStatistics = new List<Model.ChartAnalysisItem>();
|
||||
List<Model.RecityNoticesItem> GetCheckStatistics = new List<Model.RecityNoticesItem>();
|
||||
var getProjects = ProjectService.GetProjectWorkList();
|
||||
if (projectId != Const._Null && !string.IsNullOrEmpty(projectId))
|
||||
{
|
||||
@@ -89,38 +89,127 @@ namespace BLL
|
||||
}
|
||||
foreach (var item in getUnits)
|
||||
{
|
||||
var getHazardRegister = from x in Funs.DB.Check_RectifyNotices
|
||||
where x.ProjectId == pitem.ProjectId && x.UnitId == item.UnitId
|
||||
&& x.States != "0"
|
||||
select x;
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckedDate >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckedDate <= endTime);
|
||||
}
|
||||
Model.ChartAnalysisItem newItem = new Model.ChartAnalysisItem
|
||||
|
||||
Model.RecityNoticesItem newItem = new Model.RecityNoticesItem
|
||||
{
|
||||
DataId = SQLHelper.GetNewID(),
|
||||
DataAllName = pitem.ProjectName,
|
||||
DataName = item.UnitName,
|
||||
};
|
||||
newItem.DataSumCount = getHazardRegister.Count();
|
||||
newItem.DataCount1 = getHazardRegister.Where(x => x.States == "1").Count();
|
||||
newItem.DataCount2 = getHazardRegister.Where(x => x.States == "2").Count();
|
||||
newItem.DataCount3 = getHazardRegister.Where(x => x.States == "3").Count();
|
||||
newItem.DataCount4 = getHazardRegister.Where(x => x.States == "4").Count();
|
||||
newItem.DataCount5 = getHazardRegister.Where(x => x.States == "5").Count();
|
||||
if (newItem.DataCount2 > 0)
|
||||
//安全巡检隐患数
|
||||
var getHazardRegister = from x in Funs.DB.View_Hazard_HazardRegister
|
||||
where x.ProblemTypes == "1" && x.ProjectId == pitem.ProjectId && x.ResponsibleUnit == item.UnitId
|
||||
select x;
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
newItem.DataCountRate = (float)newItem.DataCount5 / (float)newItem.DataCount2 * 100;
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckTime >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckTime <= endTime);
|
||||
}
|
||||
newItem.DataSumCount1 = getHazardRegister.Where(x=>x.Type==0).Count();
|
||||
newItem.DataSumCountYzg1 = getHazardRegister.Where(x => x.Type == 0 && x.States == "2").Count();
|
||||
newItem.DataSumCountDzg1 = getHazardRegister.Where(x => x.Type == 0 && x.States == "1").Count();
|
||||
if (newItem.DataSumCountYzg1 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl1 =Math.Round((float)newItem.DataSumCountYzg1 / (float)newItem.DataSumCount1 * 100,2).ToString()+"%";
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataCountRate = 0;
|
||||
newItem.DataSumCountZgl1 ="0%";
|
||||
}
|
||||
|
||||
|
||||
//常规巡检隐患数
|
||||
newItem.DataSumCount2 = getHazardRegister.Where(x => x.Type == 1).Count();
|
||||
newItem.DataSumCountYzg2 = getHazardRegister.Where(x => x.Type == 1 && x.States == "2").Count();
|
||||
newItem.DataSumCountDzg2 = getHazardRegister.Where(x => x.Type == 1 && x.States == "1").Count();
|
||||
if (newItem.DataSumCountYzg2 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl2 = Math.Round((float)newItem.DataSumCountYzg2 / (float)newItem.DataSumCount2 * 100, 2).ToString() + "%";
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataSumCountZgl2 = "0%";
|
||||
}
|
||||
|
||||
//专项检查隐患数
|
||||
var getCheckSpecial = from x in Funs.DB.Check_CheckSpecialDetail
|
||||
join y in Funs.DB.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
|
||||
where x.UnitId == item.UnitId && y.ProjectId == pitem.ProjectId
|
||||
select new { y.CheckTime,x.UnitId,y.ProjectId,x.CompleteStatus };
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
getCheckSpecial = getCheckSpecial.Where(x => x.CheckTime >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getCheckSpecial = getCheckSpecial.Where(x => x.CheckTime <= endTime);
|
||||
}
|
||||
newItem.DataSumCount3= getCheckSpecial.Count();
|
||||
newItem.DataSumCountYzg3 = getCheckSpecial.Where(x =>x.CompleteStatus == true).Count();
|
||||
newItem.DataSumCountDzg3 = getCheckSpecial.Where(x =>x.CompleteStatus == false).Count();
|
||||
if (newItem.DataSumCountYzg3 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl3 =Math.Round((float)newItem.DataSumCountYzg3 / (float)newItem.DataSumCount3 * 100, 2).ToString() + "%"; ;
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataSumCountZgl3 = "0%";
|
||||
}
|
||||
|
||||
//综合检查隐患数
|
||||
var getCheckColligation = from x in Funs.DB.Check_CheckColligationDetail
|
||||
join y in Funs.DB.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
|
||||
where x.UnitId == item.UnitId && y.ProjectId == pitem.ProjectId
|
||||
select new { y.CheckTime, x.UnitId, y.ProjectId, x.CompleteStatus };
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
getCheckColligation = getCheckColligation.Where(x => x.CheckTime >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getCheckColligation = getCheckColligation.Where(x => x.CheckTime <= endTime);
|
||||
}
|
||||
newItem.DataSumCount4 = getCheckColligation.Count();
|
||||
newItem.DataSumCountYzg4 = getCheckColligation.Where(x => x.CompleteStatus == true).Count();
|
||||
newItem.DataSumCountDzg4 = getCheckColligation.Where(x => x.CompleteStatus == false).Count();
|
||||
if (newItem.DataSumCountYzg4 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl4 = Math.Round((float)newItem.DataSumCountYzg4 / (float)newItem.DataSumCount4 * 100, 2).ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataSumCountZgl4 = "0%";
|
||||
}
|
||||
|
||||
//var getHazardRegister = from x in Funs.DB.Check_RectifyNotices
|
||||
// where x.ProjectId == pitem.ProjectId && x.UnitId == item.UnitId
|
||||
// && x.States != "0"
|
||||
// select x;
|
||||
//if (startTime.HasValue)
|
||||
//{
|
||||
// getHazardRegister = getHazardRegister.Where(x => x.CheckedDate >= startTime);
|
||||
//}
|
||||
//if (endTime.HasValue)
|
||||
//{
|
||||
// getHazardRegister = getHazardRegister.Where(x => x.CheckedDate <= endTime);
|
||||
//}
|
||||
//newItem.DataSumCount = getHazardRegister.Count();
|
||||
//newItem.DataCount1 = getHazardRegister.Where(x => x.States == "1").Count();
|
||||
//newItem.DataCount2 = getHazardRegister.Where(x => x.States == "2").Count();
|
||||
//newItem.DataCount3 = getHazardRegister.Where(x => x.States == "3").Count();
|
||||
//newItem.DataCount4 = getHazardRegister.Where(x => x.States == "4").Count();
|
||||
//newItem.DataCount5 = getHazardRegister.Where(x => x.States == "5").Count();
|
||||
//if (newItem.DataCount2 > 0)
|
||||
//{
|
||||
// newItem.DataCountRate = (float)newItem.DataCount5 / (float)newItem.DataCount2 * 100;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// newItem.DataCountRate = 0;
|
||||
//}
|
||||
GetCheckStatistics.Add(newItem);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user