diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index 85306403..5ac03dab 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -1,5 +1,6 @@  using Model; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -125,9 +126,7 @@ namespace BLL { var twPipeMatMatchOutputs = new List(); var pipelineModel = PipelineService.GetPipelineByPipelineId(pipelineId); - string warehouseCode = PipelineService - .GetPipeArea().FirstOrDefault(x => x.Value == pipelineModel.PipeArea.ToString()) - ?.Text; + string warehouseCode = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(PipelineService.GetPipelineByPipelineId(pipelineModel.PipelineId).WarehouseId).WarehouseName; // 获取所需材料列表 var requiredMaterials = (from x in db.HJGL_PipeLineMat join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode @@ -152,7 +151,9 @@ namespace BLL ).ToList(); twPipeMatMatchOutputs = GetMatMatchOutput(requiredMaterials, warehouseCode, pipelineModel.ProjectId); - var result = twPipeMatMatchOutputs.Count == 0 ? 0 : twPipeMatMatchOutputs.Sum(x => x.MatchRate) / twPipeMatMatchOutputs.Count; + var result = twPipeMatMatchOutputs.Any() + ? twPipeMatMatchOutputs.Average(x => x.MatchRate) + : 0; return result; } } diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs index 39b09813..94db0e6a 100644 --- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs +++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs @@ -750,7 +750,7 @@ namespace BLL ProjectId = weldTask.ProjectId, // CusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + UnitService.GetUnitCodeByUnitId(weldTask.UnitId) + "-" + UnitWorkService.getUnitWorkByUnitWorkId(weldTask.UnitWorkId)?.UnitWorkCode + "AP-PF01", CusBillCode = TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode, TwConst.TypeInt.领料出库, TwConst.Category.管件), - WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(), + WarehouseCode = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).WarehouseId).WarehouseName, Source = 1, InOutType = (int)TwConst.InOutType.出库, TypeInt = (int)TwConst.TypeInt.领料出库, @@ -789,7 +789,7 @@ namespace BLL Id = Guid.NewGuid().ToString(), ProjectId = weldTask.ProjectId, CusBillCode = TwInOutplanmasterService.GetCusBillCodeByTaskCode(weldTaskCode, TwConst.TypeInt.领料出库, TwConst.Category.管段), - WarehouseCode = PipelineService.GetPipeArea().Where(x => x.Value == PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).PipeArea).Select(x => x.Text).FirstOrDefault(), + WarehouseCode = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(PipelineService.GetPipelineByPipelineId(weldTask.PipelineId).WarehouseId).WarehouseName, Source = 1, InOutType = (int)TwConst.InOutType.出库, TypeInt = (int)TwConst.TypeInt.领料出库, diff --git a/SGGL/BLL/Common/NPOIHelper.cs b/SGGL/BLL/Common/NPOIHelper.cs index bfe84611..a6814daf 100644 --- a/SGGL/BLL/Common/NPOIHelper.cs +++ b/SGGL/BLL/Common/NPOIHelper.cs @@ -502,5 +502,93 @@ namespace BLL return value.ToString(); } #endregion + + public static DataTable ExcelToDataTable1(string filePath) + { + var dt = new DataTable(); + using (var file = new FileStream(filePath, FileMode.Open, FileAccess.Read)) + { + var hssfworkbook = new HSSFWorkbook(file); + var sheet = hssfworkbook.GetSheetAt(0); + var rows = sheet.GetRowEnumerator(); + rows.MoveNext(); + var row = (HSSFRow)rows.Current; + for (var j = 0; j < row.LastCellNum; j++) + { + var cell = row.GetCell(j); + if (cell != null) + { + dt.Columns.Add(cell.StringCellValue); + } + else + { + dt.Columns.Add("collum" + j); + } + + } + while (rows.MoveNext()) + { + row = (HSSFRow)rows.Current; + var dr = dt.NewRow(); + for (var i = 0; i < row.LastCellNum; i++) + { + var cell = row.GetCell(i); + if (cell == null) + { + dr[i] = null; + } + else + { + try + { + switch (cell.CellType) + { + case CellType.Blank: + //dr[i] = "[null]"; + break; + case CellType.Boolean: + dr[i] = cell.BooleanCellValue; + break; + case CellType.Numeric: + dr[i] = cell.ToString(); + break; + case CellType.String: + dr[i] = cell.StringCellValue; + break; + case CellType.Error: + dr[i] = cell.ErrorCellValue; + break; + case CellType.Formula: + try + { + dr[i] = cell.NumericCellValue; + } + catch + { + try + { + dr[i] = cell.StringCellValue; + } + catch + { + dr[i] = null; + } + } + break; + default: + dr[i] = "=" + cell.CellFormula; + break; + } + } + catch (Exception ex) + { + } + } + } + dt.Rows.Add(dr); + } + } + return dt; + } } } diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs index 6c23875f..c89a0a70 100644 --- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs +++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs @@ -45,7 +45,10 @@ namespace BLL public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime , string states, string personId, string unitId, Grid Grid1) { - IQueryable getDataList = getDataLists; + var db= Funs.DB; + IQueryable getDataList = from x in db.View_Hazard_HazardRegisterList + where x.ProblemTypes == "1" + select x; if (!string.IsNullOrEmpty(projectId)) { getDataList = getDataList.Where(e => e.ProjectId == projectId); @@ -101,7 +104,7 @@ namespace BLL return null; } getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); - return from x in getDataList + return (from x in getDataList select new { x.HazardRegisterId, @@ -122,7 +125,7 @@ namespace BLL x.CheckManName, x.RegisterDate, x.StatesStr, - }; + }).ToList(); } #endregion diff --git a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs index fd3cb4c9..7c8e0d29 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs @@ -19,12 +19,8 @@ namespace BLL { get; set; - } - - /// - /// 定义变量 - /// - private static IQueryable getDataLists = from x in Funs.DB.SitePerson_PersonInOut select x; + } + /// /// 获取分页列表 @@ -38,7 +34,8 @@ namespace BLL /// public static IEnumerable getListData(string projectId, string unitId, string name, string idCard, string inOutWay, DateTime? startDate, DateTime? endDate, Grid Grid1) { - IQueryable getDataList = getDataLists.Where(x => x.ProjectId == projectId && (inOutWay == "0" || x.InOutWay == inOutWay)); + IQueryable getDataList = from x in Funs.DB.SitePerson_PersonInOut select x; + getDataList = getDataList.Where(x => x.ProjectId == projectId && (inOutWay == "0" || x.InOutWay == inOutWay)); if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null) { getDataList = getDataList.Where(e => e.UnitId == unitId); diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs index 3a34a626..776a7f52 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs @@ -17,11 +17,6 @@ namespace BLL set; } - /// - /// 定义变量 - /// - private static IQueryable getDataLists = from x in Funs.DB.SitePerson_PersonItem select x; - /// /// 获取分页列表 /// @@ -36,6 +31,8 @@ namespace BLL /// public static IEnumerable getListData(string projectId, string unitId, string personId, string name, string idCard, DateTime? startDate, DateTime? endDate, Grid Grid1) { + Model.SGGLDB db = Funs.DB; + var getDataLists = from x in db.SitePerson_PersonItem select x; IQueryable getDataList = getDataLists.Where(e => e.PersonId == personId); if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) { diff --git a/SGGL/BLL/Person/Person_DutyService.cs b/SGGL/BLL/Person/Person_DutyService.cs index 63850fb3..5d8c918b 100644 --- a/SGGL/BLL/Person/Person_DutyService.cs +++ b/SGGL/BLL/Person/Person_DutyService.cs @@ -30,6 +30,9 @@ namespace BLL /// public static IEnumerable getListData(string personId, Grid Grid1) { + Model.SGGLDB db = Funs.DB; + var getDataLists = from x in db.Person_Duty + select x; IQueryable getDataList = getDataLists.Where(x => x.DutyPersonId == personId); count = getDataList.Count(); if (count == 0) @@ -46,7 +49,7 @@ namespace BLL x.CompilePersonId, x.CompileTime, x.WorkPostId, - WorkPostName = Funs.DB.Base_WorkPost.First(U => U.WorkPostId == x.WorkPostId).WorkPostName, + WorkPostName = db.Base_WorkPost.First(U => U.WorkPostId == x.WorkPostId).WorkPostName, x.ApprovePersonId, x.ApproveTime, x.State, diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs index a2455755..3b0232d4 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs @@ -280,17 +280,28 @@ namespace FineUIPro.Web.CLGL } string planId = Grid1.SelectedRowID; var planMaster = BLL.TwInOutplanmasterService.GetById(planId); - if (planMaster.State != (int)TwConst.State.已完成) + switch (planMaster.State) { - Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning); - return; - } - else - { - TwInputmasterService.RevokeGenInMasterByPlanId(planId); - BindGrid(); - ShowNotify("撤销入库单成功！", MessageBoxIcon.Success); - } + case (int)TwConst.State.已审核: + planMaster.State= (int)TwConst.State.待审核; + planMaster.AuditMan = null; + planMaster.AuditDate = null; + TwInOutplanmasterService.Update(planMaster); + BindGrid(); + ShowNotify("撤销审核成功！", MessageBoxIcon.Success); + + break; + case (int)TwConst.State.已完成: + TwInputmasterService.RevokeGenInMasterByPlanId(planId); + BindGrid(); + ShowNotify("撤销入库单成功！", MessageBoxIcon.Success); + break; + + + default: + Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning); + break; + } } protected void btnSearch_Click(object sender, EventArgs e) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 34c38139..c3615012 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17017,7 +17017,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> 15b3c87ac1c4cf4a496def63cba87a1de5c899b2 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index 01992a81..15d9cfe6 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -1316,8 +1316,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } - - protected void btnPrintJoint_Click(object sender, EventArgs e) { var rows = Grid1.SelectedRowIndexArray; diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx index 953968eb..84c16e77 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx @@ -69,6 +69,7 @@ + <%-- --%> private void BindGrid() { - string strSql = "SELECT LicenseManager.LicenseManagerId,LicenseManager.ProjectId,LicenseManager.LicenseTypeId,CodeRecords.Code AS LicenseManagerCode,LicenseManager.LicenseManageName,LicenseManager.UnitId,LicenseManager.LicenseManageContents,LicenseManager.CompileMan,LicenseManager.CompileDate,LicenseManager.States,LicenseManager.ProjectCode,LicenseManager.ProjectName,LicenseManager.LicenseTypeName,LicenseManager.UnitName,LicenseManager.PersonName,LicenseManager.WorkAreaName,LicenseManager.StartDate,LicenseManager.EndDate" + string strSql = "SELECT LicenseManager.LicenseManagerId,LicenseManager.ProjectId,LicenseManager.LicenseTypeId,CodeRecords.Code AS LicenseManagerCode,LicenseManager.LicenseManageName,LicenseManager.UnitId,LicenseManager.LicenseManageContents,LicenseManager.CompileMan,LicenseManager.CompileDate,LicenseManager.States,LicenseManager.ProjectCode,LicenseManager.ProjectName,LicenseManager.LicenseTypeName,LicenseManager.UnitName,LicenseManager.UserName,LicenseManager.WorkAreaName,LicenseManager.StartDate,LicenseManager.EndDate" + @" ,(CASE WHEN LicenseManager.States = " + BLL.Const.State_0 + " OR LicenseManager.States IS NULL THEN '待['+OperatePerson.PersonName+']提交' WHEN LicenseManager.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperatePerson.PersonName+']办理' END) AS FlowOperateName,LicenseManager.SourceDes" + @" FROM View_License_LicenseManager AS LicenseManager " + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON LicenseManager.LicenseManagerId=CodeRecords.DataId " diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs index 194791a4..935d475a 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs @@ -120,35 +120,38 @@ namespace FineUIPro.Web.HSSE.SitePerson { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0]); + //AddDatasetToSQL(ds.Tables[0]); + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + this.AddDatasetToSQL(dt); } catch (Exception ex) { @@ -304,33 +307,35 @@ namespace FineUIPro.Web.HSSE.SitePerson { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0]); + //} + //string sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + this.AddDatasetToSQL2(dt); } catch (Exception ex) { diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs index f5ee4fe7..e96b1dee 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs @@ -51,11 +51,11 @@ namespace FineUIPro.Web.common this.tvControlItem.Nodes.Add(rootNode2); // 优化：一次性获取所有管线统计数据，避免 N+1 查询 - var pipelineCountByUnitWork = (from x in Funs.DB.HJGL_Pipeline + var pipelineCountByUnitWork = (from x in Funs.DB.View_HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId group x by x.UnitWorkId into g - select new { UnitWorkId = g.Key, Count = g.Count() }) - .ToDictionary(x => x.UnitWorkId, x => x.Count); + select new { UnitWorkId = g.Key, Count = g.Count(), TotalDin = g.Sum(x => x.TotalDin) }) + .ToDictionary(x => x.UnitWorkId, x => new { x.Count, x.TotalDin }); var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); // 获取当前用户所在单位 @@ -74,14 +74,14 @@ namespace FineUIPro.Web.common if (unitWork1.Count() > 0) { - foreach (var q in unitWork1) + foreach (var q in unitWork1) { // 优化：从内存字典中获取管线数量，避免数据库查询 - int a = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId] : 0; + int a = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId].Count : 0; var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; - tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线" ; tn1.ToolTip = "施工单位：" + unitNamesUnitIds; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); @@ -92,11 +92,11 @@ namespace FineUIPro.Web.common foreach (var q in unitWork2) { // 优化：从内存字典中获取管线数量，避免数据库查询 - int a = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId] : 0; + int a = pipelineCountByUnitWork.ContainsKey(q.UnitWorkId) ? pipelineCountByUnitWork[q.UnitWorkId].Count : 0; var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; - tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线" ; tn2.ToolTip = "施工单位：" + unitNamesUnitIds; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); @@ -257,6 +257,7 @@ JointData AS ( j.Size, j.WeldingDailyId, j.JointAttribute, + j.PipelineId, p.PipeArea, p.UnitWorkId FROM dbo.HJGL_WeldJoint j @@ -323,6 +324,7 @@ JointData AS ( j.Size, j.WeldingDailyId, j.JointAttribute, + j.PipelineId, p.PipeArea, p.UnitWorkId FROM dbo.HJGL_WeldJoint j