From 9cdd25128dba6ea40d1485941895bd2e796da6bb Mon Sep 17 00:00:00 2001
From: Frane <yhw0508@163.com>
Date: Wed, 13 Oct 2021 17:42:59 +0800
Subject: [PATCH] 20211013

---
 .../QualityAudit/EquipmentPersonQuality.aspx  | 10 +++++++--
 .../EquipmentPersonQuality.aspx.cs            | 21 ++++++++++++++-----
 .../EquipmentPersonQuality.aspx.designer.cs   | 18 ++++++++--------
 .../HSSE/QualityAudit/PersonQuality.aspx      | 12 ++++++++---
 .../HSSE/QualityAudit/PersonQuality.aspx.cs   | 21 ++++++++++++++-----
 .../PersonQuality.aspx.designer.cs            | 18 ++++++++--------
 .../HSSE/QualityAudit/SafePersonQuality.aspx  | 12 ++++++++---
 .../QualityAudit/SafePersonQuality.aspx.cs    | 21 ++++++++++++++-----
 .../SafePersonQuality.aspx.designer.cs        | 18 ++++++++--------
 9 files changed, 101 insertions(+), 50 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx
index b62611f1..bd9a1ab7 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx
@@ -19,10 +19,10 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                            <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
+                          <%--  <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px"
                                 LabelAlign="right">
-                            </f:TextBox>
+                            </f:TextBox>--%>
                             <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" 
                                 OnSelectedIndexChanged="TextBox_TextChanged"  LabelWidth="70px" Width="250px">
                             </f:DropDownList>
@@ -32,6 +32,12 @@
                             <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
                                 OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
                             </f:TextBox>
+                             <f:RadioButtonList runat="server" ID="rblIsPost" AutoPostBack="true" 
+                                OnSelectedIndexChanged="TextBox_TextChanged">
+                                <f:RadioItem Value="-1" Text="全部"/>
+                                <f:RadioItem Value="1" Text="在岗" Selected="true"/>
+                                <f:RadioItem Value="0" Text="离岗"/>
+                            </f:RadioButtonList>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>                                                     
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.cs
index b575d96a..b23c5af7 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.cs
@@ -86,11 +86,11 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND Person.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
             }
-            if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
-            {
-                strSql += " AND Person.CardNo LIKE @CardNo";
-                listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
-            }
+            //if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
+            //{
+            //    strSql += " AND Person.CardNo LIKE @CardNo";
+            //    listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
+            //}
             if (!string.IsNullOrEmpty(this.txtPersonName.Text.Trim()))
             {
                 strSql += " AND Person.PersonName LIKE @PersonName";
@@ -101,6 +101,17 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND WorkPost.WorkPostName LIKE @WorkPostName";
                 listStr.Add(new SqlParameter("@WorkPostName", "%" + this.txtWorkPostName.Text.Trim() + "%"));
             }
+            if (this.rblIsPost.SelectedValue != "-1")
+            {
+                if (this.rblIsPost.SelectedValue == "1")
+                {
+                    strSql += " AND Person.OutTime is null ";
+                }
+                else if (this.rblIsPost.SelectedValue == "0")
+                {
+                    strSql += " AND Person.OutTime is not null ";
+                }
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.designer.cs
index 82e5408f..575ffe01 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
-        /// <summary>
-        /// txtCardNo 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCardNo;
-        
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -93,6 +84,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkPostName;
         
+        /// <summary>
+        /// rblIsPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsPost;
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
index d275a259..c0f25e6b 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
@@ -20,10 +20,10 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                            <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
+                        <%--    <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px"
                                 LabelAlign="right">
-                            </f:TextBox>
+                            </f:TextBox>--%>
                             <f:DropDownList ID="drpUnitId" runat="server" Label="单位" 
                                 AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"  LabelWidth="70px" Width="250px">
                             </f:DropDownList>
@@ -33,6 +33,12 @@
                             <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
                                 OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
                             </f:TextBox>
+                            <f:RadioButtonList runat="server" ID="rblIsPost" AutoPostBack="true" 
+                                OnSelectedIndexChanged="TextBox_TextChanged">
+                                <f:RadioItem Value="-1" Text="全部"/>
+                                <f:RadioItem Value="1" Text="在岗" Selected="true"/>
+                                <f:RadioItem Value="0" Text="离岗"/>
+                            </f:RadioButtonList>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>                                                     
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
@@ -49,7 +55,7 @@
                         </ItemTemplate>
                     </f:TemplateField>
                     <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
-                        SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                        SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>  
                     <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" 
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs
index 2d35d112..9a3ba58a 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs
@@ -85,11 +85,11 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND Person.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
             }
