20221009部门人员当前项目取值来源工作经历。修改在职离职。

2022-10-09 10:41:41 +08:00
parent b1416ebf7e
commit 6533db1bfc
6 changed files with 73 additions and 9 deletions
@@ -138,8 +138,8 @@
        public static ListItem[] IsPostDropList()
        {
            ListItem[] lis = new ListItem[2];
-            lis[0] = new ListItem("在岗", BLL.Const._True);
-            lis[1] = new ListItem("离岗", BLL.Const._False);
+            lis[0] = new ListItem("在职", BLL.Const._True);
+            lis[1] = new ListItem("离职", BLL.Const._False);
            return lis;
        }
        #endregion
@@ -112,9 +112,9 @@ namespace BLL
                       x.RoleIds,
                       RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
                       x.CurrentProjectId,
-                       CurrentProjectName = db.Base_Project.First(u => u.ProjectId == x.CurrentProjectId).ShortName,
+                       CurrentProjectName = getCurrentProjectName(x.PersonId),
                       x.CurrentProjectWorkPostId,
-                       CurrentProjectWorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.CurrentProjectWorkPostId),
+                       CurrentProjectWorkPostName = getCurrentProjectWorkPostName(x.PersonId),
                       IsPost = x.IsPost ?? true,
                       x.SignatureUrl,
                       x.Address,
@@ -139,7 +139,47 @@ namespace BLL
                   };
        }
        #endregion
-               
+
+        #region 获取当前项目及岗位
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ProjectId"></param>
+        /// <param name="PersonId"></param>
+        /// <returns></returns>
+        public static string getCurrentProjectName(string PersonId)
+        {
+            var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+            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 = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+            if (getItem != null)
+            {
+                return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId);
+            }
+            else
+            {
+                return null;
+            }
+        }
+        #endregion
+
        #region 根据主键获取人员信息
        /// <summary>
        /// 根据主键获取人员信息