20220919版本日志整理，部门人员列表及导出功能调整

DataBase/版本日志/SGGLDB_V2022-09-19修改明细.txt

@@ -0,0 +1,9 @@
+ 
+--ADD BY YangHongwei 2022-09-19
+1、部门人员列表员工类型取值修改。
+2、人员历史数据中当前项目当前岗位为空的情况进行初始化取值处理。
+3、部门员工列表自定义列导出功能实现。
+--END
+ 
+
+ 

SGGL/BLL/BLL.csproj

@@ -64,9 +64,7 @@
       <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -113,25 +111,13 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Text.Encodings.Web, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>

SGGL/BLL/BaseInfo/PositionService.cs

@@ -20,6 +20,17 @@ namespace BLL
             return Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId);
         }
 
+        public static string  GetPositionNameById(string positionId)
+        {
+            string name =string.Empty;
+            var getData= Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId);
+            if (getData != null)
+            {
+                name = getData.PositionName;
+            }
+            return name;
+
+        }
         /// <summary>
         /// 添加职务
         /// </summary>

SGGL/BLL/Person/Person_PersonsService.cs

@@ -107,6 +107,7 @@ namespace BLL
                        WorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId),
                        x.PostTitleId,
                        PostTitleName = PostTitleService.getPostTitleNameById(x.PostTitleId),
+                       x.PostTitleDate,
                        x.IsOffice,
                        x.RoleIds,
                        RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
@@ -124,10 +125,21 @@ namespace BLL
                        x.PersonType,
                        PersonTypeName = DropListService.getPersonTypeNameByValue(x.PersonType),
                        x.ValidityDate,
+                       x.IntoDate,
+                       x.WorkDate,
+                       x.RetirementDate,
+                       PositionName = PositionService.GetPositionNameById(x.PositionId),
+                       x.Graduate,
+                       x.ForeignLanguage,
+                       NationName = BasicDataService.GetDictNameByDictCode(x.Nation),
+                       PoliticsStatusName = BasicDataService.GetDictNameByDictCode(x.PoliticsStatus),
+                       MaritalStatusName = BasicDataService.GetDictNameByDictCode(x.MaritalStatus),
+                       x.RelativeName,
+                       x.RelativeTel,
                    };
         }
         #endregion
-
+               
         #region 根据主键获取人员信息
         /// <summary>
         /// 根据主键获取人员信息

SGGL/FineUIPro.Web/ErrLog.txt

@@ -135,3 +135,26 @@ IP地址:::1
 
 出错时间:09/13/2022 10:46:27
 
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:e:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Person\DepartPersonShowColumn.aspx(20): error CS1061: “ASP.person_departpersonshowcolumn_aspx”不包含“btSearch_Click”的定义，并且找不到可接受类型为“ASP.person_departpersonshowcolumn_aspx”的第一个参数的扩展方法“btSearch_Click”(是否缺少 using 指令或程序集引用?)
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:09/20/2022 11:07:49
+出错文件:http://localhost:8008/Person/DepartPersonShowColumn.aspx
+IP地址:::1
+
+出错时间:09/20/2022 11:07:49
+

SGGL/FineUIPro.Web/Person/CompanyPerson.aspx

@@ -31,11 +31,11 @@
                                     LabelAlign="Right" AutoPostBack="true" EmptyText="项目" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询"></f:TextBox>                              
+                                <f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询"></f:TextBox>
-                                 <f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true" 
+                                <f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
                                     LabelAlign="Right" EmptyText="按人员状态查询" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>
-                                <f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true" 
+                                <f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true"
                                     LabelAlign="Right" EmptyText="按员工类别查询" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>
                                 <f:ToolbarFill runat="server">
@@ -51,8 +51,12 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center" />
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
                         <f:RenderField Width="85px" ColumnID="JobNum" DataField="JobNum" SortField="JobNum"
                             FieldType="String" HeaderText="工号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
