diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs
index dfd1a25d..7874419e 100644
--- a/SGGL/BLL/DropListService.cs
+++ b/SGGL/BLL/DropListService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using BLL;
+using System.Collections.Generic;
namespace BLL
{
@@ -40,6 +41,10 @@ namespace BLL
{
dropName.DataSource = HSSE_getCertificateType();
}
+ else if (groupId == Group_ProjectPersonStates)
+ {
+ dropName.DataSource = HSSE_getProjectPersonStates();
+ }
dropName.DataBind();
if (isShowPlease)
{
@@ -74,7 +79,10 @@ namespace BLL
{
rblName.DataSource = HSSE_getContractType();
}
-
+ else if (groupId == Group_ProjectPersonStates)
+ {
+ rblName.DataSource = HSSE_getProjectPersonStates();
+ }
rblName.DataBind();
if (!string.IsNullOrEmpty(selectValue))
{
@@ -105,6 +113,10 @@ namespace BLL
///
public const string Group_PersonType = "PersonType";
///
+ /// 项目人员状态 组id
+ ///
+ public const string Group_ProjectPersonStates = "ProjectPersonStates";
+ ///
/// 合同类型 组id
///
public const string Group_ContractType = "ContractType";
@@ -330,6 +342,39 @@ namespace BLL
}
#endregion
+ #region 人员类型
+ ///
+ /// 人员类型 名称
+ ///
+ ///
+ ///
+ public static string HSSE_getProjectPersonStates(string value)
+ {
+ string name = string.Empty;
+ var getType = HSSE_getProjectPersonStates().FirstOrDefault(x => x.Value == value);
+ if (getType != null)
+ {
+ name = getType.Text;
+ }
+ return name;
+ }
+
+
+ ///
+ /// 人员类型
+ ///
+ ///
+ public static ListItem[] HSSE_getProjectPersonStates()
+ {
+ ListItem[] list = new ListItem[4];
+ list[0] = new ListItem("在审", Const.ProjectPersonStates_0);
+ list[1] = new ListItem("在岗", Const.ProjectPersonStates_1);
+ list[2] = new ListItem("离岗", Const.ProjectPersonStates_2);
+ list[3] = new ListItem("打回", Const.ProjectPersonStates_R);
+ return list;
+ }
+ #endregion
+
#region 合同类型
///
/// 人员类型 名称
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index b6c9349c..e69de29b 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1,32 +0,0 @@
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
- 在 (Object )
- 在 FineUIPro.GridRow.kxpUEMXYxcbykrOznAFBzkoxlAnb()
- 在 (GridRow )
- 在 FineUIPro.GridRow.InitTemplateContainers()
- 在 (GridRow )
- 在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
- 在 (Grid , Int32 , Object )
- 在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean )
- 在 (Grid , IEnumerable , Boolean )
- 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
- 在 (Grid , Boolean )
- 在 FineUIPro.Grid.DataBind()
- 在 FineUIPro.Web.HSSE.SitePerson.SitePersonNowStatistic.BindGrid() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\HSSE\SitePerson\SitePersonNowStatistic.aspx.cs:行号 58
- 在 FineUIPro.Web.HSSE.SitePerson.SitePersonNowStatistic.btnSearch_Click(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\HSSE\SitePerson\SitePersonNowStatistic.aspx.cs:行号 65
- 在 FineUIPro.Button.OnClick(EventArgs e)
- 在 (Button , EventArgs )
- 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
- 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
- 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
- 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:09/15/2023 11:18:13
-出错文件:http://localhost:9243/HSSE/SitePerson/SitePersonNowStatistic.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:09/15/2023 11:18:13
-
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index a5e8716e..e59c9ab6 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -14233,7 +14233,7 @@
True
0
/
- http://localhost:9243/
+ http://localhost:8513/
False
False
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx
index 772f491e..0ce3fb53 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx
@@ -1,4 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EquipmentPersonQuality.aspx.cs" Inherits="FineUIPro.Web.HSSE.QualityAudit.EquipmentPersonQuality" %>
+
@@ -7,75 +8,75 @@
-
\ No newline at end of file
+