20230918资质列表 加现场人员状态查询

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
         /// </summary>
         public const string Group_PersonType = "PersonType";
         /// <summary>
+        /// 项目人员状态 组id
+        /// </summary>
+        public const string Group_ProjectPersonStates = "ProjectPersonStates";
+        /// <summary>
         /// 合同类型 组id
         /// </summary>
         public const string Group_ContractType = "ContractType";
@@ -330,6 +342,39 @@ namespace BLL
         }
         #endregion
 
+        #region 人员类型
+        /// <summary>
+        /// 人员类型 名称
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        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;
+        }
+
+
+        /// <summary>
+        /// 人员类型
+        /// </summary>
+        /// <returns></returns>
+        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 合同类型
         /// <summary>
         /// 人员类型 名称

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
-

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -14233,7 +14233,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:9243/</IISUrl>
+          <IISUrl>http://localhost:8513/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

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" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -19,21 +20,21 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                            <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
+                                 <f:TextBox runat="server" ID="txtCardNo" EmptyText="按编号查询" Width="150px" LabelAlign="right">
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px"
-                                LabelAlign="right">
                                 </f:TextBox>
                                 <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true"
                                     OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
                                 </f:DropDownList>
-                            <f:TextBox runat="server" Label="姓名" ID="txtPersonName" EmptyText="输入查询条件" AutoPostBack="true"
+                               <f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" Width="150px" LabelAlign="right">
-                                OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
                                 </f:TextBox>
-                            <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
+                                <f:TextBox runat="server" ID="txtWorkPostName" EmptyText="按岗位查询"  Width="150px"  LabelAlign="right">
-                                OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
                                 </f:TextBox>
+                                <f:DropDownList runat="server" ID="drpPersonStates" EnableEdit="true" Width="120px"
+                                    LabelAlign="Right" EmptyText="按状态查询" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                </f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
+                                  <f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>

SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.cs

@@ -45,6 +45,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                DropListService.InitConstDropDownList(this.drpPersonStates, DropListService.Group_ProjectPersonStates, true);
+                this.drpPersonStates.SelectedValue = Const.ProjectPersonStates_1;
                 BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
                 if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
                 {
@@ -95,6 +97,11 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND WorkPost.WorkPostName LIKE @WorkPostName";
                 listStr.Add(new SqlParameter("@WorkPostName", "%" + this.txtWorkPostName.Text.Trim() + "%"));
             }