@@ -67,12 +71,12 @@
                         <f:RenderField Width="185px" ColumnID="IdentityCard" DataField="IdentityCard"
                             FieldType="String" HeaderText="身份证" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                         <f:TemplateField Width="60px" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField Width="60px" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="Label1" runat="server" Text='<%# ConvertAgeByIdentityCard(Eval("IdentityCard")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                    <%--    <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitId"
+                        <%--    <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitId"
                             FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>--%>
                         <f:RenderField Width="110px" ColumnID="DepartName" DataField="DepartName" SortField="DepartId"
@@ -84,10 +88,10 @@
                         <f:RenderField Width="100px" ColumnID="PostTitleName" DataField="PostTitleName"
                             FieldType="String" HeaderText="职称" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                         <f:RenderField Width="120px" ColumnID="Account" DataField="Account" 
+                        <f:RenderField Width="120px" ColumnID="Account" DataField="Account"
                             FieldType="String" HeaderText="账号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                         <f:RenderField Width="110px" ColumnID="RoleName" DataField="RoleName" 
+                        <f:RenderField Width="110px" ColumnID="RoleName" DataField="RoleName"
                             FieldType="String" HeaderText="角色" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:TemplateField ColumnID="tfImageUrl1" Width="90px" HeaderText="电子签名" HeaderTextAlign="Center"
