调整用户管理字段

代码/System.Model/T_Sys_UserAccount.cs

@@ -109,6 +109,27 @@ namespace System.Model
         public string F_WxOpenId { get; set; }
 
         /// <summary>
+        /// 职位id
+        /// </summary>
+        public int? F_DutyId { get; set; }
+        /// <summary>
+        /// 团队id
+        /// </summary>
+        public int? F_DeptTeamId { get; set; }
+        /// <summary>
+        /// 入职日期
+        /// </summary>
+        public DateTime? F_EntryDate { get; set; }
+        /// <summary>
+        /// 转正日期
+        /// </summary>
+        public DateTime? F_FullDate { get; set; }
+        /// <summary>
+        /// 离职日期
+        /// </summary>
+        public DateTime? F_TermDate { get; set; }
+
+        /// <summary>
         /// 添加工号
         /// </summary>
         public string F_CreateBy { get; set; }

代码/System.Model/V_UserAccount.cs

@@ -111,6 +111,29 @@ namespace System.Model
         public string F_WxOpenId { get; set; }
 
         /// <summary>
+        /// 职位id
+        /// </summary>
+        public int? F_DutyId { get; set; }
+        public string F_Duty { get; set; }
+        /// <summary>
+        /// 团队id
+        /// </summary>
+        public int? F_DeptTeamId { get; set; }
+        public string F_DeptTeam { get; set; }
+        /// <summary>
+        /// 入职日期
+        /// </summary>
+        public DateTime? F_EntryDate { get; set; }
+        /// <summary>
+        /// 转正日期
+        /// </summary>
+        public DateTime? F_FullDate { get; set; }
+        /// <summary>
+        /// 离职日期
+        /// </summary>
+        public DateTime? F_TermDate { get; set; }
+
+        /// <summary>
         /// 添加工号
         /// </summary>
         public string F_CreateBy { get; set; }

代码/System.Repositories/Sys_UserAccountRepository.cs

@@ -22,6 +22,10 @@ namespace System.Repositories
 
             var seatlist= await Db.Queryable<T_Sys_SeatGroup>().With(SqlWith.NoLock).Where(c => c.F_State == (int)EnumDelState.Enabled).ToListAsync();
 
+            var deptteamlist=await Db.Queryable<T_Sys_DeptTeam>().With(SqlWith.NoLock).Where(c => c.F_State == (int)EnumDelState.Enabled).ToListAsync();
+            
+            var positionlist= await Db.Queryable<T_Sys_Position>().With(SqlWith.NoLock).Where(c => c.F_State == (int)EnumDelState.Enabled).ToListAsync();
+
             var list = new List<V_UserAccount>();
             foreach (var item in userlist)
             {
@@ -39,8 +43,16 @@ namespace System.Repositories
                 if (seatmodel != null)
                     newmodel.F_SeartGroup = seatmodel.F_ZXZName;
 
+                var deptteammodel = deptteamlist.Find(a => a.F_Id == item.F_DeptTeamId);
+                if (deptteammodel != null)
+                    newmodel.F_DeptTeam = deptteammodel.F_Name;
+
+                var positionmodel = positionlist.Find(a => a.F_Id == item.F_DutyId);
+                if (positionmodel != null)
+                    newmodel.F_Duty = positionmodel.F_Name;
+
                 list.Add(newmodel);
-            }            
+            }           
             PageData<V_UserAccount> pd = new PageData<V_UserAccount>();
             pd.Rows = list;
             pd.Totals = pagemodel.PageCount;

代码/TVShoppingCallCenter_ZLJ/Controllers/System/UserAccountController.cs

@@ -151,6 +151,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers
             model.F_HomePhone = input.remark;
             model.F_WxOpenId = "";
 
+            model.F_DutyId = input.dutyid;
+            model.F_DeptTeamId = input.deptteamid;
+            model.F_EntryDate = input.entrydate;
+            model.F_FullDate = input.fulldate;
+            model.F_TermDate = input.termdate;
+
             model.F_DeleteFlag = (int)EnumUserCountState.Enabled;
             model.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             model.F_CreateOn = DateTime.Now;
@@ -200,6 +206,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers
             model.F_Mobile = input.mobile;
             model.F_HomePhone = input.homephone;
 
+            model.F_DutyId = input.dutyid;
+            model.F_DeptTeamId = input.deptteamid;
+            model.F_EntryDate = input.entrydate;
+            model.F_FullDate = input.fulldate;
+            model.F_TermDate = input.termdate;
+
             model.F_LastModifyBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             model.F_LastModifyOn = DateTime.Now;
 

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/System/UserAccountInput.cs

@@ -83,5 +83,26 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         /// 外线号码
         /// </summary>
         public string wxno { get; set; }
+
+        /// <summary>
+        /// 职位id
+        /// </summary>
+        public int dutyid { get; set; }
+        /// <summary>
+        /// 团队id
+        /// </summary>
+        public int deptteamid { get; set; }
+        /// <summary>
+        /// 入职日期
+        /// </summary>
+        public DateTime entrydate { get; set; }
+        /// <summary>
+        /// 转正日期
+        /// </summary>
+        public DateTime fulldate { get; set; }
+        /// <summary>
+        /// 离职日期
+        /// </summary>
+        public DateTime termdate { get; set; }
     }
 }