diff --git a/SGGL/BLL/API/CQMS/QualityAssuranceService.cs b/SGGL/BLL/API/CQMS/QualityAssuranceService.cs index 504b291e..d14a3cdb 100644 --- a/SGGL/BLL/API/CQMS/QualityAssuranceService.cs +++ b/SGGL/BLL/API/CQMS/QualityAssuranceService.cs @@ -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 getInspectionManagementStatisticsList(string projectId, string searchText = "") { + public static List getInspectionManagementStatisticsList(string projectId, string searchText = "") + { var StatisticsList = new List(); 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 managementListSunNumber = new List(); List managementListOneNumber = new List(); - + //统计所给事件段的全部数量 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 managementListSunNumber = new List(); List managementListOneNumber = new List(); 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 managementListSunNumber = new List(); List managementListOneNumber = new List(); - - //统计所给事件段的全部数量 - 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 managementListSunNumber = new List(); List managementListOneNumber = new List(); - + //统计所给事件段的全部数量 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 managementListSunNumber = new List(); List managementListOneNumber = new List(); - - //统计所给事件段的全部数量 - 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 managementListSunNumber = new List(); List managementListOneNumber = new List(); - - //统计所给事件段的全部数量 - 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 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 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 } } diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 539a3001..4a631532 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -26,3 +26,107 @@ IP地址:::1 出错时间:09/23/2024 10:27:46 + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827 + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 +出错时间:09/24/2024 13:18:32 +出错时间:09/24/2024 13:18:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851 + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 +出错时间:09/24/2024 13:18:32 +出错时间:09/24/2024 13:18:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843 + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 +出错时间:09/24/2024 13:18:32 +出错时间:09/24/2024 13:18:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643 + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 +出错时间:09/24/2024 13:18:32 +出错时间:09/24/2024 13:18:32 + diff --git a/SGGL/WebAPI/Controllers/CQMS/QualityAssuranceController.cs b/SGGL/WebAPI/Controllers/CQMS/QualityAssuranceController.cs index 721ea0ce..1b80ae5a 100644 --- a/SGGL/WebAPI/Controllers/CQMS/QualityAssuranceController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/QualityAssuranceController.cs @@ -524,5 +524,111 @@ namespace WebAPI.Controllers.CQMS return responeData; } #endregion + + #region 施工组织设计及施工方案管理 + /// + /// 施工组织设计及施工方案管理列表 + /// + /// + /// + /// + /// + [HttpGet] + public Model.ResponeData getGeneralPlanList(string projectId, string serachText = "", int pageIndex = 0) + { + var responeData = new Model.ResponeData(); + try + { + var getDataList = QualityAssuranceService.getGeneralPlanList(projectId, serachText); + int pageCount = getDataList.Count(); + if (pageCount > 0 && pageIndex > 0) + { + getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList(); + } + responeData.data = new { pageCount, getDataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 施工组织设计及施工方案管理详情 + /// + /// + /// + [HttpGet] + public Model.ResponeData getGeneralPlan(string Id) + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = QualityAssuranceService.getGeneralPlan(Id); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + + return responeData; + } + #endregion + + #region 超危大工程施工方案管理 + /// + /// 超危大工程施工方案管理列表 + /// + /// + /// + /// + /// + [HttpGet] + public Model.ResponeData getMajorPlanList(string projectId, string serachText = "", int pageIndex = 0) + { + var responeData = new Model.ResponeData(); + try + { + var getDataList = QualityAssuranceService.getMajorPlanList(projectId, serachText); + int pageCount = getDataList.Count(); + if (pageCount > 0 && pageIndex > 0) + { + getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList(); + } + responeData.data = new { pageCount, getDataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 超危大工程施工方案管理详情 + /// + /// + /// + [HttpGet] + public Model.ResponeData getMajorPlan(string Id) + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = QualityAssuranceService.getMajorPlan(Id); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + + return responeData; + } + #endregion } } \ No newline at end of file diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 4ffae0b8..f2575fcf 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>E:\Package\中国五环工程有限公司\SGGLAPI - True|2024-09-20T09:30:59.6144803Z;True|2024-09-20T15:28:40.2547949+08:00;True|2024-09-19T16:30:51.3047517+08:00;True|2024-09-19T15:53:23.2431713+08:00;True|2024-09-19T15:48:55.0571748+08:00;True|2024-09-19T15:06:29.5748482+08:00;True|2024-09-19T14:55:42.1477578+08:00;True|2024-09-19T10:07:53.8666329+08:00;True|2024-09-03T16:26:17.4985546+08:00;True|2024-07-17T10:29:15.9472548+08:00; + True|2024-09-24T01:51:10.8028974Z;True|2024-09-20T17:30:59.6144803+08:00;True|2024-09-20T15:28:40.2547949+08:00;True|2024-09-19T16:30:51.3047517+08:00;True|2024-09-19T15:53:23.2431713+08:00;True|2024-09-19T15:48:55.0571748+08:00;True|2024-09-19T15:06:29.5748482+08:00;True|2024-09-19T14:55:42.1477578+08:00;True|2024-09-19T10:07:53.8666329+08:00;True|2024-09-03T16:26:17.4985546+08:00;True|2024-07-17T10:29:15.9472548+08:00; @@ -86,22 +86,22 @@ 03/11/2024 11:33:45 - 09/20/2024 17:30:56 + 09/24/2024 09:51:10 - 09/20/2024 17:30:56 + 09/24/2024 09:51:10 03/11/2024 11:23:37 - 09/20/2024 15:28:21 + 09/24/2024 09:50:50 05/22/2024 09:42:30 - 09/20/2024 15:28:21 + 09/24/2024 09:50:50 12/18/2020 05:32:28 @@ -383,13 +383,13 @@ 02/09/2013 00:42:28 - 09/20/2024 17:30:40 + 09/24/2024 09:50:50 - 09/20/2024 17:30:40 + 09/24/2024 09:50:50 - 09/20/2024 17:30:40 + 09/24/2024 09:50:50 01/23/2014 21:57:34 @@ -473,7 +473,7 @@ 03/11/2024 11:23:37 - 09/20/2024 17:30:47 + 09/24/2024 09:50:53 03/11/2024 11:23:37