20221025人员分流列表展示

SGGL/BLL/Person/Person_ShuntService.cs

@@ -80,15 +80,16 @@ namespace BLL
                        x.DepartId,
                        x.WorkPostId,
                        WorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId),
+                       x.Major,
                        x.PostTitleId,
                        PostTitleName = PostTitleService.getPostTitleNameById(x.PostTitleId),
                        x.IsOffice,
                        x.RoleIds,
                        RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
                        x.CurrentProjectId,
-                       CurrentProjectName = db.Base_Project.First(u => u.ProjectId == x.CurrentProjectId).ShortName,
+                       LastProjectName = getCurrentProjectName(x.PersonId),
                        x.CurrentProjectWorkPostId,
-                       CurrentProjectWorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.CurrentProjectWorkPostId),
+                      LastWorkPostName = getCurrentProjectWorkPostName(x.PersonId),
                        IsPost = x.IsPost ?? true,
                        IsPostName = x.IsPost == false ? "否" : "是",
                        x.SignatureUrl,
@@ -97,6 +98,51 @@ namespace BLL
         }
         #endregion
 
+        #region 获取当前项目及岗位
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ProjectId"></param>
+        /// <param name="PersonId"></param>
+        /// <returns></returns>
+        public static string getCurrentProjectName(string PersonId)
+        {
+            var getItem = (from x in Funs.DB.SitePerson_PersonItem where x.PersonId == PersonId 
+                          orderby x.InTime descending
+                          select x).FirstOrDefault();
+            if (getItem != null)
+            {
+                return ProjectService.GetShortNameByProjectId(getItem.ProjectId);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="WorkPostId"></param>
+        /// <param name="PersonId"></param>
+        /// <returns></returns>
+        public static string getCurrentProjectWorkPostName(string PersonId)
+        {
+            var getItem = (from x in Funs.DB.SitePerson_PersonItem
+                           where x.PersonId == PersonId
+                           orderby x.InTime descending
+                           select x).FirstOrDefault();
+            if (getItem != null)
+            {
+                return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId);
+            }
+            else
+            {
+                return null;
+            }
+        }
+        #endregion
+
         /// <summary>
         /// 添加分流管理
         /// </summary>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -12228,9 +12228,8 @@
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
-          <DevelopmentServerVPath>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          </DevelopmentServerVPath>
+          <IISUrl>http://localhost:14901/</IISUrl>
-          <IISUrl>http://localhost:8008/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

SGGL/FineUIPro.Web/Person/DepartPersonShunt.aspx

@@ -71,6 +71,9 @@
                         <f:CheckBoxField Width="60px" SortField="IsPost" RenderAsStaticField="true" DataField="IsPost"
                             HeaderText="在职" HeaderTextAlign="Center" TextAlign="Center">
                         </f:CheckBoxField>
+                          <f:RenderField Width="100px" ColumnID="Major" DataField="Major"
+                            FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
                             FieldType="String" HeaderText="岗位" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
@@ -86,12 +89,15 @@
                         <f:RenderField Width="90px" ColumnID="IsPostName" DataField="IsPostName"
                             FieldType="String" HeaderText="是否在职" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <%--  <f:RenderField Width="150px" ColumnID="CurrentProjectName" DataField="CurrentProjectName" SortField="CurrentProjectName"
+                          <f:RenderField Width="150px" ColumnID="LastProjectName" DataField="LastProjectName" SortField="LastProjectName"
-                            FieldType="String" HeaderText="当前所在项目" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="最近所在项目" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="130px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
+                        <f:RenderField Width="130px" ColumnID="LastWorkPostName" DataField="LastWorkPostName"
-                            FieldType="String" HeaderText="当前项目岗位" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="最近项目岗位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>--%>
+                        </f:RenderField>
+                           <f:WindowField TextAlign="Left" Width="80px" WindowID="Window1" HeaderText="详细信息"
+                            Text="查看" ToolTip="人员详细信息查看" DataIFrameUrlFields="PersonId" DataIFrameUrlFormatString="PersonView.aspx?PersonId={0}"
+                            HeaderTextAlign="Center" />
                         <%-- <f:RenderField Width="100px" ColumnID="WorkPost" DataField="WorkPost" FieldType="String"
                             HeaderText="拟聘岗位" HeaderTextAlign="Center">
                             <Editor>