lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改公司级看板只显示在建的项目

This commit is contained in:
潘鸿锋 2024-09-23 10:31:03 +08:00
parent 95d6e9c862
commit b6b6c69a17
6 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataBase/版本日志/SGGLDB_WH_V2024-09-23-phf.sql Normal file
View File

@ -0,0 +1,3 @@
CREATE NONCLUSTERED INDEX [SitePerson_Person_pid_isused_intime_index]
ON [dbo].[SitePerson_Person] ([ProjectId],[IsUsed],[InTime],[OutTime])
INCLUDE ([PersonName]);

28
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -0,0 +1,28 @@
错误信息开始=====>
错误类型:SqlException
错误信息:在将 nvarchar 值 'PP-' 转换成数据类型 int 时失败。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(TaskCompletionSource`1 completion, String methodName, Boolean sendToPipe, Int32 timeout, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.ExecuteNonQuery()
在 BLL.SQLHelper.RunProcNewId2(String storedProcName, String tableName, String columnName, String projectId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 880
在 FineUIPro.Web.TestRun.DriverSchemeEdit.Page_Load(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\TestRun\DriverSchemeEdit.aspx.cs:行号 154
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/23/2024 10:27:46
出错文件:http://localhost:8579/TestRun/DriverSchemeEdit.aspx?SolutionType=09
IP地址:::1
操作人员:JT
出错时间:09/23/2024 10:27:46

4
SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
View File

@ -151,8 +151,8 @@ namespace FineUIPro.Web.TestRun
options.Hidden = true;
optio.Hidden = true;
plApprove2.Hidden = true;
txtCode.Text = SQLHelper.RunProcNewId2("SpGetNewCode3ByProjectId",
"dbo.Solution_TestRunConstructSolution", "Code", CurrUser.LoginProjectId);
//txtCode.Text = SQLHelper.RunProcNewId2("SpGetNewCode3ByProjectId",
// "dbo.Solution_TestRunConstructSolution", "Code", CurrUser.LoginProjectId);
this.txtSolutionType.Text = TestRunConstructSolutionService.ConvertSolutionType(Request.Params["SolutionType"]);
this.hdSolutionType.Text = Request.Params["SolutionType"];
TestRunConstructSolutionService.Init(drpHandleType, Const.TestRunConstructSolution_Compile, false);

8
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -24,6 +24,14 @@ namespace FineUIPro.Web.common
{
pids = CurrUser.CompanyProjectId.Split(',');
}
else {
//加载所有在建项目的数据
var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x=>x.ProjectId).ToArray();
if (pidArray.Length>0)
{
pids = pidArray;
}
}
//未遂事故

9
SGGL/FineUIPro.Web/common/main_new0.aspx.cs
View File

@ -32,6 +32,15 @@ namespace FineUIPro.Web.common
{
pids = CurrUser.CompanyProjectId.Split(',');
}
else
{
//加载所有在建项目的数据
var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray();
if (pidArray.Length > 0)
{
pids = pidArray;
}
}
var unitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();

10
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
View File

@ -37,6 +37,16 @@ namespace FineUIPro.Web.common
{
pids = CurrUser.CompanyProjectId.Split(',');
}
else
{
//加载所有在建项目的数据
var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray();
if (pidArray.Length > 0)
{
pids = pidArray;
}
}
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false);
if (this.drpProject.Items.Count > 0)
{