2023-11-11
This commit is contained in:
@@ -226,8 +226,8 @@ namespace BLL
|
||||
using (var db = new SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var q = (from x in db.Project_HSSEData_HSSE
|
||||
where x.ProjectId == Projectid
|
||||
select x).ToList();
|
||||
where x.ProjectId == Projectid
|
||||
select x).ToList();
|
||||
return q;
|
||||
}
|
||||
}
|
||||
@@ -330,9 +330,9 @@ namespace BLL
|
||||
{
|
||||
var result = false;
|
||||
var q = (from x in Funs.DB.Project_HSSEData_HSSE
|
||||
where x.ReportDate >= dateTime.Date && x.ReportDate < dateTime.Date.AddDays(1).Date &&
|
||||
x.ProjectId == projectid
|
||||
select x).ToList();
|
||||
where x.ReportDate >= dateTime.Date && x.ReportDate < dateTime.Date.AddDays(1).Date &&
|
||||
x.ProjectId == projectid
|
||||
select x).ToList();
|
||||
if (q != null && q.Count > 0) result = true;
|
||||
return result;
|
||||
}
|
||||
@@ -345,9 +345,9 @@ namespace BLL
|
||||
{
|
||||
var result = false;
|
||||
var q = (from x in Funs.DB.Project_HSSEData_HSSE
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
|
||||
x.ProjectId == projectid
|
||||
select x).ToList();
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
|
||||
x.ProjectId == projectid
|
||||
select x).ToList();
|
||||
if (q != null && q.Count > 0) result = true;
|
||||
return result;
|
||||
}
|
||||
@@ -360,9 +360,9 @@ namespace BLL
|
||||
public static Project_HSSEData_HSSE getProject_HSSEData_HSSEByDate(string projectid)
|
||||
{
|
||||
var q = (from x in Funs.DB.Project_HSSEData_HSSE
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
|
||||
x.ProjectId == projectid
|
||||
select x).FirstOrDefault();
|
||||
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date &&
|
||||
x.ProjectId == projectid
|
||||
select x).FirstOrDefault();
|
||||
return q;
|
||||
}
|
||||
|
||||
@@ -526,10 +526,10 @@ namespace BLL
|
||||
DateTime date = DateTime.Now;
|
||||
Model.SGGLDB db1 = Funs.DB;
|
||||
var list = from x in db1.HSSE_Hazard_HazardRegister
|
||||
select x;
|
||||
select x;
|
||||
var types = (from x in db1.HSSE_Hazard_HazardRegisterTypes
|
||||
join y in list on x.RegisterTypesId equals y.RegisterTypesId
|
||||
select new { x.RegisterTypesId, x.RegisterTypesName }).Distinct().ToList();
|
||||
join y in list on x.RegisterTypesId equals y.RegisterTypesId
|
||||
select new { x.RegisterTypesId, x.RegisterTypesName }).Distinct().ToList();
|
||||
foreach (var type in types)
|
||||
{
|
||||
Model.Project_HSSEData_HiddenDangerDetail table1 = new Model.Project_HSSEData_HiddenDangerDetail
|
||||
@@ -541,7 +541,7 @@ namespace BLL
|
||||
ReportDate = DateTime.Now.Date,
|
||||
TypeName = type.RegisterTypesName,
|
||||
TotalNum = list.Count(x => x.RegisterTypesId == type.RegisterTypesId),
|
||||
NeedRectifyNum = list.Count(x => x.RegisterTypesId == type.RegisterTypesId && (x.States == "1" )),
|
||||
NeedRectifyNum = list.Count(x => x.RegisterTypesId == type.RegisterTypesId && (x.States == "1")),
|
||||
};
|
||||
if (Project_HSSEData_HiddenDangerDetailService.IsReportByToday(projectid, type.RegisterTypesName))
|
||||
{
|
||||
@@ -582,8 +582,8 @@ namespace BLL
|
||||
public static int GetBeUnderConstructionNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Base_Project
|
||||
where x.ProjectState == "1" && x.ProjectId == projectid
|
||||
select x).Count();
|
||||
where x.ProjectState == "1" && x.ProjectId == projectid
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -594,8 +594,8 @@ namespace BLL
|
||||
public static int GetShutdownNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Base_Project
|
||||
where x.ProjectState == "2" && x.ProjectId == projectid
|
||||
select x).Count();
|
||||
where x.ProjectState == "2" && x.ProjectId == projectid
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -606,8 +606,8 @@ namespace BLL
|
||||
public static int GetJoinConstructionPersonNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
where x.ProjectId == projectid && x.IsUsed == 1
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -618,8 +618,8 @@ namespace BLL
|
||||
public static int GetMajorProjectsUnderConstructionNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.States == "2" && x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.States == "2" && x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -630,9 +630,9 @@ namespace BLL
|
||||
public static int GetTotalWorkingHour(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_DayReportDetail
|
||||
join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId
|
||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
||||
select x.PersonWorkTime ?? 0).ToList().Sum();
|
||||
join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId
|
||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
||||
select x.PersonWorkTime ?? 0).ToList().Sum();
|
||||
var q = Funs.GetNewIntOrZero(result.ToString().Split('.')[0]);
|
||||
|
||||
return q;
|
||||
@@ -646,12 +646,12 @@ namespace BLL
|
||||
{
|
||||
var result =
|
||||
(from x in Funs.DB.Accident_AccidentHandle
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkHoursLoss)
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkHoursLoss)
|
||||
.ToList().Sum(x => x.Value)
|
||||
+ (from x in Funs.DB.Accident_AccidentReport
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkingHoursLoss)
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkingHoursLoss)
|
||||
.ToList().Sum(x => x.Value);
|
||||
var q = Funs.GetNewIntOrZero(result.ToString().Split('.')[0]);
|
||||
|
||||
@@ -665,17 +665,17 @@ namespace BLL
|
||||
public static int GetSafeWorkingHour(string projectid)
|
||||
{
|
||||
var result1 = (from x in Funs.DB.SitePerson_DayReportDetail
|
||||
join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId
|
||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
||||
select x.PersonWorkTime ?? 0).ToList().Sum();
|
||||
join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId
|
||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
||||
select x.PersonWorkTime ?? 0).ToList().Sum();
|
||||
var result2 =
|
||||
(from x in Funs.DB.Accident_AccidentHandle
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkHoursLoss)
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkHoursLoss)
|
||||
.ToList().Sum(x => x.Value)
|
||||
+ (from x in Funs.DB.Accident_AccidentReport
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkingHoursLoss)
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x.WorkingHoursLoss)
|
||||
.ToList().Sum(x => x.Value);
|
||||
var result = result1 - result2;
|
||||
var q = Funs.GetNewIntOrZero(result.ToString().Split('.')[0]);
|
||||
@@ -690,9 +690,9 @@ namespace BLL
|
||||
public static int GetSafeTrainNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.EduTrain_TrainRecord
|
||||
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
|
||||
where x.ProjectId == projectid && y.TrainType == "1" && x.TrainStartDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
|
||||
where x.ProjectId == projectid && y.TrainType == "1" && x.TrainStartDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -703,9 +703,9 @@ namespace BLL
|
||||
public static int GetSpecialTrainNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.EduTrain_TrainRecord
|
||||
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
|
||||
where x.ProjectId == projectid && y.TrainType == "2" && x.TrainStartDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
|
||||
where x.ProjectId == projectid && y.TrainType == "2" && x.TrainStartDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -716,9 +716,9 @@ namespace BLL
|
||||
public static int GetSpecialOperationTrainNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.EduTrain_TrainRecord
|
||||
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
|
||||
where x.ProjectId == projectid && y.TrainType == "3" && x.TrainStartDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
|
||||
where x.ProjectId == projectid && y.TrainType == "3" && x.TrainStartDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -799,8 +799,8 @@ namespace BLL
|
||||
public static int GetProjectInspectorGeneralNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
where x.ProjectId == projectid && x.WorkPostId == Const.WorkPost_ProjectHSSEDirector && x.IsUsed == 1
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.WorkPostId == Const.WorkPost_ProjectHSSEDirector && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -811,9 +811,9 @@ namespace BLL
|
||||
public static int GetProjectFullTimeNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where x.ProjectId == projectid && y.IsHsse == true && x.IsUsed == 1
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where x.ProjectId == projectid && y.IsHsse == true && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -824,8 +824,8 @@ namespace BLL
|
||||
public static int GetProjectSafetyMonitorNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
where x.ProjectId == projectid && x.IsSafetyMonitoring == true && x.IsUsed == 1
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.IsSafetyMonitoring == true && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -836,9 +836,9 @@ namespace BLL
|
||||
public static int GetSafetyInjectionEngineer(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_Certificate on x.CertificateId equals y.CertificateId
|
||||
where x.ProjectId == projectid && y.IsRegisterHSSE == true && x.IsUsed == 1
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_Certificate on x.CertificateId equals y.CertificateId
|
||||
where x.ProjectId == projectid && y.IsRegisterHSSE == true && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -849,9 +849,10 @@ namespace BLL
|
||||
public static int GetCertificateANum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_Certificate on x.CertificateId equals y.CertificateId
|
||||
where x.ProjectId == projectid && y.CertificateType == "A" && x.IsUsed == 1
|
||||
select x).Count();
|
||||
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
|
||||
join z in Funs.DB.Base_Certificate on y.CertificateId equals z.CertificateId
|
||||
where x.ProjectId == projectid && z.CertificateType == "A" && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -862,9 +863,10 @@ namespace BLL
|
||||
public static int GetCertificateBNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_Certificate on x.CertificateId equals y.CertificateId
|
||||
where x.ProjectId == projectid && y.CertificateType == "B" && x.IsUsed == 1
|
||||
select x).Count();
|
||||
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
|
||||
join z in Funs.DB.Base_Certificate on y.CertificateId equals z.CertificateId
|
||||
where x.ProjectId == projectid && z.CertificateType == "B" && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -875,9 +877,10 @@ namespace BLL
|
||||
public static int GetCertificateCNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_Certificate on x.CertificateId equals y.CertificateId
|
||||
where x.ProjectId == projectid && y.CertificateType == "C" && x.IsUsed == 1
|
||||
select x).Count();
|
||||
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
|
||||
join z in Funs.DB.Base_Certificate on y.CertificateId equals z.CertificateId
|
||||
where x.ProjectId == projectid && z.CertificateType == "C" && x.IsUsed == 1
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -908,8 +911,8 @@ namespace BLL
|
||||
public static int GetProjectSafetyLeadingGroupMeetingNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Meeting_SafetyLeaderGroupMeeting
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x)
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x)
|
||||
.Count();
|
||||
return result;
|
||||
}
|
||||
@@ -921,11 +924,11 @@ namespace BLL
|
||||
public static int GetProjectSafetyMeetingNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Meeting_WeekMeeting
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count()
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count()
|
||||
+ (from x in Funs.DB.Meeting_MonthMeeting
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -966,8 +969,8 @@ namespace BLL
|
||||
public static int GetProjectLeadShiftCheckNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Check_ProjectLeaderCheck
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.CheckDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -978,8 +981,8 @@ namespace BLL
|
||||
public static int GetProjectSpecialCheckNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Check_CheckSpecial
|
||||
where x.ProjectId == projectid && x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -990,8 +993,8 @@ namespace BLL
|
||||
public static int GetProjectMajorCheckNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.ProjectId == projectid && x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1002,9 +1005,9 @@ namespace BLL
|
||||
public static int GetNearMissNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Accident_AccidentPersonRecord
|
||||
join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
|
||||
where x.ProjectId == projectid && x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
|
||||
where x.ProjectId == projectid && x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1015,9 +1018,9 @@ namespace BLL
|
||||
public static int GetRecordableEventNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Accident_AccidentPersonRecord
|
||||
join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1028,8 +1031,8 @@ namespace BLL
|
||||
public static int GetGeneralAccidentNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Accident_AccidentReport
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "1" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "1" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1040,8 +1043,8 @@ namespace BLL
|
||||
public static int GetMajorAccidentNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Accident_AccidentReport
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "2" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "2" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1052,8 +1055,8 @@ namespace BLL
|
||||
public static int GetSeriousAccidentNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Accident_AccidentReport
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "3" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "3" && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1064,8 +1067,8 @@ namespace BLL
|
||||
public static int GetSpecialSeriousAccidentNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Accident_AccidentReport
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "4"
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.AccidentDegree == "4"
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1116,9 +1119,9 @@ namespace BLL
|
||||
public static int GetProjectComprehensivePlanNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Emergency_EmergencyList
|
||||
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
|
||||
where x.ProjectId == projectid && y.EmergencyTypeName.Contains("综合") && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
|
||||
where x.ProjectId == projectid && y.EmergencyTypeName.Contains("综合") && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1129,9 +1132,9 @@ namespace BLL
|
||||
public static int GetProjectSpecialPlanNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Emergency_EmergencyList
|
||||
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
|
||||
where x.ProjectId == projectid && y.EmergencyTypeName.Contains("专项") && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
|
||||
where x.ProjectId == projectid && y.EmergencyTypeName.Contains("专项") && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1142,10 +1145,10 @@ namespace BLL
|
||||
public static int GetProjectOnSiteDisposalPlan(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Emergency_EmergencyList
|
||||
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
|
||||
where x.ProjectId == projectid && y.EmergencyTypeName.Contains("现场处置") &&
|
||||
x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
|
||||
where x.ProjectId == projectid && y.EmergencyTypeName.Contains("现场处置") &&
|
||||
x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1156,8 +1159,8 @@ namespace BLL
|
||||
public static int GetProjectDrillNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Emergency_DrillRecordList
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1179,10 +1182,10 @@ namespace BLL
|
||||
{
|
||||
var result = 0;
|
||||
var costs = (from x in Funs.DB.CostGoods_CostSmallDetailItem
|
||||
join y in Funs.DB.CostGoods_CostSmallDetail
|
||||
on x.CostSmallDetailId equals y.CostSmallDetailId
|
||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
||||
select x.CostMoney ?? 0).ToList().Sum();
|
||||
join y in Funs.DB.CostGoods_CostSmallDetail
|
||||
on x.CostSmallDetailId equals y.CostSmallDetailId
|
||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
||||
select x.CostMoney ?? 0).ToList().Sum();
|
||||
result = Funs.GetNewIntOrZero(costs.ToString().Split('.')[0]);
|
||||
return result;
|
||||
}
|
||||
@@ -1194,14 +1197,14 @@ namespace BLL
|
||||
public static int GetUseEquipmentNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
|
||||
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
|
||||
where y.ProjectId == projectid && x.IsUsed == true
|
||||
select x).Count() +
|
||||
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
|
||||
where y.ProjectId == projectid && x.IsUsed == true
|
||||
select x).Count() +
|
||||
(from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
|
||||
join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
|
||||
.GeneralEquipmentInId
|
||||
where y.ProjectId == projectid && x.IsUsed == true
|
||||
select x).Count();
|
||||
join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
|
||||
.GeneralEquipmentInId
|
||||
where y.ProjectId == projectid && x.IsUsed == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1212,9 +1215,9 @@ namespace BLL
|
||||
public static int GetSpecialEquipmentNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
|
||||
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
|
||||
where y.ProjectId == projectid && x.IsUsed == true
|
||||
select x).Count();
|
||||
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
|
||||
where y.ProjectId == projectid && x.IsUsed == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1225,8 +1228,8 @@ namespace BLL
|
||||
public static int GetLicensesNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.License_LicenseManager
|
||||
where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1237,9 +1240,9 @@ namespace BLL
|
||||
public static int GetLicensesCloseNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.License_LicenseManager
|
||||
where x.ProjectId == projectid && x.IsHighRisk == true && x.WorkStates == "3" &&
|
||||
x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.IsHighRisk == true && x.WorkStates == "3" &&
|
||||
x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1250,9 +1253,9 @@ namespace BLL
|
||||
public static int GetGeneralClosedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1263,9 +1266,9 @@ namespace BLL
|
||||
public static int GetGeneralNotClosedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1276,9 +1279,9 @@ namespace BLL
|
||||
public static int GetMajorClosedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1289,9 +1292,9 @@ namespace BLL
|
||||
public static int GetMajorNotClosedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1302,9 +1305,9 @@ namespace BLL
|
||||
public static int GetGeneralRiskNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 2 && x.IsStart == true
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 2 && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1315,9 +1318,9 @@ namespace BLL
|
||||
public static int GetLowRiskNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 1 && x.IsStart == true
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 1 && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1328,9 +1331,9 @@ namespace BLL
|
||||
public static int GetMediumRiskNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 3 && x.IsStart == true
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 3 && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1341,9 +1344,9 @@ namespace BLL
|
||||
public static int GetHighRiskNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 4 && x.IsStart == true
|
||||
select x).Count();
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 4 && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1354,9 +1357,9 @@ namespace BLL
|
||||
public static int GetCompletedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.States == "1" && x.IsSuperLargerHazard == false &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.States == "1" && x.IsSuperLargerHazard == false &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1367,8 +1370,8 @@ namespace BLL
|
||||
public static int GetTrainPersonNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
|
||||
select x.TrainPersonNum).ToList().Sum(x => x.Value);
|
||||
where x.ProjectId == projectid && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
|
||||
select x.TrainPersonNum).ToList().Sum(x => x.Value);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1379,9 +1382,9 @@ namespace BLL
|
||||
public static int GetConstructionNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.States == "2" && x.IsSuperLargerHazard == false &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.States == "2" && x.IsSuperLargerHazard == false &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1392,9 +1395,9 @@ namespace BLL
|
||||
public static int GetFinishedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.States == "3" && x.IsSuperLargerHazard == false &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.States == "3" && x.IsSuperLargerHazard == false &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1405,9 +1408,9 @@ namespace BLL
|
||||
public static int GetSuperCompletedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.States == "1" && x.IsSuperLargerHazard == true &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.States == "1" && x.IsSuperLargerHazard == true &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1419,8 +1422,8 @@ namespace BLL
|
||||
{
|
||||
var result =
|
||||
(from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
|
||||
select x.TrainPersonNum).ToList().Sum(x => x.Value);
|
||||
where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
|
||||
select x.TrainPersonNum).ToList().Sum(x => x.Value);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1431,9 +1434,9 @@ namespace BLL
|
||||
public static int GetSuperConstructionNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.States == "2" && x.IsSuperLargerHazard == true &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.States == "2" && x.IsSuperLargerHazard == true &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1444,9 +1447,9 @@ namespace BLL
|
||||
public static int GetSuperFinishedNum(string projectid)
|
||||
{
|
||||
var result = (from x in Funs.DB.Solution_LargerHazard
|
||||
where x.ProjectId == projectid && x.States == "3" && x.IsSuperLargerHazard == true &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && x.States == "3" && x.IsSuperLargerHazard == true &&
|
||||
x.RecordTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1483,85 +1486,85 @@ namespace BLL
|
||||
if (Count == 0) return null;
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return from x in q
|
||||
select new
|
||||
{
|
||||
x.Id,
|
||||
x.ProjectId,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.BeUnderConstructionNum,
|
||||
x.ShutdownNum,
|
||||
x.JoinConstructionPersonNum,
|
||||
x.MajorProjectsUnderConstructionNum,
|
||||
x.TotalWorkingHour,
|
||||
x.LostWorkingHour,
|
||||
x.SafeWorkingHour,
|
||||
x.SafeTrainNum,
|
||||
x.SpecialTrainNum,
|
||||
x.SpecialOperationTrainNum,
|
||||
x.TotalEnergyConsumption,
|
||||
x.IncomeComprehensiveEnergyConsumption,
|
||||
x.NewWaterConsumption,
|
||||
x.HeadOfficeInspectorGeneralNum,
|
||||
x.HeadOfficeFullTimeNum,
|
||||
x.BranchInspectorGeneralNum,
|
||||
x.BranchFullTimeNum,
|
||||
x.ProjectInspectorGeneralNum,
|
||||
x.ProjectFullTimeNum,
|
||||
x.ProjectSafetyMonitorNum,
|
||||
x.SafetyInjectionEngineer,
|
||||
x.CertificateANum,
|
||||
x.CertificateBNum,
|
||||
x.CertificateCNum,
|
||||
x.SafetyCommitteeMeetingNum,
|
||||
x.EnterpriseTopicsMeetingNum,
|
||||
x.ProjectSafetyLeadingGroupMeetingNum,
|
||||
x.ProjectSafetyMeetingNum,
|
||||
x.CompanyLeadShiftCheckNum,
|
||||
x.CompanyComprehensiveCheckNum,
|
||||
x.CompanySpecialCheckNum,
|
||||
x.ProjectLeadShiftCheckNum,
|
||||
x.ProjectSpecialCheckNum,
|
||||
x.ProjectMajorCheckNum,
|
||||
x.NearMissNum,
|
||||
x.RecordableEventNum,
|
||||
x.GeneralAccidentNum,
|
||||
x.MajorAccidentNum,
|
||||
x.SeriousAccidentNum,
|
||||
x.SpecialSeriousAccidentNum,
|
||||
x.CompanyComprehensivePlanNum,
|
||||
x.CompanySpecialPlanNum,
|
||||
x.CompanyOnSiteDisposalPlan,
|
||||
x.CompanyDrillNum,
|
||||
x.ProjectComprehensivePlanNum,
|
||||
x.ProjectSpecialPlanNum,
|
||||
x.ProjectOnSiteDisposalPlan,
|
||||
x.ProjectDrillNum,
|
||||
x.CostExtract,
|
||||
x.CostUse,
|
||||
x.UseEquipmentNum,
|
||||
x.SpecialEquipmentNum,
|
||||
x.LicensesNum,
|
||||
x.LicensesCloseNum,
|
||||
x.GeneralClosedNum,
|
||||
x.GeneralNotClosedNum,
|
||||
x.MajorClosedNum,
|
||||
x.MajorNotClosedNum,
|
||||
x.GeneralRiskNum,
|
||||
x.LowRiskNum,
|
||||
x.MediumRiskNum,
|
||||
x.HighRiskNum,
|
||||
x.CompletedNum,
|
||||
x.TrainPersonNum,
|
||||
x.ConstructionNum,
|
||||
x.FinishedNum,
|
||||
x.SuperCompletedNum,
|
||||
x.SuperTrainPersonNum,
|
||||
x.SuperConstructionNum,
|
||||
x.SuperFinishedNum
|
||||
};
|
||||
select new
|
||||
{
|
||||
x.Id,
|
||||
x.ProjectId,
|
||||
x.UnitId,
|
||||
x.CollCropCode,
|
||||
x.UnitName,
|
||||
x.ReportDate,
|
||||
x.BeUnderConstructionNum,
|
||||
x.ShutdownNum,
|
||||
x.JoinConstructionPersonNum,
|
||||
x.MajorProjectsUnderConstructionNum,
|
||||
x.TotalWorkingHour,
|
||||
x.LostWorkingHour,
|
||||
x.SafeWorkingHour,
|
||||
x.SafeTrainNum,
|
||||
x.SpecialTrainNum,
|
||||
x.SpecialOperationTrainNum,
|
||||
x.TotalEnergyConsumption,
|
||||
x.IncomeComprehensiveEnergyConsumption,
|
||||
x.NewWaterConsumption,
|
||||
x.HeadOfficeInspectorGeneralNum,
|
||||
x.HeadOfficeFullTimeNum,
|
||||
x.BranchInspectorGeneralNum,
|
||||
x.BranchFullTimeNum,
|
||||
x.ProjectInspectorGeneralNum,
|
||||
x.ProjectFullTimeNum,
|
||||
x.ProjectSafetyMonitorNum,
|
||||
x.SafetyInjectionEngineer,
|
||||
x.CertificateANum,
|
||||
x.CertificateBNum,
|
||||
x.CertificateCNum,
|
||||
x.SafetyCommitteeMeetingNum,
|
||||
x.EnterpriseTopicsMeetingNum,
|
||||
x.ProjectSafetyLeadingGroupMeetingNum,
|
||||
x.ProjectSafetyMeetingNum,
|
||||
x.CompanyLeadShiftCheckNum,
|
||||
x.CompanyComprehensiveCheckNum,
|
||||
x.CompanySpecialCheckNum,
|
||||
x.ProjectLeadShiftCheckNum,
|
||||
x.ProjectSpecialCheckNum,
|
||||
x.ProjectMajorCheckNum,
|
||||
x.NearMissNum,
|
||||
x.RecordableEventNum,
|
||||
x.GeneralAccidentNum,
|
||||
x.MajorAccidentNum,
|
||||
x.SeriousAccidentNum,
|
||||
x.SpecialSeriousAccidentNum,
|
||||
x.CompanyComprehensivePlanNum,
|
||||
x.CompanySpecialPlanNum,
|
||||
x.CompanyOnSiteDisposalPlan,
|
||||
x.CompanyDrillNum,
|
||||
x.ProjectComprehensivePlanNum,
|
||||
x.ProjectSpecialPlanNum,
|
||||
x.ProjectOnSiteDisposalPlan,
|
||||
x.ProjectDrillNum,
|
||||
x.CostExtract,
|
||||
x.CostUse,
|
||||
x.UseEquipmentNum,
|
||||
x.SpecialEquipmentNum,
|
||||
x.LicensesNum,
|
||||
x.LicensesCloseNum,
|
||||
x.GeneralClosedNum,
|
||||
x.GeneralNotClosedNum,
|
||||
x.MajorClosedNum,
|
||||
x.MajorNotClosedNum,
|
||||
x.GeneralRiskNum,
|
||||
x.LowRiskNum,
|
||||
x.MediumRiskNum,
|
||||
x.HighRiskNum,
|
||||
x.CompletedNum,
|
||||
x.TrainPersonNum,
|
||||
x.ConstructionNum,
|
||||
x.FinishedNum,
|
||||
x.SuperCompletedNum,
|
||||
x.SuperTrainPersonNum,
|
||||
x.SuperConstructionNum,
|
||||
x.SuperFinishedNum
|
||||
};
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
Reference in New Issue
Block a user