@@ -96,7 +100,7 @@
                                 <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageByUrl(Eval("SignatureUrl")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                       <%--   <f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
+                        <%--   <f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
                             </ItemTemplate>
@@ -118,7 +122,7 @@
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="员工信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"  Maximized="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" Maximized="true"
             Height="620px">
         </f:Window>
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -131,10 +135,10 @@
             </f:MenuButton>
             <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
                 Hidden="true" ConfirmText="确定删除选中行？" ConfirmTarget="Parent" runat="server"
-                 Icon="Delete" Text="删除">
+                Icon="Delete" Text="删除">
             </f:MenuButton>
-              <f:MenuButton ID="btnSee" OnClick="btnSee_Click" EnablePostBack="true"
+            <f:MenuButton ID="btnSee" OnClick="btnSee_Click" EnablePostBack="true"
-                 runat="server" Text="查看" Icon="Find">
+                runat="server" Text="查看" Icon="Find">
             </f:MenuButton>
         </f:Menu>
     </form>

SGGL/FineUIPro.Web/Person/CompanyPerson.aspx.designer.cs

@@ -140,6 +140,15 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
         /// <summary>
         /// lbSex 控件。
         /// </summary>

SGGL/FineUIPro.Web/Person/DepartPerson.aspx

@@ -19,7 +19,7 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="部门员工"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="部门员工" EnableHeaderMenu="true"
                     runat="server" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
                     SortField="PersonName" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10"
                     SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
@@ -33,10 +33,10 @@
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询"></f:TextBox>
                                 <f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询"></f:TextBox>
-                                <f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true" 
+                                <f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
                                     LabelAlign="Right" EmptyText="请选择人员状态" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>
-                                 <f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true" 
+                                <f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true"
                                     LabelAlign="Right" EmptyText="请选择员工类别" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>
                                 <f:ToolbarFill runat="server">
@@ -48,47 +48,54 @@
                                 <f:Button ID="btnImport" Text="导入" Icon="FolderUp" Hidden="true" runat="server"
                                     OnClick="btnImport_Click">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center" />                     
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
                         <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
                             FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:TemplateField Width="50px" HeaderText="性别" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField Width="50px" ColumnID="tfSex" HeaderText="性别" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lbSex" runat="server" Text='<%# GetGender(Eval("Sex")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:TemplateField Width="50px" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField Width="50px" ColumnID="tfAge" HeaderText="年龄" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertAgeByIdentityCard(Eval("IdentityCard")) %>'></asp:Label>
+                                <asp:Label ID="lbAge" runat="server" Text='<%# ConvertAgeByIdentityCard(Eval("IdentityCard")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField Width="150px" ColumnID="IdentityCard" DataField="IdentityCard"
                             FieldType="String" HeaderText="身份证" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                         <f:RenderField Width="150px" ColumnID="Address" DataField="Address"
+                        <f:RenderField Width="150px" ColumnID="Address" DataField="Address"
                             FieldType="String" HeaderText="家庭住址" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="Telephone" DataField="Telephone"
                             FieldType="String" HeaderText="联系电话" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>                    
+                        </f:RenderField>
                         <f:RenderField Width="80px" ColumnID="EduLevelName" DataField="EduLevelName"
                             FieldType="String" HeaderText="最高学历" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="80px" ColumnID="Major" DataField="Major"
                             FieldType="String" HeaderText="所学专业" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                         <f:RenderField Width="80px" ColumnID="Major" DataField="Major"
+                        <f:RenderField Width="80px" ColumnID="PersonTypeName" DataField="PersonTypeName"
                             FieldType="String" HeaderText="员工类别" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                           <f:RenderField Width="100px" ColumnID="ValidityDate" DataField="ValidityDate" 
+                        <f:RenderField Width="100px" ColumnID="ValidityDate" DataField="ValidityDate"
-                            FieldType="Date" Renderer="Date"  HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="Date" Renderer="Date" HeaderText="合同有效期" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                         <f:TemplateField Width="60px" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField Width="60px" ColumnID="tfIsPost" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsOrNo(Eval("IsPost")) %>'></asp:Label>
                             </ItemTemplate>
@@ -99,6 +106,51 @@
                         <f:RenderField Width="100px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
                             FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="IntoDate" DataField="IntoDate" Hidden="true"
+                            FieldType="Date" Renderer="Date" HeaderText="入院时间" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WorkDate" DataField="WorkDate" Hidden="true"
+                            FieldType="Date" Renderer="Date" HeaderText="参加工作时间" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="RetirementDate" DataField="RetirementDate" Hidden="true"
+                            FieldType="Date" Renderer="Date" HeaderText="退休日期" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PositionName" DataField="PositionName" Hidden="true"
+                            FieldType="String" HeaderText="职务" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PostTitleName" DataField="PostTitleName" Hidden="true"
+                            FieldType="String" HeaderText="职称" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PostTitleDate" DataField="PostTitleDate" Hidden="true"
+                            FieldType="Date" Renderer="Date" HeaderText="职称取得时间" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Graduate" DataField="Graduate" Hidden="true"
+                            FieldType="String" HeaderText="毕业院校" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="ForeignLanguage" DataField="ForeignLanguage" Hidden="true"
+                            FieldType="String" HeaderText="外语能力" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField Width="100px" ColumnID="tfNativePlace" HeaderText="籍贯" Hidden="true"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lbNativePlace" runat="server" Text='<%# ConvertNativePlace(Eval("PersonId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="100px" ColumnID="NationName" DataField="NationName" Hidden="true"
+                            FieldType="String" HeaderText="民族" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PoliticsStatusName" DataField="PoliticsStatusName" Hidden="true"
+                            FieldType="String" HeaderText="政治面貌" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MaritalStatusName" DataField="MaritalStatusName" Hidden="true"
+                            FieldType="String" HeaderText="婚姻状况" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="RelativeName" DataField="RelativeName" Hidden="true"
+                            FieldType="String" HeaderText="亲属姓名" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="RelativeTel" DataField="RelativeTel" Hidden="true"
+                            FieldType="String" HeaderText="亲属电话" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:TemplateField Width="50px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <div class="action btncontainer"></div>
@@ -175,26 +227,26 @@
                 type: 'menuitem', text: '编辑', icon: '../res/icon/pencil.png',
                 handler: function () {
                     var rowData = getRowDataViaMenuItem(this);
-                    __doPostBack('', 'editit$Action1$' + rowData.index + '$' + rowData.id );
+                    __doPostBack('', 'editit$Action1$' + rowData.index + '$' + rowData.id);
                 }
             }, {
-                type: 'menuitem', text: '人员详情', icon:  '../res/icon/folder_user.png',
+                type: 'menuitem', text: '人员详情', icon: '../res/icon/folder_user.png',
                 handler: function () {
                     var rowData = getRowDataViaMenuItem(this);
-                    __doPostBack('', 'details$Action2$' + rowData.index + '$' + rowData.id );
+                    __doPostBack('', 'details$Action2$' + rowData.index + '$' + rowData.id);
                 }
             }, {
-                    type: 'menuitem', text: '重置密码', icon: '../res/icon/arrow_refresh.png',
+                type: 'menuitem', text: '重置密码', icon: '../res/icon/arrow_refresh.png',
                 handler: function () {
                     var rowData = getRowDataViaMenuItem(this);
-                    __doPostBack('', 'reset$Action3$' + rowData.index + '$' + rowData.id );
+                    __doPostBack('', 'reset$Action3$' + rowData.index + '$' + rowData.id);
                 }
             }
                 , {
-                    type: 'menuitem', text: '工资详情', icon: '../res/icon/table_multiple.png',
+                type: 'menuitem', text: '工资详情', icon: '../res/icon/table_multiple.png',
                 handler: function () {
                     var rowData = getRowDataViaMenuItem(this);
-                    __doPostBack('', 'salary$Action4$' + rowData.index + '$' + rowData.id );
+                    __doPostBack('', 'salary$Action4$' + rowData.index + '$' + rowData.id);
                 }
             }]
         });

SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs

@@ -1,6 +1,7 @@
 using BLL;
 using System;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Person
 {
@@ -256,5 +257,24 @@ namespace FineUIPro.Web.Person
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonView.aspx?PersonId={0}", Grid1.SelectedRowID, "查看 - ")));
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("部门人员列表" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/Person/DepartPerson.aspx.designer.cs

@@ -131,6 +131,24 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
         /// <summary>
         /// lbSex 控件。
         /// </summary>
@@ -141,13 +159,13 @@ namespace FineUIPro.Web.Person
         protected global::System.Web.UI.WebControls.Label lbSex;
 
         /// <summary>
-        /// Label1 控件。
+        /// lbAge 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label1;
+        protected global::System.Web.UI.WebControls.Label lbAge;
 
         /// <summary>
         /// lbIsPost 控件。
@@ -158,6 +176,15 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbIsPost;
 
+        /// <summary>
+        /// lbNativePlace 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbNativePlace;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>

SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs

@@ -88,7 +88,7 @@ namespace FineUIPro.Web.Person
                 }
             }
 
-            if (this.CurrUser.PersonId == Const.hfnbdId)
+            if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId)
             {
                 this.btnIDCard.Hidden = false;
             }
@@ -243,6 +243,8 @@ namespace FineUIPro.Web.Person
         protected void btnIDCard_Click(object sender, EventArgs e)
         {
             int countRecod = 0;
+            int pCountRecod = 0;
+            string info=string.Empty;
             var getPerson = (from x in Funs.DB.Person_Persons 
                              where x.IdentityCard != null && x.IdentityCard.Length > 1 && !x.Birthday.HasValue && x.IsCardNoOK.Value
                              select x).Take(1000);
@@ -264,7 +266,19 @@ namespace FineUIPro.Web.Person
                 Funs.DB.SubmitChanges();
                 countRecod++;
             }
-            Alert.ShowInTop("操作完成，共处理" + countRecod.ToString() + "条人员信息", MessageBoxIcon.Success);
+            info = "操作完成，共处理人员按身份证设置年龄" + countRecod.ToString() + "条。";
+        
+            var getPPersons = (from x in Funs.DB.SitePerson_Person
+                               join y in Funs.DB.Person_Persons on x.PersonId equals y.PersonId
+                               where x.States == Const.ProjectPersonStates_1 && y.CurrentProjectId == null
+                               select x).Take(1000);
+            foreach (var pitem in getPPersons)
+            {
+                SitePerson_PersonItemService.SetPersonItemInOut(pitem);
+                pCountRecod++;
+            }
+
+            info+= "共处理人员所在当前项目取值" + pCountRecod.ToString() + "条。";
         }
     }
 }

SGGL/FineUIPro.Web/common/PageBase.cs

