lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2026-04-10 14:06:38 +08:00
parent f4502924bb 206cb99daa
commit 113e1d17ec
5 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/API/APIPersonService.cs
View File

@ -441,7 +441,7 @@ namespace BLL
&& (strWorkPostId == null || x.WorkPostId == strWorkPostId) && (strWorkPostId == null || x.WorkPostId == strWorkPostId)
&& x.States == states && x.States == states
select x; 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); getViews = getViews.Where(x => x.UnitId == unitId);
} }

5
SGGL/BLL/Common/Const.cs
View File

@ -375,6 +375,11 @@ namespace BLL
/// </summary> /// </summary>
public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228"; public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder2 = "2121c01d-b0ef-487c-ac26-1b18109daf05";
/// <summary> /// <summary>
/// 无损检测工岗位Id /// 无损检测工岗位Id
/// </summary> /// </summary>

2
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
View File

@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
rootNode.Text = item.UnitName; rootNode.Text = item.UnitName;
rootNode.EnableClickEvent = true; rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode); 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())) if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
{ {
getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList(); getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -17019,7 +17019,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

50
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs
View File

@ -127,33 +127,33 @@
try try
{ {
viewTrainRecordDetails.Clear(); viewTrainRecordDetails.Clear();
string oleDBConnString = String.Empty; //string oleDBConnString = String.Empty;
oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
oleDBConnString += "Data Source="; //oleDBConnString += "Data Source=";
oleDBConnString += fileName; //oleDBConnString += fileName;
oleDBConnString += ";Extended Properties=Excel 8.0;"; //oleDBConnString += ";Extended Properties=Excel 8.0;";
OleDbConnection oleDBConn = null; //OleDbConnection oleDBConn = null;
OleDbDataAdapter oleAdMaster = null; //OleDbDataAdapter oleAdMaster = null;
DataTable m_tableName = new DataTable(); //DataTable m_tableName = new DataTable();
DataSet ds = new DataSet(); //DataSet ds = new DataSet();
oleDBConn = new OleDbConnection(oleDBConnString); //oleDBConn = new OleDbConnection(oleDBConnString);
oleDBConn.Open(); //oleDBConn.Open();
m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); //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; //string sqlMaster;
sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]";
oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
oleAdMaster.Fill(ds, "m_tableName"); //oleAdMaster.Fill(ds, "m_tableName");
oleAdMaster.Dispose(); //oleAdMaster.Dispose();
oleDBConn.Close(); //oleDBConn.Close();
oleDBConn.Dispose(); //oleDBConn.Dispose();
DataTable dt = NPOIHelper.ExcelToDataTable1(fileName);
AddDatasetToSQL(ds.Tables[0]); AddDatasetToSQL(dt);
} }
catch (Exception ex) catch (Exception ex)
{ {