修改小程序施工方案
This commit is contained in:
@@ -692,16 +692,17 @@ namespace BLL
|
||||
var list = (from x in Funs.DB.Comprehensive_SpecialEquipment
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
join z in Funs.DB.Base_SpecialEquipment on x.EquipmentId equals z.SpecialEquipmentId
|
||||
where x.ProjectId==projectId
|
||||
select new Comprehensive_SpecialEquipmentDto {
|
||||
SpecialEquipmentId=x.SpecialEquipmentId,
|
||||
UnitName=y.UnitName,
|
||||
SpecialEquipmentName=z.SpecialEquipmentName,
|
||||
PositionNum=x.PositionNum,
|
||||
SunNumber=x.SunNumber,
|
||||
InformNumber=x.InformNumber,
|
||||
SubmitDataNumber=x.SubmitDataNumber,
|
||||
MonitoringReportNumber=x.MonitoringReportNumber,
|
||||
where x.ProjectId == projectId
|
||||
select new Comprehensive_SpecialEquipmentDto
|
||||
{
|
||||
SpecialEquipmentId = x.SpecialEquipmentId,
|
||||
UnitName = y.UnitName,
|
||||
SpecialEquipmentName = z.SpecialEquipmentName,
|
||||
PositionNum = x.PositionNum,
|
||||
SunNumber = x.SunNumber,
|
||||
InformNumber = x.InformNumber,
|
||||
SubmitDataNumber = x.SubmitDataNumber,
|
||||
MonitoringReportNumber = x.MonitoringReportNumber,
|
||||
RemarkCode = x.RemarkCode,
|
||||
ReportTimes = string.Format("{0:yyyy-MM-dd}", x.ReportTime),
|
||||
}
|
||||
@@ -742,19 +743,20 @@ namespace BLL
|
||||
public static DateTime NextDate;
|
||||
public static DateTime NewDate;
|
||||
public static DateTime EndDate;
|
||||
public static List<Model.InspectionManagementStatistics> getInspectionManagementStatisticsList(string projectId, string searchText = "") {
|
||||
public static List<Model.InspectionManagementStatistics> getInspectionManagementStatisticsList(string projectId, string searchText = "")
|
||||
{
|
||||
var StatisticsList = new List<Model.InspectionManagementStatistics>();
|
||||
Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(projectId);
|
||||
var StartDate = Convert.ToDateTime(project.StartDate);
|
||||
|
||||
|
||||
|
||||
|
||||
for (int i = 0; i < i + 1; i++)
|
||||
{
|
||||
Model.InspectionManagementStatistics Statistics = new Model.InspectionManagementStatistics();
|
||||
if (i == 0)
|
||||
{
|
||||
NextDate = Convert.ToDateTime(DateTime.Parse(StartDate.ToString("yyyy-MM-dd")).AddMonths(1).ToShortDateString());
|
||||
NewDate = Convert.ToDateTime(NextDate.Year + "-" + NextDate.Month + "-25");
|
||||
NextDate = Convert.ToDateTime(DateTime.Parse(StartDate.ToString("yyyy-MM-dd")).AddMonths(1).ToShortDateString());
|
||||
NewDate = Convert.ToDateTime(NextDate.Year + "-" + NextDate.Month + "-25");
|
||||
Statistics.CheckDate = string.Format("{0:yyyy-MM-dd}", StartDate) + " 至 ";
|
||||
if (StartDate.Day < 25)
|
||||
{
|
||||
@@ -762,12 +764,12 @@ namespace BLL
|
||||
{
|
||||
List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
|
||||
|
||||
|
||||
Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now);
|
||||
Statistics.SunNumber = managementListSunNumber.Count();
|
||||
Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
|
||||
@@ -787,11 +789,11 @@ namespace BLL
|
||||
List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
NextDate = Convert.ToDateTime(StartDate.Year + "-" + StartDate.Month + "-25");
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
|
||||
|
||||
Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NextDate);
|
||||
Statistics.SunNumber = managementListSunNumber.Count();
|
||||
@@ -812,11 +814,11 @@ namespace BLL
|
||||
{
|
||||
List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
|
||||
|
||||
|
||||
|
||||
@@ -839,12 +841,12 @@ namespace BLL
|
||||
{
|
||||
List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
|
||||
|
||||
|
||||
Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NewDate);
|
||||
Statistics.SunNumber = managementListSunNumber.Count();
|
||||
Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
|
||||
@@ -879,12 +881,12 @@ namespace BLL
|
||||
{
|
||||
List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
|
||||
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
|
||||
|
||||
Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now);
|
||||
Statistics.SunNumber = managementListSunNumber.Count();
|
||||
Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
|
||||
@@ -904,12 +906,12 @@ namespace BLL
|
||||
{
|
||||
List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
|
||||
|
||||
|
||||
//统计所给事件段的全部数量
|
||||
managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
|
||||
//统计所给事件段的合格数量
|
||||
managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
|
||||
|
||||
Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NewDate);
|
||||
Statistics.SunNumber = managementListSunNumber.Count();
|
||||
Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
|
||||
@@ -924,10 +926,143 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
StatisticsList.Add(Statistics);
|
||||
|
||||
|
||||
}
|
||||
return StatisticsList;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 施工组织设计及施工方案管理
|
||||
public class Comprehensive_GeneralPlanApprovalDto : Model.Comprehensive_GeneralPlanApproval
|
||||
{
|
||||
public string UnitName { get; set; }
|
||||
|
||||
public string ProfessionalName { get; set; }
|
||||
|
||||
public string UnitWorkNames { get; set; }
|
||||
|
||||
public string ApprovalDates { get; set; }
|
||||
|
||||
//public string AttachUrl { get; set; }
|
||||
}
|
||||
|
||||
public static List<Comprehensive_GeneralPlanApprovalDto> getGeneralPlanList(string projectId, string searchText = "")
|
||||
{
|
||||
var list = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
|
||||
where x.ProjectId == projectId
|
||||
orderby x.ApprovalDate descending
|
||||
select new Comprehensive_GeneralPlanApprovalDto
|
||||
{
|
||||
GeneralPlanApprovalId = x.GeneralPlanApprovalId,
|
||||
UnitName = y.UnitName,
|
||||
ProfessionalName = z.ProfessionalName,
|
||||
UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
|
||||
PlanCode = x.PlanCode,
|
||||
PlanName = x.PlanName,
|
||||
ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
|
||||
AuditMan = x.AuditMan,
|
||||
ApprovalMan = x.ApprovalMan,
|
||||
ImplementationDeviation = x.ImplementationDeviation,
|
||||
RemarkCode = x.RemarkCode
|
||||
}).ToList();
|
||||
return list;
|
||||
}
|
||||
|
||||
public static Comprehensive_GeneralPlanApprovalDto getGeneralPlan(string Id)
|
||||
{
|
||||
var list = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
|
||||
where x.GeneralPlanApprovalId == Id
|
||||
select new Comprehensive_GeneralPlanApprovalDto
|
||||
{
|
||||
GeneralPlanApprovalId = x.GeneralPlanApprovalId,
|
||||
UnitName = y.UnitName,
|
||||
ProfessionalName = z.ProfessionalName,
|
||||
UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
|
||||
PlanCode = x.PlanCode,
|
||||
PlanName = x.PlanName,
|
||||
ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
|
||||
AuditMan = x.AuditMan,
|
||||
ApprovalMan = x.ApprovalMan,
|
||||
ImplementationDeviation = x.ImplementationDeviation,
|
||||
RemarkCode = x.RemarkCode,
|
||||
AttachUrl = APIUpLoadFileService.getFileUrl(x.GeneralPlanApprovalId, null),
|
||||
}).First();
|
||||
return list;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 超危大工程施工方案管理
|
||||
public class Comprehensive_MajorPlanApprovalDto : Model.Comprehensive_MajorPlanApproval
|
||||
{
|
||||
public string UnitName { get; set; }
|
||||
|
||||
public string ProfessionalName { get; set; }
|
||||
|
||||
public string UnitWorkNames { get; set; }
|
||||
|
||||
public string ApprovalDates { get; set; }
|
||||
|
||||
public string IsReviews { get; set; }
|
||||
}
|
||||
|
||||
public static List<Comprehensive_MajorPlanApprovalDto> getMajorPlanList(string projectId, string searchText = "")
|
||||
{
|
||||
var list = (from x in Funs.DB.Comprehensive_MajorPlanApproval
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
|
||||
where x.ProjectId == projectId
|
||||
orderby x.ApprovalDate descending
|
||||
select new Comprehensive_MajorPlanApprovalDto {
|
||||
MajorPlanApprovalId=x.MajorPlanApprovalId,
|
||||
UnitName = y.UnitName,
|
||||
ProfessionalName = z.ProfessionalName,
|
||||
UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
|
||||
PlanCode = x.PlanCode,
|
||||
PlanName = x.PlanName,
|
||||
ReviewMan=x.ReviewMan,
|
||||
ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
|
||||
AuditMan=x.AuditMan,
|
||||
ApprovalMan=x.ApprovalMan,
|
||||
ExpertReviewMan = x.ExpertReviewMan,
|
||||
IsReviews = x.IsReview==true?"是":"否",
|
||||
ImplementationDeviation=x.ImplementationDeviation,
|
||||
RemarkCode = x.RemarkCode,
|
||||
})
|
||||
.ToList();
|
||||
return list;
|
||||
}
|
||||
|
||||
public static Comprehensive_MajorPlanApprovalDto getMajorPlan(string Id)
|
||||
{
|
||||
var list = (from x in Funs.DB.Comprehensive_MajorPlanApproval
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
|
||||
where x.MajorPlanApprovalId == Id
|
||||
select new Comprehensive_MajorPlanApprovalDto
|
||||
{
|
||||
MajorPlanApprovalId = x.MajorPlanApprovalId,
|
||||
UnitName = y.UnitName,
|
||||
ProfessionalName = z.ProfessionalName,
|
||||
UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
|
||||
PlanCode = x.PlanCode,
|
||||
PlanName = x.PlanName,
|
||||
ReviewMan = x.ReviewMan,
|
||||
ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
|
||||
AuditMan = x.AuditMan,
|
||||
ApprovalMan = x.ApprovalMan,
|
||||
IsReviews = x.IsReview == true ? "是" : "否",
|
||||
ImplementationDeviation = x.ImplementationDeviation,
|
||||
RemarkCode = x.RemarkCode,
|
||||
ExpertReviewMan=x.ExpertReviewMan,
|
||||
AttachUrl = APIUpLoadFileService.getFileUrl(x.MajorPlanApprovalId, null),
|
||||
})
|
||||
.First();
|
||||
return list;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user