Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

2022-10-25 22:30:36 +08:00
parent 5fc76eec1a 83aeb54d69
commit 2e6d599f63
3 changed files with 61 additions and 10 deletions
@@ -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>