From 161b7c04d1c509a81f91fd932f2030705a40cde0 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 8 Apr 2026 10:17:31 +0800 Subject: [PATCH 1/3] 1 --- .../HSSE/EduTrain/TrainRecordIn.aspx.cs | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs index b32bcf94..c26322a2 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs @@ -127,33 +127,33 @@ try { viewTrainRecordDetails.Clear(); - 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) - { - 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(); - - AddDatasetToSQL(ds.Tables[0]); + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ + // 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(); + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + AddDatasetToSQL(dt); } catch (Exception ex) { From 9c2e72506b26c2ca3fa6a57f812f3227c7eea04a Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 8 Apr 2026 17:21:11 +0800 Subject: [PATCH 2/3] 1 --- SGGL/BLL/Common/Const.cs | 5 +++++ SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs | 2 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 7cd3157b..5c0db85a 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -375,6 +375,11 @@ namespace BLL /// public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228"; + /// + /// 焊工岗位Id + /// + public static string WorkPost_Welder2 = "2121c01d-b0ef-487c-ac26-1b18109daf05"; + /// /// 无损检测工岗位Id /// diff --git a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs index f7260c40..cd7bad9f 100644 --- a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs @@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.PersonManage rootNode.Text = item.UnitName; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); - var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.UnitId == item.UnitId select x).ToList(); + var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && (x.WorkPostId == Const.WorkPost_Welder || x.WorkPostId == Const.WorkPost_Welder2) && x.UnitId == item.UnitId select x).ToList(); if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim())) { getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList(); diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d98a37e8..5971df32 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17019,7 +17019,7 @@ - + From 206cb99daa4fa3effe0b77abebf141f4db4619cc Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 9 Apr 2026 17:06:04 +0800 Subject: [PATCH 3/3] 1 --- SGGL/BLL/API/APIPersonService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index 946fe329..68923901 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -441,7 +441,7 @@ namespace BLL && (strWorkPostId == null || x.WorkPostId == strWorkPostId) && x.States == states select x; - if (unitId != Const.UnitId_SEDIN && !string.IsNullOrEmpty(unitId)) + if (unitId != Const.UnitId_SEDIN && unitId != Const.UnitId_SEDINNB && !string.IsNullOrEmpty(unitId)) { getViews = getViews.Where(x => x.UnitId == unitId); }