20210907

SGGL/FineUIPro.Web/Door/InOutRecord.aspx

@@ -45,6 +45,12 @@
                             <f:DatePicker ID="txtEndDate" runat="server" Label="结束日期"  LabelWidth="80px" Width="220px">
                             </f:DatePicker> 
                             <f:TextBox ID="txtName" runat="server" Label="姓名" LabelWidth="50px" Width="180px" ></f:TextBox>
+                              <f:RadioButtonList runat="server" ID="rbPost" Width="200px" LabelWidth="0px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="rbPost_SelectedIndexChanged">
+                                    <f:RadioItem Value="-1" Text="全部" />
+                                    <f:RadioItem Value="1" Text="在岗" Selected="true" />
+                                    <f:RadioItem Value="0" Text="离场" />
+                                </f:RadioButtonList>
                             <f:ToolbarFill runat="server"></f:ToolbarFill>
                             <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" ToolTip="查询" OnClick="btnSearch_Click">
                             </f:Button>
@@ -92,7 +98,7 @@
                       <f:RenderField Width="100px" ColumnID="ManHours" DataField="ManHours" SortField="ManHours"
                         HeaderText="工时" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
-                     <f:RenderField Width="80px" ColumnID="ManOverHours" DataField="ManOverHours" SortField="ManOverHours"
+                     <f:RenderField Width="100px" ColumnID="ManOverHours" DataField="ManOverHours" SortField="ManOverHours"
                         HeaderText="加班" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
                     <f:RenderField Width="145px" ColumnID="WorkIn1" DataField="WorkIn1" SortField="WorkIn1"

SGGL/FineUIPro.Web/Door/InOutRecord.aspx.cs

@@ -134,6 +134,14 @@ namespace FineUIPro.Web.Door
                 strSql += " AND RecordDate >= @StartDate";
                 listStr.Add(new SqlParameter("@StartDate", this.txtStartDate.Text));
             }
+            if (rbPost.SelectedValue == "0")
+            {
+                strSql += " AND P.OutTime IS NOT NULL";
+            }
+           else if (rbPost.SelectedValue == "1")
+            {
+                strSql += " AND P.OutTime IS NULL";
+            }
             if (!string.IsNullOrEmpty(this.txtEndDate.Text))
             {
                 strSql += " AND RecordDate <= @EndDate";
@@ -280,5 +288,10 @@ namespace FineUIPro.Web.Door
         {
             this.drpWorkTeam.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpWorkTeam.SelectedValueArray);
         }
+
+        protected void rbPost_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GetPersonStatistic();
+        }
     }
 }

SGGL/FineUIPro.Web/Door/InOutRecord.aspx.designer.cs

@@ -120,6 +120,15 @@ namespace FineUIPro.Web.Door {
         /// </remarks>
         protected global::FineUIPro.TextBox txtName;
         
+        /// <summary>
+        /// rbPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbPost;
+        
         /// <summary>
         /// btnSearch 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx

@@ -54,11 +54,9 @@
             </f:FormRow>
             <f:FormRow>
                 <Items>
-                    <f:DropDownList runat="server" EnableSimulateTree="True" Label="责任人" ID="drpResponsibleMan"
-                        >
+                    <f:DropDownList runat="server" EnableSimulateTree="True" Label="责任人" ID="drpResponsibleMan" >
                     </f:DropDownList>
-                    <f:DatePicker ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelAlign="Right" Required="True" ShowRedStar="true"
-                        >
+                    <f:DatePicker ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelAlign="Right" Required="True" ShowRedStar="true">
                     </f:DatePicker>
                 </Items>
             </f:FormRow>

SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs

@@ -428,16 +428,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                     {
                         string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                         Model.HSSE_Hazard_HazardRegister hazardRegister = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(rowID);
-                        if (hazardRegister.States == "1" || this.CurrUser.UserId == BLL.Const.sysglyId)   //待整改
-                        {
-                            BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
-                            BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
-                        }
-                        else
-                        {
-                            Alert.ShowInTop("已进入整改流程，无法删除！", MessageBoxIcon.Warning);
-                            return;
-                        }
+                        BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
+                        BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
                     }
                     BindGrid();
                     ShowNotify("删除成功!", MessageBoxIcon.Success);