-            if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
-            {
-                strSql += " AND Person.CardNo LIKE @CardNo";
-                listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
-            }
+            //if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
+            //{
+            //    strSql += " AND Person.CardNo LIKE @CardNo";
+            //    listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
+            //}
             if (!string.IsNullOrEmpty(this.txtPersonName.Text.Trim()))
             {
                 strSql += " AND Person.PersonName LIKE @PersonName";
@@ -100,6 +100,17 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND WorkPost.WorkPostName LIKE @WorkPostName";
                 listStr.Add(new SqlParameter("@WorkPostName", "%" + this.txtWorkPostName.Text.Trim() + "%"));
             }
+            if (this.rblIsPost.SelectedValue != "-1")
+            {
+                if (this.rblIsPost.SelectedValue == "1")
+                {
+                    strSql += " AND Person.OutTime is null ";
+                }
+                else if (this.rblIsPost.SelectedValue == "0")
+                {
+                    strSql += " AND Person.OutTime is not null ";
+                }
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs
index f2833d54..7a3bc156 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
-        /// <summary>
-        /// txtCardNo 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCardNo;
-        
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -93,6 +84,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkPostName;
         
+        /// <summary>
+        /// rblIsPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsPost;
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
index 409caee2..b9f78b2c 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx
@@ -22,10 +22,10 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                            <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
+                        <%--    <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
                                 LabelAlign="right">
-                            </f:TextBox>
+                            </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"
@@ -33,7 +33,13 @@
                             </f:TextBox>
                             <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
                                 OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
-                            </f:TextBox>
+                            </f:TextBox>   
+                            <f:RadioButtonList runat="server" ID="rblIsPost" AutoPostBack="true" 
+                                OnSelectedIndexChanged="TextBox_TextChanged">
+                                <f:RadioItem Value="-1" Text="全部"/>
+                                <f:RadioItem Value="1" Text="在岗" Selected="true"/>
+                                <f:RadioItem Value="0" Text="离岗"/>
+                            </f:RadioButtonList>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>                                                     
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs
index 9149c87e..aac0a089 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs
@@ -83,11 +83,11 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND Person.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
             }
-            if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
-            {
-                strSql += " AND Person.CardNo LIKE @CardNo";
-                listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
-            }
+            //if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim()))
+            //{
+            //    strSql += " AND Person.CardNo LIKE @CardNo";
+            //    listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%"));
+            //}
             if (!string.IsNullOrEmpty(this.txtPersonName.Text.Trim()))
             {
                 strSql += " AND Person.PersonName LIKE @PersonName";
@@ -98,6 +98,17 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 strSql += " AND WorkPost.WorkPostName LIKE @WorkPostName";
                 listStr.Add(new SqlParameter("@WorkPostName", "%" + this.txtWorkPostName.Text.Trim() + "%"));
             }
+            if (this.rblIsPost.SelectedValue != "-1")
+            {
+                if (this.rblIsPost.SelectedValue == "1")
+                {
+                    strSql += " AND Person.OutTime is null ";
+                }
+                else if (this.rblIsPost.SelectedValue == "0")
+                {
+                    strSql += " AND Person.OutTime is not null ";
+                }
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs
index 3370ee0e..994c0738 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
-        /// <summary>
-        /// txtCardNo 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCardNo;
-        
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -93,6 +84,15 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkPostName;
         
+        /// <summary>
+        /// rblIsPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsPost;
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>