Quellcode durchsuchen

调整用户管理字段

zhengbingbing vor 5 Jahren
Ursprung
Commit
8f11bceae8

+ 21 - 0
代码/System.Model/T_Sys_UserAccount.cs

109
         public string F_WxOpenId { get; set; }
109
         public string F_WxOpenId { get; set; }
110
 
110
 
111
         /// <summary>
111
         /// <summary>
112
+        /// 职位id
113
+        /// </summary>
114
+        public int? F_DutyId { get; set; }
115
+        /// <summary>
116
+        /// 团队id
117
+        /// </summary>
118
+        public int? F_DeptTeamId { get; set; }
119
+        /// <summary>
120
+        /// 入职日期
121
+        /// </summary>
122
+        public DateTime? F_EntryDate { get; set; }
123
+        /// <summary>
124
+        /// 转正日期
125
+        /// </summary>
126
+        public DateTime? F_FullDate { get; set; }
127
+        /// <summary>
128
+        /// 离职日期
129
+        /// </summary>
130
+        public DateTime? F_TermDate { get; set; }
131
+
132
+        /// <summary>
112
         /// 添加工号
133
         /// 添加工号
113
         /// </summary>
134
         /// </summary>
114
         public string F_CreateBy { get; set; }
135
         public string F_CreateBy { get; set; }

+ 23 - 0
代码/System.Model/V_UserAccount.cs

111
         public string F_WxOpenId { get; set; }
111
         public string F_WxOpenId { get; set; }
112
 
112
 
113
         /// <summary>
113
         /// <summary>
114
+        /// 职位id
115
+        /// </summary>
116
+        public int? F_DutyId { get; set; }
117
+        public string F_Duty { get; set; }
118
+        /// <summary>
119
+        /// 团队id
120
+        /// </summary>
121
+        public int? F_DeptTeamId { get; set; }
122
+        public string F_DeptTeam { get; set; }
123
+        /// <summary>
124
+        /// 入职日期
125
+        /// </summary>
126
+        public DateTime? F_EntryDate { get; set; }
127
+        /// <summary>
128
+        /// 转正日期
129
+        /// </summary>
130
+        public DateTime? F_FullDate { get; set; }
131
+        /// <summary>
132
+        /// 离职日期
133
+        /// </summary>
134
+        public DateTime? F_TermDate { get; set; }
135
+
136
+        /// <summary>
114
         /// 添加工号
137
         /// 添加工号
115
         /// </summary>
138
         /// </summary>
116
         public string F_CreateBy { get; set; }
139
         public string F_CreateBy { get; set; }

+ 13 - 1
代码/System.Repositories/Sys_UserAccountRepository.cs

22
 
22
 
23
             var seatlist= await Db.Queryable<T_Sys_SeatGroup>().With(SqlWith.NoLock).Where(c => c.F_State == (int)EnumDelState.Enabled).ToListAsync();
23
             var seatlist= await Db.Queryable<T_Sys_SeatGroup>().With(SqlWith.NoLock).Where(c => c.F_State == (int)EnumDelState.Enabled).ToListAsync();
24
 
24
 
25
+            var deptteamlist=await Db.Queryable<T_Sys_DeptTeam>().With(SqlWith.NoLock).Where(c => c.F_State == (int)EnumDelState.Enabled).ToListAsync();
26
+            
27
+            var positionlist= await Db.Queryable<T_Sys_Position>().With(SqlWith.NoLock).Where(c => c.F_State == (int)EnumDelState.Enabled).ToListAsync();
28
+
25
             var list = new List<V_UserAccount>();
29
             var list = new List<V_UserAccount>();
26
             foreach (var item in userlist)
30
             foreach (var item in userlist)
27
             {
31
             {
39
                 if (seatmodel != null)
43
                 if (seatmodel != null)
40
                     newmodel.F_SeartGroup = seatmodel.F_ZXZName;
44
                     newmodel.F_SeartGroup = seatmodel.F_ZXZName;
41
 
45
 
46
+                var deptteammodel = deptteamlist.Find(a => a.F_Id == item.F_DeptTeamId);
47
+                if (deptteammodel != null)
48
+                    newmodel.F_DeptTeam = deptteammodel.F_Name;
49
+
50
+                var positionmodel = positionlist.Find(a => a.F_Id == item.F_DutyId);
51
+                if (positionmodel != null)
52
+                    newmodel.F_Duty = positionmodel.F_Name;
53
+
42
                 list.Add(newmodel);
54
                 list.Add(newmodel);
43
-            }            
55
+            }           
44
             PageData<V_UserAccount> pd = new PageData<V_UserAccount>();
56
             PageData<V_UserAccount> pd = new PageData<V_UserAccount>();
45
             pd.Rows = list;
57
             pd.Rows = list;
46
             pd.Totals = pagemodel.PageCount;
58
             pd.Totals = pagemodel.PageCount;

+ 12 - 0
代码/TVShoppingCallCenter_ZLJ/Controllers/System/UserAccountController.cs

151
             model.F_HomePhone = input.remark;
151
             model.F_HomePhone = input.remark;
152
             model.F_WxOpenId = "";
152
             model.F_WxOpenId = "";
153
 
153
 
154
+            model.F_DutyId = input.dutyid;
155
+            model.F_DeptTeamId = input.deptteamid;
156
+            model.F_EntryDate = input.entrydate;
157
+            model.F_FullDate = input.fulldate;
158
+            model.F_TermDate = input.termdate;
159
+
154
             model.F_DeleteFlag = (int)EnumUserCountState.Enabled;
160
             model.F_DeleteFlag = (int)EnumUserCountState.Enabled;
155
             model.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
161
             model.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
156
             model.F_CreateOn = DateTime.Now;
162
             model.F_CreateOn = DateTime.Now;
200
             model.F_Mobile = input.mobile;
206
             model.F_Mobile = input.mobile;
201
             model.F_HomePhone = input.homephone;
207
             model.F_HomePhone = input.homephone;
202
 
208
 
209
+            model.F_DutyId = input.dutyid;
210
+            model.F_DeptTeamId = input.deptteamid;
211
+            model.F_EntryDate = input.entrydate;
212
+            model.F_FullDate = input.fulldate;
213
+            model.F_TermDate = input.termdate;
214
+
203
             model.F_LastModifyBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
215
             model.F_LastModifyBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
204
             model.F_LastModifyOn = DateTime.Now;
216
             model.F_LastModifyOn = DateTime.Now;
205
 
217
 

+ 21 - 0
代码/TVShoppingCallCenter_ZLJ/Models/Inputs/System/UserAccountInput.cs

83
         /// 外线号码
83
         /// 外线号码
84
         /// </summary>
84
         /// </summary>
85
         public string wxno { get; set; }
85
         public string wxno { get; set; }
86
+
87
+        /// <summary>
88
+        /// 职位id
89
+        /// </summary>
90
+        public int dutyid { get; set; }
91
+        /// <summary>
92
+        /// 团队id
93
+        /// </summary>
94
+        public int deptteamid { get; set; }
95
+        /// <summary>
96
+        /// 入职日期
97
+        /// </summary>
98
+        public DateTime entrydate { get; set; }
99
+        /// <summary>
100
+        /// 转正日期
101
+        /// </summary>
102
+        public DateTime fulldate { get; set; }
103
+        /// <summary>
104
+        /// 离职日期
105
+        /// </summary>
106
+        public DateTime termdate { get; set; }
86
     }
107
     }
87
 }
108
 }

BIN
文档/开发文档/数据库设计说明书V1.0.0_郑兵兵 .doc