20210720

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx.cs

@@ -64,7 +64,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
                     this.drpUnit.Enabled = false;
                 }
                 this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddMonths(-1));
-                this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(1));
                 // 绑定表格
                 BindGrid();
             }
@@ -307,18 +307,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
         {
             if (intoOut != null)
             {
-                if (intoOut.ToString() == "True")
+                if (intoOut.ToString() == "1")
                 {
                     return "进场";
                 }
-                else if (intoOut.ToString() == "False")
+                else 
                 {
                     return "出场";
                 }
-                else
-                {
-                    return "";
-                }
             }
             return "";
         }

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx

@@ -70,12 +70,12 @@
                             </f:Grid>
                         </PopPanel>
                     </f:DropDownBox>
+                    <f:TextBox ID="txtIdCard" Label="身份证号码" Readonly="true" runat="server" ></f:TextBox>
                 </Items>
             </f:FormRow>
             <f:FormRow ColumnWidths="40% 25% 35%">
                 <Items>
-                    <f:TextBox ID="txtWorkArea" runat="server" Label="单位工程" MaxLength="100" ShowRedStar="true"
-                        Required="true" LabelAlign="Right">
+                    <f:TextBox ID="txtWorkArea" runat="server" Label="单位工程" MaxLength="100" LabelAlign="Right">
                     </f:TextBox>
                     <f:DropDownList ID="drpWorkArea" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpWorkArea_SelectedIndexChanged">
                     </f:DropDownList>
@@ -95,7 +95,7 @@
                     </f:Label>--%>
                     <f:DropDownList ID="drpType" runat="server" Label="进出时间">
                         <f:ListItem Value="1" Text="入场时间" />
-                        <f:ListItem Value="2" Text="出场时间" />
+                        <f:ListItem Value="0" Text="出场时间" />
                     </f:DropDownList>
                     <f:DatePicker ID="txtTime" runat="server" >
                     </f:DatePicker>

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs

@@ -102,6 +102,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
                 var person = BLL.PersonService.GetPersonById(this.drpPersonId.Value);
                 if (person != null)
                 {
+                    this.txtIdCard.Text = person.IdentityCard;
                     if (!string.IsNullOrEmpty(person.WorkAreaId))
                     {
                         this.drpWorkArea.SelectedValue = person.WorkAreaId;
@@ -198,6 +199,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
             Model.SitePerson_Checking personInfo = new Model.SitePerson_Checking
             {
                 PersonId = this.drpPersonId.Value,
+                IdentityCard = this.txtIdCard.Text,
                 ProjectId = this.ProjectId,
                 WorkAreaName = this.txtWorkArea.Text.Trim(),
                 Address = this.txtAddress.Text.Trim()
@@ -215,8 +217,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
             }
             else
             {
-                string newKeyID = SQLHelper.GetNewID(typeof(Model.SitePerson_Checking));
-                personInfo.CheckingId = newKeyID;
+              this.CheckingId = SQLHelper.GetNewID();
+                personInfo.CheckingId = this.CheckingId;
                 BLL.SitePerson_CheckingService.AddPersonInfo(personInfo);
                 BLL.LogService.AddSys_Log(this.CurrUser, personInfo.CardNo, personInfo.CheckingId, BLL.Const.PersonalInfoMenuId, BLL.Const.BtnDelete);
             }

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.designer.cs

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