zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员待审核状态

This commit is contained in:
李超 2022-12-22 17:27:44 +08:00
parent d6b991a48d
commit 81de6657b5
5 changed files with 217 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,3 +958,94 @@ IP地址:::1
出错时间:12/17/2022 11:20:46
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'HomePageType' 无效。
错误堆栈:
在 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.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 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.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.ExecuteReader()
在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
在 System.Data.Linq.Table`1.System.Linq.IQueryProvider.Execute[TResult](Expression expression)
在 System.Linq.Queryable.FirstOrDefault[TSource](IQueryable`1 source, Expression`1 predicate)
在 BLL.UserService.GetUserByUserId(String userId) 位置 D:\project\vs\gitee\sggl_cd\SGGL\BLL\SysManage\UserService.cs:行号 19
在 FineUIPro.Web.Global.Application_Start(Object sender, EventArgs e) 位置 D:\project\vs\gitee\sggl_cd\SGGL\FineUIPro.Web\Global.asax.cs:行号 30
出错时间:12/22/2022 16:17:01
出错时间:12/22/2022 16:17:01
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\gitee\sggl_cd\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 302
在 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)
出错时间:12/22/2022 16:20:17
出错文件:http://localhost:8119/indexProject.aspx?projectId=b11a16ea-148c-4bae-a5a1-32158b599482
IP地址:::1
操作人员:
出错时间:12/22/2022 16:20:18
错误信息开始=====>
错误类型:HttpParseException
错误信息:无法从其“Icon”属性的字符串表示形式“ThLarge”创建“FineUIPro.Icon”类型的对象。
错误堆栈:
在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
----错误类型:HttpException
----错误信息:
----无法从其“Icon”属性的字符串表示形式“ThLarge”创建“FineUIPro.Icon”类型的对象。
----错误堆栈:
在 System.Web.UI.PropertyConverter.ObjectFromString(Type objType, MemberInfo propertyInfo, String value)
在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode)
在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column)
在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs)
在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs)
在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName)
在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
出错时间:12/22/2022 16:29:29
出错文件:http://localhost:8119/HSSE/SitePerson/PersonListEdit.aspx?ProjectId=b11a16ea-148c-4bae-a5a1-32158b599482&&UnitId=1cfbabe9-86e5-4d2a-952c-0c52a728a127
IP地址:::1
出错时间:12/22/2022 16:29:29
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\gitee\sggl_cd\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 302
在 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)
出错时间:12/22/2022 16:44:19
出错文件:http://localhost:8119/indexProject.aspx?projectId=b11a16ea-148c-4bae-a5a1-32158b599482
IP地址:::1
操作人员:
出错时间:12/22/2022 16:44:19

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

@ -261,13 +261,22 @@
<Content Include="BaseInfo\UnitType.aspx" />
<Content Include="BaseInfo\WorkPost.aspx" />
<Content Include="BaseInfo\WorkStage.aspx" />
<Content Include="common\main0.aspx" />
<Content Include="common\main2.aspx" />
<Content Include="common\mainI.aspx" />
<Content Include="common\mainIII.aspx" />
<Content Include="common\mainMenu_CQMS_1.aspx" />
<Content Include="common\mainMenu_DigitalSite.aspx" />
<Content Include="common\mainMenu_HJGL2.aspx" />
<Content Include="common\mainMenu_HSSE.aspx" />
<Content Include="common\mainMenu_HSSE2.aspx" />
<Content Include="common\mainMenu_PDigData.aspx" />
<Content Include="common\mainMenu_SYHSE.aspx" />
<Content Include="common\mainMenu_SYHSEN.aspx" />
<Content Include="common\mainProject0.aspx" />
<Content Include="common\mainProject1.aspx" />
<Content Include="common\main_copy_index.aspx" />
<Content Include="common\main_copy_index_1.aspx" />
<Content Include="common\Menu_Change.xml" />
<Content Include="common\Menu_DocControl.xml" />
<Content Include="common\todolist.aspx" />
@ -6314,6 +6323,13 @@
<Compile Include="BaseInfo\WorkStage.aspx.designer.cs">
<DependentUpon>WorkStage.aspx</DependentUpon>
</Compile>
<Compile Include="common\main0.aspx.cs">
<DependentUpon>main0.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main0.aspx.designer.cs">
<DependentUpon>main0.aspx</DependentUpon>
</Compile>
<Compile Include="common\main2.aspx.cs">
<DependentUpon>main2.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -6321,6 +6337,20 @@
<Compile Include="common\main2.aspx.designer.cs">
<DependentUpon>main2.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainI.aspx.cs">
<DependentUpon>mainI.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainI.aspx.designer.cs">
<DependentUpon>mainI.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainIII.aspx.cs">
<DependentUpon>mainIII.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainIII.aspx.designer.cs">
<DependentUpon>mainIII.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_CQMS_1.aspx.cs">
<DependentUpon>mainMenu_CQMS_1.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -6328,6 +6358,13 @@
<Compile Include="common\mainMenu_CQMS_1.aspx.designer.cs">
<DependentUpon>mainMenu_CQMS_1.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_DigitalSite.aspx.cs">
<DependentUpon>mainMenu_DigitalSite.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainMenu_DigitalSite.aspx.designer.cs">
<DependentUpon>mainMenu_DigitalSite.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_HJGL2.aspx.cs">
<DependentUpon>mainMenu_HJGL2.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -6349,6 +6386,13 @@
<Compile Include="common\mainMenu_HSSE2.aspx.designer.cs">
<DependentUpon>mainMenu_HSSE2.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_PDigData.aspx.cs">
<DependentUpon>mainMenu_PDigData.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainMenu_PDigData.aspx.designer.cs">
<DependentUpon>mainMenu_PDigData.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_SYHSE.aspx.cs">
<DependentUpon>mainMenu_SYHSE.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -6363,6 +6407,34 @@
<Compile Include="common\mainMenu_SYHSEN.aspx.designer.cs">
<DependentUpon>mainMenu_SYHSEN.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainProject0.aspx.cs">
<DependentUpon>mainProject0.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainProject0.aspx.designer.cs">
<DependentUpon>mainProject0.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainProject1.aspx.cs">
<DependentUpon>mainProject1.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainProject1.aspx.designer.cs">
<DependentUpon>mainProject1.aspx</DependentUpon>
</Compile>
<Compile Include="common\main_copy_index.aspx.cs">
<DependentUpon>main_copy_index.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main_copy_index.aspx.designer.cs">
<DependentUpon>main_copy_index.aspx</DependentUpon>
</Compile>
<Compile Include="common\main_copy_index_1.aspx.cs">
<DependentUpon>main_copy_index_1.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main_copy_index_1.aspx.designer.cs">
<DependentUpon>main_copy_index_1.aspx</DependentUpon>
</Compile>
<Compile Include="common\todolist.aspx.cs">
<DependentUpon>todolist.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

10
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
View File

@ -43,12 +43,12 @@
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="Form2"
OnClick="btnSave_Click" Hidden="true">
OnClick="btnSave_Click" Hidden="true" ToolTip="保存">
</f:Button>
<f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ValidateForms="Form2" Hidden="true"
OnClick="btnAudit_Click" ToolTip="审核" >
</f:Button>
<f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ValidateForms="Form2"
OnClick="btnAudit_Click" >
</f:Button>
<f:Button runat="server" ID="btnQR" OnClick="btnQR_Click" Icon="ApplicationEdit"
<f:Button runat="server" ID="btnQR" OnClick="btnQR_Click" Icon="table"
ToolTip="二维码查看">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">

70
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
View File

@ -150,7 +150,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.drpMaritalStatus.SelectedValue = person.MaritalStatus;
}
this.txtIdcardAddress.Text = person.IdcardAddress;
this.rblIsUsed.SelectedValue = person.IsUsed==1? "1" : "0";
this.rblIsUsed.SelectedValue = person.IsUsed==1|| person.IsUsed == 2 ? "1" : "0";
this.rblIsCardUsed.SelectedValue = person.IsCardUsed ? "True" : "False";
this.txtCardNo.Text = person.CardNo;
this.txtPersonName.Text = person.PersonName;
@ -438,26 +438,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
person.PostTitleId = this.drpTitle.SelectedValue;
}
if (!string.IsNullOrEmpty(this.rblIsUsed.SelectedValue))
{
if (this.rblIsUsed.SelectedValue == "1")
{
if (whichBtn == 0)
{
person.IsUsed = 2;
}
else
{
person.IsUsed = 1;
}
}
else
{
person.IsUsed = 0;
}
}
if (!string.IsNullOrEmpty(this.rblIsCardUsed.SelectedValue))
{
person.IsCardUsed = Convert.ToBoolean(this.rblIsCardUsed.SelectedValue);
@ -563,6 +544,26 @@ namespace FineUIPro.Web.HSSE.SitePerson
person.IsOutside = this.ckIsOutside.Checked;
if (string.IsNullOrEmpty(PersonId))
{
if (!string.IsNullOrEmpty(this.rblIsUsed.SelectedValue))
{
if (this.rblIsUsed.SelectedValue == "1")
{
if (whichBtn == 1)
{
person.IsUsed = 1;
}
else
{
person.IsUsed = 2;
}
}
else
{
person.IsUsed = 0;
}
}
if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
{
int cardNoCount = BLL.PersonService.GetPersonCountByCardNo(this.ProjectId, this.txtCardNo.Text.Trim());
@ -598,8 +599,29 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
var getPerson = BLL.PersonService.GetPersonById(PersonId);
if (getPerson != null)
{ person.FromPersonId = getPerson.FromPersonId; }
{
person.FromPersonId = getPerson.FromPersonId;
}
if (!string.IsNullOrEmpty(this.rblIsUsed.SelectedValue))
{
if (this.rblIsUsed.SelectedValue == "1")
{
if (whichBtn == 1)
{
person.IsUsed = 1;
}
else
{
person.IsUsed = getPerson.IsUsed;
}
}
else
{
person.IsUsed = 0;
}
}
person.PersonId = PersonId;
BLL.PersonService.UpdatePerson(person);
//判断并更新项目用户的主副专业信息
@ -732,6 +754,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.btnSave.Hidden = false;
this.filePhoto.Hidden = false;
this.btnReadIdentityCard.Hidden = false;
if (CurrUser.UnitId == Const.UnitId_CD)
{
this.btnAudit.Hidden = false;
}
}
}
}

2
SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx.cs
View File

@ -13,7 +13,7 @@ namespace FineUIPro.Web.common
if (!IsPostBack)
{
getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList();
getPersons = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
getPersons = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == 1
&& x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)).ToList();
///当前现场总人数
getSitePerson();