@@ -1196,7 +1196,10 @@ namespace FineUIPro.Web
 
             foreach (GridColumn column in grid.Columns)
             {
-                sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                if (column.ColumnID != "Actions" && !column.Hidden)
+                {
+                    sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                }
             }
             sb.Append("</tr>");
             foreach (GridRow row in grid.Rows)
@@ -1204,41 +1207,60 @@ namespace FineUIPro.Web
                 sb.Append("<tr>");
                 foreach (GridColumn column in grid.Columns)
                 {
-                    string html = row.Values[column.ColumnIndex].ToString();
+                    if (column.ColumnID != "Actions" && !column.Hidden)
-                    if (column.ColumnID == "tfNumber" && (row.FindControl("labNumber") as AspNet.Label) != null)
                     {
-                        html = (row.FindControl("labNumber") as AspNet.Label).Text;
+                        string html = row.Values[column.ColumnIndex].ToString();
-                    }
+                        if (column.ColumnID == "tfNumber" && (row.FindControl("labNumber") as AspNet.Label) != null)
-                    if (column.ColumnID == "tfTeamType" && (row.FindControl("lbTeamType") as AspNet.Label) != null)
-                    {
-                        html = (row.FindControl("lbTeamType") as AspNet.Label).Text;
-                    }
-                    if (column.ColumnID == "tfI" && (row.FindControl("tfI") as AspNet.Label) != null)
-                    {
-                        html = (row.FindControl("lbI") as AspNet.Label).Text;
-                    }
-                    if (column.ColumnID == "tfCompileMan" && (row.FindControl("tfCompileMan") as AspNet.Label) != null)
-                    {
-                        html = (row.FindControl("lblCompileMan") as AspNet.Label).Text;
-                    }
-                    if (column.ColumnID == "tfSpecialEquipmentId")
-                    {
-                        html = (row.FindControl("lblSpecialEquipmentId") as AspNet.Label).Text;
-                    }
-                    // 处理CheckBox
-                    if (html.Contains("f-grid-static-checkbox"))
-                    {
-                        if (!html.Contains("f-checked"))
                         {
-                            html = "×";
+                            html = (row.FindControl("labNumber") as AspNet.Label).Text;
                         }
-                        else
+                        if (column.ColumnID == "tfNumber" && (row.FindControl("lblNumber") as AspNet.Label) != null)
                         {
-                            html = "√";
+                            html = (row.FindControl("lblNumber") as AspNet.Label).Text;
                         }
+                        if (column.ColumnID == "tfTeamType" && (row.FindControl("lbTeamType") as AspNet.Label) != null)
+                        {
+                            html = (row.FindControl("lbTeamType") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfI" && (row.FindControl("lbI") as AspNet.Label) != null)
+                        {
+                            html = (row.FindControl("lbI") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfCompileMan" && (row.FindControl("lblCompileMan") as AspNet.Label) != null)
+                        {
+                            html = (row.FindControl("lblCompileMan") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfSpecialEquipmentId" && (row.FindControl("lblSpecialEquipmentId") as AspNet.Label) != null)
+                        {
+                            html = (row.FindControl("lblSpecialEquipmentId") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfSex" && (row.FindControl("lbSex") as AspNet.Label) != null)
+                        {
+                            html = (row.FindControl("lbSex") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfAge" && (row.FindControl("lbAge") as AspNet.Label) != null)
+                        {
+                            html = (row.FindControl("lbAge") as AspNet.Label).Text;
+                        }
+                        if (column.ColumnID == "tfIsPost" && (row.FindControl("lbIsPost") as AspNet.Label) != null)
+                        {
+                            html = (row.FindControl("lbIsPost") as AspNet.Label).Text;
+                        }
+                        // 处理CheckBox
+                        if (html.Contains("f-grid-static-checkbox"))
+                        {
+                            if (!html.Contains("f-checked"))
+                            {
+                                html = "×";
+                            }
+                            else
+                            {
+                                html = "√";
+                            }
+                        }
+                        sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
+                        //   sb.AppendFormat("<td>{0}</td>", html);
                     }
-                    sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
-                    //   sb.AppendFormat("<td>{0}</td>", html);
                 }
 
                 sb.Append("</tr>");