+            if (this.drpPersonStates.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpPersonStates.SelectedValue))
+            {
+                strSql += " AND Person.States =@States ";
+                listStr.Add(new SqlParameter("@States", this.drpPersonStates.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 

SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
+namespace FineUIPro.Web.HSSE.QualityAudit
+{
 
 
-    public partial class EquipmentPersonQuality {
+    public partial class EquipmentPersonQuality
+    {
 
         /// <summary>
         /// form1 控件。
@@ -93,6 +95,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkPostName;
 
+        /// <summary>
+        /// drpPersonStates 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPersonStates;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -102,6 +113,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
 
+        /// <summary>
+        /// btSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btSearch;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx

@@ -14,7 +14,7 @@
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种作业人员资质" EnableCollapse="true"
                 runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"                
                 SortField="UnitName,PersonName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
                 EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
                 <Toolbars>
@@ -29,7 +29,7 @@
                             </f:TextBox>
                             <f:TextBox runat="server" ID="txtWorkPostName" EmptyText="按岗位查询"  Width="150px" LabelAlign="right">
                             </f:TextBox>
-                               <f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"  Width="120px"
+                               <f:DropDownList runat="server" ID="drpPersonStates" EnableEdit="true"  Width="120px"
                                     LabelAlign="Right" EmptyText="按状态查询" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">

SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs

@@ -47,8 +47,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 }
                 BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, false);
                 Funs.FineUIPleaseSelect(this.drpUnitId, "按单位查询");
-                DropListService.InitConstDropDownList(this.drpIsPost, DropListService.Group_IsPost, true);
+                DropListService.InitConstDropDownList(this.drpPersonStates, DropListService.Group_ProjectPersonStates, true);
-                this.drpIsPost.SelectedValue = Const._True;
+                this.drpPersonStates.SelectedValue = Const.ProjectPersonStates_1;
                 if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
                 {
                     this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
@@ -82,18 +82,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND Person.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
             }
-            if (this.drpIsPost.SelectedValue != Const._Null && !string.IsNullOrEmpty( this.drpIsPost.SelectedValue))
+            if (this.drpPersonStates.SelectedValue != Const._Null && !string.IsNullOrEmpty( this.drpPersonStates.SelectedValue))
-            {
-                if (this.drpIsPost.SelectedValue == Const._True)
             {
                 strSql += " AND Person.States =@States ";
-                    listStr.Add(new SqlParameter("@States",Const.ProjectPersonStates_1));
+                listStr.Add(new SqlParameter("@States", this.drpPersonStates.SelectedValue));
-                }
-                else
-                {
-                    strSql += " AND Person.States  !=@States ";
-                    listStr.Add(new SqlParameter("@States", Const.ProjectPersonStates_1));
-                }
             }
             if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
             {

SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs

@@ -96,13 +96,13 @@ namespace FineUIPro.Web.HSSE.QualityAudit
         protected global::FineUIPro.TextBox txtWorkPostName;
 
         /// <summary>
-        /// drpIsPost 控件。
+        /// drpPersonStates 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpIsPost;
+        protected global::FineUIPro.DropDownList drpPersonStates;
 
         /// <summary>
         /// ToolbarFill1 控件。

SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx

@@ -21,21 +21,21 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                            <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
+                                <f:TextBox runat="server" ID="txtCardNo" EmptyText="按编号查询" Width="150px" LabelAlign="right">
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px"
-                                LabelAlign="right">
                                 </f:TextBox>
                                 <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true"
                                     OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px" LabelAlign="right">
                                 </f:DropDownList>
-                            <f:TextBox runat="server" Label="人员姓名" ID="txtPersonName" EmptyText="输入查询条件" AutoPostBack="true"
+                                <f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" Width="150px" LabelAlign="right">
-                                OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="100px" LabelAlign="right">
                                 </f:TextBox>
-                            <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
+                                <f:TextBox runat="server" ID="txtWorkPostName" EmptyText="按岗位查询"  Width="150px"  LabelAlign="right">
-                                OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
                                 </f:TextBox>
+                                <f:DropDownList runat="server" ID="drpPersonStates" EnableEdit="true" Width="120px"
+                                    LabelAlign="Right" EmptyText="按状态查询" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                </f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
+                                  <f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>

SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs

@@ -44,6 +44,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+                DropListService.InitConstDropDownList(this.drpPersonStates, DropListService.Group_ProjectPersonStates, true);
+                this.drpPersonStates.SelectedValue = Const.ProjectPersonStates_1;
                 BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
                 if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
                 {
@@ -94,6 +96,11 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND WorkPost.WorkPostName LIKE @WorkPostName";
                 listStr.Add(new SqlParameter("@WorkPostName", "%" + this.txtWorkPostName.Text.Trim() + "%"));
             }
+            if (this.drpPersonStates.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpPersonStates.SelectedValue))
+            {
+                strSql += " AND Person.States =@States ";
+                listStr.Add(new SqlParameter("@States", this.drpPersonStates.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 

SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
+namespace FineUIPro.Web.HSSE.QualityAudit
+{
 
 
-    public partial class SafePersonQuality {
+    public partial class SafePersonQuality
+    {
 
         /// <summary>
         /// form1 控件。
@@ -93,6 +95,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkPostName;
 
+        /// <summary>
+        /// drpPersonStates 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpPersonStates;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -102,6 +113,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
 
+        /// <summary>
+        /// btSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btSearch;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>