Quellcode durchsuchen

五院文档里改的

liyuanyuan vor 3 Jahren
Ursprung
Commit
403d8838ec

+ 7 - 0
RMYY_CallCenter_Api.Bll/T_Sys_UserAccount.cs

@@ -57,6 +57,13 @@ namespace RMYY_CallCenter_Api.Bll
57 57
             return dal.DeleteList(F_UserIdlist);
58 58
         }
59 59
 
60
+        public bool DeleteFlagList(string F_UserIdlist, int state) {
61
+
62
+            CacheHelper.RemoveContain("User_");
63
+            return dal.DeleteFlagList(F_UserIdlist,state);
64
+        }
65
+
66
+
60 67
         /// <summary>
61 68
         /// 得到一个对象实体
62 69
         /// </summary>

+ 18 - 6
RMYY_CallCenter_Api.Dal/T_Cus_Customer.cs

@@ -38,9 +38,9 @@ namespace RMYY_CallCenter_Api.Dal
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40 40
             strSql.Append("insert into T_Cus_Customer(");
41
-            strSql.Append("F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark)");
41
+            strSql.Append("F_CustomerName,F_CustomerCode,F_Layer,F_Province,F_City,F_County,F_Address,F_Telephone,F_Mobile,F_Fax,F_Email,F_PostCode,F_Sex,F_IdCard,F_CreateBy,F_CreatedOn,F_ModifyBy,F_ModifiedOn,F_DeleteFlag,F_DeleteBy,F_DeleteOn,F_Remark,F_AboutLinkMan)");
42 42
             strSql.Append(" values (");
43
-            strSql.Append("@F_CustomerName,@F_CustomerCode,@F_Layer,@F_Province,@F_City,@F_County,@F_Address,@F_Telephone,@F_Mobile,@F_Fax,@F_Email,@F_PostCode,@F_Sex,@F_IdCard,@F_CreateBy,@F_CreatedOn,@F_ModifyBy,@F_ModifiedOn,@F_DeleteFlag,@F_DeleteBy,@F_DeleteOn,@F_Remark)");
43
+            strSql.Append("@F_CustomerName,@F_CustomerCode,@F_Layer,@F_Province,@F_City,@F_County,@F_Address,@F_Telephone,@F_Mobile,@F_Fax,@F_Email,@F_PostCode,@F_Sex,@F_IdCard,@F_CreateBy,@F_CreatedOn,@F_ModifyBy,@F_ModifiedOn,@F_DeleteFlag,@F_DeleteBy,@F_DeleteOn,@F_Remark,@F_AboutLinkMan)");
44 44
             strSql.Append(";select @@IDENTITY");
45 45
             SqlParameter[] parameters = {
46 46
                     new SqlParameter("@F_CustomerName", SqlDbType.NVarChar,200),
@@ -64,7 +64,10 @@ namespace RMYY_CallCenter_Api.Dal
64 64
                     new SqlParameter("@F_DeleteFlag", SqlDbType.SmallInt,2),
65 65
                     new SqlParameter("@F_DeleteBy", SqlDbType.VarChar,50),
66 66
                     new SqlParameter("@F_DeleteOn", SqlDbType.DateTime),
67
-                    new SqlParameter("@F_Remark", SqlDbType.NText)};
67
+                    new SqlParameter("@F_Remark", SqlDbType.NText),
68
+                      new SqlParameter("@F_AboutLinkMan", SqlDbType.VarChar,100)
69
+                    
70
+            };
68 71
             parameters[0].Value = model.F_CustomerName;
69 72
             parameters[1].Value = model.F_CustomerCode;
70 73
             parameters[2].Value = model.F_Layer;
@@ -87,7 +90,8 @@ namespace RMYY_CallCenter_Api.Dal
87 90
             parameters[19].Value = model.F_DeleteBy;
88 91
             parameters[20].Value = model.F_DeleteOn;
89 92
             parameters[21].Value = model.F_Remark;
90
-
93
+            parameters[22].Value = model.F_AboutLinkMan;
94
+            
91 95
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
92 96
             if (obj == null)
93 97
             {
@@ -126,7 +130,10 @@ namespace RMYY_CallCenter_Api.Dal
126 130
             strSql.Append("F_DeleteFlag=@F_DeleteFlag,");
127 131
             strSql.Append("F_DeleteBy=@F_DeleteBy,");
128 132
             strSql.Append("F_DeleteOn=@F_DeleteOn,");
129
-            strSql.Append("F_Remark=@F_Remark");
133
+            strSql.Append("F_Remark=@F_Remark,");
134
+            strSql.Append("F_AboutLinkMan=@F_AboutLinkMan");
135
+            
136
+
130 137
             strSql.Append(" where F_CustomerId=@F_CustomerId");
131 138
             SqlParameter[] parameters = {
132 139
                     new SqlParameter("@F_CustomerName", SqlDbType.NVarChar,200),
@@ -151,6 +158,9 @@ namespace RMYY_CallCenter_Api.Dal
151 158
                     new SqlParameter("@F_DeleteBy", SqlDbType.VarChar,50),
152 159
                     new SqlParameter("@F_DeleteOn", SqlDbType.DateTime),
153 160
                     new SqlParameter("@F_Remark", SqlDbType.NText),
161
+                      new SqlParameter("@F_AboutLinkMan", SqlDbType.VarChar,100),
162
+                    
163
+
154 164
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)};
155 165
             parameters[0].Value = model.F_CustomerName;
156 166
             parameters[1].Value = model.F_CustomerCode;
@@ -174,7 +184,9 @@ namespace RMYY_CallCenter_Api.Dal
174 184
             parameters[19].Value = model.F_DeleteBy;
175 185
             parameters[20].Value = model.F_DeleteOn;
176 186
             parameters[21].Value = model.F_Remark;
177
-            parameters[22].Value = model.F_CustomerId;
187
+            parameters[22].Value = model.F_AboutLinkMan;
188
+            
189
+            parameters[23].Value = model.F_CustomerId;
178 190
 
179 191
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
180 192
             if (rows > 0)

+ 30 - 5
RMYY_CallCenter_Api.Dal/T_Sys_Department.cs

@@ -38,9 +38,9 @@ namespace RMYY_CallCenter_Api.Dal
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40 40
             strSql.Append("insert into T_Sys_Department(");
41
-            strSql.Append("F_ParentId,F_DeptCode,F_DeptName,F_Sort,F_Remark,F_State,F_CreateUser,F_CreateTime,T_Woid)");
41
+            strSql.Append("F_ParentId,F_DeptCode,F_DeptName,F_Sort,F_Remark,F_State,F_CreateUser,F_CreateTime,T_Woid,  F_Location,F_FloorDistribution,F_OfficeTelephone)");
42 42
             strSql.Append(" values (");
43
-            strSql.Append("@F_ParentId,@F_DeptCode,@F_DeptName,@F_Sort,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@T_Woid)");
43
+            strSql.Append("@F_ParentId,@F_DeptCode,@F_DeptName,@F_Sort,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@T_Woid,  @F_Location,@F_FloorDistribution,@F_OfficeTelephone)");
44 44
             strSql.Append(";select @@IDENTITY");
45 45
             SqlParameter[] parameters = {
46 46
                     new SqlParameter("@F_ParentId", SqlDbType.Int,4),
@@ -51,7 +51,13 @@ namespace RMYY_CallCenter_Api.Dal
51 51
                     new SqlParameter("@F_State", SqlDbType.Int,4),
52 52
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
53 53
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
54
-                    new SqlParameter("@T_Woid", SqlDbType.Int,4)};
54
+                    new SqlParameter("@T_Woid", SqlDbType.Int,4),
55
+                    new SqlParameter("@F_Location", SqlDbType.NVarChar,255),
56
+                    new SqlParameter("@F_FloorDistribution", SqlDbType.NVarChar,255),
57
+                    new SqlParameter("@F_OfficeTelephone", SqlDbType.NVarChar,50)
58
+
59
+
60
+            };
55 61
             parameters[0].Value = model.F_ParentId;
56 62
             parameters[1].Value = model.F_DeptCode;
57 63
             parameters[2].Value = model.F_DeptName;
@@ -62,6 +68,10 @@ namespace RMYY_CallCenter_Api.Dal
62 68
             parameters[7].Value = model.F_CreateTime;
63 69
             parameters[8].Value = model.T_Woid;
64 70
 
71
+            parameters[9].Value = model.F_Location;
72
+            parameters[10].Value = model.F_FloorDistribution;
73
+            parameters[11].Value = model.F_OfficeTelephone;
74
+
65 75
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
66 76
             if (obj == null)
67 77
             {
@@ -87,7 +97,12 @@ namespace RMYY_CallCenter_Api.Dal
87 97
             strSql.Append("F_State=@F_State,");
88 98
             strSql.Append("F_CreateUser=@F_CreateUser,");
89 99
             strSql.Append("F_CreateTime=@F_CreateTime,");
90
-            strSql.Append("T_Woid=@T_Woid");
100
+            strSql.Append("T_Woid=@T_Woid,");
101
+            strSql.Append("F_Location=@F_Location,");
102
+            strSql.Append("F_FloorDistribution=@F_FloorDistribution,");
103
+            strSql.Append("F_OfficeTelephone=@F_OfficeTelephone");
104
+
105
+
91 106
             strSql.Append(" where F_DeptId=@F_DeptId");
92 107
             SqlParameter[] parameters = {
93 108
                     new SqlParameter("@F_ParentId", SqlDbType.Int,4),
@@ -99,6 +114,11 @@ namespace RMYY_CallCenter_Api.Dal
99 114
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
100 115
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
101 116
                     new SqlParameter("@T_Woid", SqlDbType.Int,4),
117
+                       new SqlParameter("@F_Location", SqlDbType.NVarChar,255),
118
+                    new SqlParameter("@F_FloorDistribution", SqlDbType.NVarChar,255),
119
+                    new SqlParameter("@F_OfficeTelephone", SqlDbType.NVarChar,50),
120
+
121
+
102 122
                     new SqlParameter("@F_DeptId", SqlDbType.Int,4)};
103 123
             parameters[0].Value = model.F_ParentId;
104 124
             parameters[1].Value = model.F_DeptCode;
@@ -109,7 +129,12 @@ namespace RMYY_CallCenter_Api.Dal
109 129
             parameters[6].Value = model.F_CreateUser;
110 130
             parameters[7].Value = model.F_CreateTime;
111 131
             parameters[8].Value = model.T_Woid;
112
-            parameters[9].Value = model.F_DeptId;
132
+
133
+            parameters[9].Value = model.F_Location;
134
+            parameters[10].Value = model.F_FloorDistribution;
135
+            parameters[11].Value = model.F_OfficeTelephone;
136
+
137
+            parameters[12].Value = model.F_DeptId;
113 138
 
114 139
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
115 140
             if (rows > 0)

+ 28 - 2
RMYY_CallCenter_Api.Dal/T_Sys_UserAccount.cs

@@ -113,7 +113,10 @@ namespace RMYY_CallCenter_Api.Dal
113 113
             strSql.Append("F_CreateTime=@F_CreateTime,");
114 114
             strSql.Append("F_DeleteFlag=@F_DeleteFlag,");
115 115
             strSql.Append("F_DeleteUser=@F_DeleteUser,");
116
-            strSql.Append("F_DeleteTime=@F_DeleteTime");
116
+            strSql.Append("F_DeleteTime=@F_DeleteTime,");
117
+
118
+            strSql.Append("F_See=@F_See");
119
+
117 120
             strSql.Append(" where F_UserId=@F_UserId");
118 121
             SqlParameter[] parameters = {
119 122
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -134,6 +137,9 @@ namespace RMYY_CallCenter_Api.Dal
134 137
                     new SqlParameter("@F_DeleteFlag", SqlDbType.Int,4),
135 138
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
136 139
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
140
+
141
+                      new SqlParameter("@F_See", SqlDbType.NVarChar,200),
142
+
137 143
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)};
138 144
             parameters[0].Value = model.F_UserCode;
139 145
             parameters[1].Value = model.F_Password;
@@ -153,7 +159,8 @@ namespace RMYY_CallCenter_Api.Dal
153 159
             parameters[15].Value = model.F_DeleteFlag;
154 160
             parameters[16].Value = model.F_DeleteUser;
155 161
             parameters[17].Value = model.F_DeleteTime;
156
-            parameters[18].Value = model.F_UserId;
162
+            parameters[18].Value = model.F_See;
163
+            parameters[19].Value = model.F_UserId;
157 164
 
158 165
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
159 166
             if (rows > 0)
@@ -211,6 +218,25 @@ namespace RMYY_CallCenter_Api.Dal
211 218
 
212 219
 
213 220
         /// <summary>
221
+        /// 批量修改数据 删除标志
222
+        /// </summary>
223
+        public bool DeleteFlagList(string F_UserIdlist,int state )
224
+        {
225
+            StringBuilder strSql = new StringBuilder();
226
+            strSql.Append("update  T_Sys_UserAccount set F_EnableFlag ='" + state+"' ");
227
+            strSql.Append(" where F_UserId in (" + F_UserIdlist + ")  ");
228
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
229
+            if (rows > 0)
230
+            {
231
+                return true;
232
+            }
233
+            else
234
+            {
235
+                return false;
236
+            }
237
+        }
238
+
239
+        /// <summary>
214 240
         /// 得到一个对象实体
215 241
         /// </summary>
216 242
         public RMYY_CallCenter_Api.Model.T_Sys_UserAccount GetModel(int F_UserId)

+ 3 - 3
RMYY_CallCenter_Api.Model/T_Cus_AddressBook.cs

@@ -172,7 +172,7 @@ namespace RMYY_CallCenter_Api.Model
172 172
             get { return _f_isdelete; }
173 173
         }
174 174
         /// <summary>
175
-        /// 
175
+        /// 所在科室
176 176
         /// </summary>
177 177
         public string F_Company
178 178
         {
@@ -180,7 +180,7 @@ namespace RMYY_CallCenter_Api.Model
180 180
             get { return _f_company; }
181 181
         }
182 182
         /// <summary>
183
-        /// 
183
+        /// 部门
184 184
         /// </summary>
185 185
         public string F_Department
186 186
         {
@@ -188,7 +188,7 @@ namespace RMYY_CallCenter_Api.Model
188 188
             get { return _f_department; }
189 189
         }
190 190
         /// <summary>
191
-        /// 
191
+        /// 职务
192 192
         /// </summary>
193 193
         public string F_Position
194 194
         {

+ 9 - 0
RMYY_CallCenter_Api.Model/T_Cus_Customer.cs

@@ -33,6 +33,15 @@ namespace RMYY_CallCenter_Api.Model
33 33
         private DateTime? _f_deleteon;
34 34
         private string _idcard;
35 35
         private string _remark;
36
+
37
+        private string _aboutlinkman;
38
+
39
+        public string F_AboutLinkMan
40
+        {
41
+            set { _aboutlinkman = value; }
42
+            get { return _aboutlinkman; }
43
+        }
44
+
36 45
         /// <summary>
37 46
         /// 自增ID
38 47
         /// </summary>

+ 25 - 0
RMYY_CallCenter_Api.Model/T_Sys_Department.cs

@@ -20,6 +20,11 @@ namespace RMYY_CallCenter_Api.Model
20 20
         private string _f_createuser;
21 21
         private DateTime? _f_createtime;
22 22
         private int? _t_woid;
23
+
24
+        private string _f_location;
25
+        private string _f_floordistribution;
26
+        private string _f_officetelephone;
27
+
23 28
         /// <summary>
24 29
         /// 主键
25 30
         /// </summary>
@@ -101,6 +106,26 @@ namespace RMYY_CallCenter_Api.Model
101 106
             get { return _t_woid; }
102 107
         }
103 108
         #endregion Model
109
+        //新增科室位置、楼层分布、办公电话字段
110
+        public string F_Location
111
+        {
112
+            set { _f_location = value; }
113
+            get { return _f_location; }
114
+        }
115
+
116
+        public string F_FloorDistribution
117
+        {
118
+            set { _f_floordistribution = value; }
119
+            get { return _f_floordistribution; }
120
+        }
121
+
122
+        public string F_OfficeTelephone
123
+        {
124
+            set { _f_officetelephone = value; }
125
+            get { return _f_officetelephone; }
126
+        }
127
+
128
+      
104 129
 
105 130
     }
106 131
 }

+ 7 - 0
RMYY_CallCenter_Api.Model/T_Sys_UserAccount.cs

@@ -36,6 +36,8 @@ namespace RMYY_CallCenter_Api.Model
36 36
         private DateTime? _f_deletetime;
37 37
         private string f_deptName;//部门名称
38 38
         private string f_zXZCode;
39
+
40
+        private string _f_see;
39 41
         /// <summary>
40 42
         /// 主键
41 43
         /// </summary>
@@ -202,6 +204,11 @@ namespace RMYY_CallCenter_Api.Model
202 204
                 set { f_zXZCode = value; }
203 205
                 get { return f_zXZCode; }
204 206
             }//坐席组编码
207
+
208
+        public string F_See {
209
+            set { _f_see = value; }
210
+            get { return _f_see; }
211
+        }
205 212
             #endregion Model
206 213
 
207 214
      }

+ 73 - 1
RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -119,7 +119,30 @@ namespace RMYY_CallCenter_Api.Controllers
119 119
                 iu.Upload();
120 120
                 path = "/Upload/ZXTX/" + iu.OutFileName;
121 121
 
122
-                return Success("成功", path);
122
+                int n = iu.Error;
123
+                if (n == 0)
124
+                {
125
+                    path = "/Upload/ZXTX/" + iu.OutFileName;
126
+
127
+                   User.F_See = path;
128
+                     userAccount.Update(User);
129
+
130
+                    return Success("成功", path);
131
+                }
132
+                else
133
+                {
134
+                    string msg = string.Empty;
135
+                    switch (n)
136
+                    {
137
+                        case 1: msg = "请选择要上传的文件"; break;
138
+                        case 2: msg = "上传的文件类型不支持"; break;
139
+                        case 3: msg = "上传的文件过大"; break;
140
+                        case 4: msg = "未知错误"; break;
141
+                    }
142
+                    return Error(msg);
143
+                }
144
+
145
+              //  return Success("成功", path);
123 146
             }
124 147
             else
125 148
             {
@@ -127,6 +150,55 @@ namespace RMYY_CallCenter_Api.Controllers
127 150
             }
128 151
         }
129 152
 
153
+
154
+
155
+        /// <summary>
156
+        /// 上传用户图片
157
+        /// </summary>
158
+        /// <returns></returns>
159
+        //[Authority]
160
+        //public ActionResult UploadTX64()
161
+        //{
162
+        //    string path = string.Empty;
163
+        //    string dataurl = HttpUtility.UrlDecode(RequestString.GetFormString("dataurl"));
164
+        //    if (!string.IsNullOrEmpty(dataurl))
165
+        //    {
166
+        //        ImageUpload iu = new ImageUpload();
167
+        //        iu.SavePath = "/Upload/ZXTX/";
168
+        //        iu.DataUrl = dataurl;
169
+        //        iu.InFileName = User.F_UserCode + ".jpg";
170
+        //        iu.SaveType = 1;
171
+        //        iu.Upload64();
172
+
173
+        //        int n = iu.Error;
174
+        //        if (n == 0)
175
+        //        {
176
+        //            path = "/Upload/ZXTX/" + iu.OutFileName;
177
+
178
+        //            User.F_See = path;
179
+        //            new BLL.T_Sys_UserAccount().Update(User);
180
+
181
+        //            return Success("成功", path);
182
+        //        }
183
+        //        else
184
+        //        {
185
+        //            string msg = string.Empty;
186
+        //            switch (n)
187
+        //            {
188
+        //                case 1: msg = "请选择要上传的文件"; break;
189
+        //                case 2: msg = "上传的文件类型不支持"; break;
190
+        //                case 3: msg = "上传的文件过大"; break;
191
+        //                case 4: msg = "未知错误"; break;
192
+        //            }
193
+        //            return Error(msg);
194
+        //        }
195
+        //    }
196
+        //    else
197
+        //    {
198
+        //        return Error("请选择要上传的文件");
199
+        //    }
200
+        //}
201
+
130 202
         /// <summary>
131 203
         /// 通话记录数量
132 204
         /// </summary>

+ 14 - 8
RMYY_CallCenter_Api/Controllers/System/AddressBookController.cs

@@ -95,7 +95,8 @@ namespace RMYY_CallCenter_Api.Controllers.System
95 95
         /// 添加/修改通讯录
96 96
         /// </summary>
97 97
         /// <returns></returns>
98
-        public ActionResult SaveInfo( string sex, string remark, string mobile="",string positon="", string depart="", string company="", string elsemobile="", string phone="", string email="", string address="", int id=0)
98
+        public ActionResult SaveInfo(string name, string sex, string remark,string office, string mobile="",string positon="", string depart="", string company="", string elsemobile="", string phone="",  string address="", int id=0)
99
+        //string email="",
99 100
         {
100 101
             Model.T_Cus_AddressBook model = new Model.T_Cus_AddressBook();        
101 102
             //if (string.IsNullOrEmpty(name))
@@ -112,15 +113,17 @@ namespace RMYY_CallCenter_Api.Controllers.System
112 113
             //}
113 114
             if (id == 0)
114 115
             {
116
+                model.F_Name = name;
115 117
                 model.F_Sex = sex;
116 118
                 model.F_Address = address;
117
-                model.F_Email = email;
119
+             //   model.F_Email = email;
118 120
                 model.F_Telephone = phone;
119
-                model.F_Mobile = mobile;
121
+               model.F_Mobile = mobile;
120 122
                 model.F_ElseMobile = elsemobile;
121
-                model.F_Company = company;
123
+               
122 124
                 model.F_Department = depart;
123 125
                 model.F_Position = positon;
126
+                model.F_Company = office;
124 127
                 model.F_Note = remark;
125 128
                 int n = bookbll.Add(model);
126 129
                 if (n > 0)
@@ -137,21 +140,24 @@ namespace RMYY_CallCenter_Api.Controllers.System
137 140
                 model = bookbll.GetModel(id);
138 141
                 if (model != null)
139 142
                 {
140
-                    model.F_Id = id;
141
-                    //model.F_Name = name;
143
+                  //  model.F_Id = id;
144
+                   model.F_Name = name;
142 145
                     model.F_Sex = sex;
146
+                    model.F_Address = address;
143 147
                     //model.F_Birthday = Convert.ToDateTime(F_Birthday);
144 148
                     // model.F_IDCard = F_IDCard;
145 149
                     model.F_Address = address;
146 150
                     //model.F_Education = F_Education;
147
-                    model.F_Email = email;
151
+                  //  model.F_Email = email;
148 152
                     model.F_Telephone = phone;
149 153
                     model.F_Mobile = mobile;
150 154
                     model.F_ElseMobile = elsemobile;
151
-                    model.F_Company = company;
155
+
152 156
                     model.F_Department = depart;
153 157
                     model.F_Position = positon;
158
+                    model.F_Company = office;
154 159
                     model.F_Note = remark;
160
+                    
155 161
                     if (bookbll.Update(model))
156 162
                     {
157 163
                         return Success("修改成功");

+ 4 - 1
RMYY_CallCenter_Api/Controllers/System/CustomerController.cs

@@ -226,8 +226,11 @@ namespace RMYY_CallCenter_Api.Controllers.System
226 226
                     model.F_CustomerName = dr[0].ToString();    //客户姓名
227 227
                     model.F_Sex = dr[1].ToString();   //性别
228 228
                     model.F_Mobile = dr[2].ToString();          //手机号码
229
-                    model.F_Email = dr[3].ToString();           //Email
229
+                     model.F_IdCard = dr[3].ToString();           //身份证号
230 230
                     model.F_Address = dr[4].ToString();      //地址
231
+                    model.F_AboutLinkMan = dr[5].ToString();
232
+                    model.F_Remark = dr[6].ToString();
233
+
231 234
                     model.F_CreateBy = User.F_UserCode;
232 235
                     model.F_CreatedOn = DateTime.Now;
233 236
                     model.F_DeleteFlag = 0;

+ 15 - 6
RMYY_CallCenter_Api/Controllers/System/DepartmentController.cs

@@ -36,7 +36,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
36 36
             date = Bll.PagerBll.GetListPager
37 37
                                 ("T_Sys_Department ",
38 38
                                   "F_DeptId",
39
-                                  "*",
39
+                                  "*,dbo.GetDepartmentName(F_ParentId) departname",
40 40
                                   where,
41 41
                                   "order by F_Sort",
42 42
                                   pagesize,
@@ -45,12 +45,12 @@ namespace RMYY_CallCenter_Api.Controllers.System
45 45
                                   out recordCount
46 46
 
47 47
                                 );
48
-              List<Model.T_Sys_Department> carlist = new Bll.T_Sys_Department().DataTableToList(date);
48
+            //  List<Model.T_Sys_Department> carlist = new Bll.T_Sys_Department().DataTableToList(date);
49 49
                 var obj = new
50 50
                 {
51 51
                     state = "success",
52 52
                     message = "成功",
53
-                    rows = carlist,
53
+                    rows = date,
54 54
                     total = recordCount
55 55
                 };
56 56
                 return Content(obj.ToJson());
@@ -137,7 +137,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
137 137
         /// <param name="sort"></param>
138 138
         /// <returns></returns>
139 139
         [HttpPost]
140
-        public ActionResult Insert(int pid, string code, string name, int sort,int hosid)
140
+        public ActionResult Insert(int pid, string code, string name, int sort,int hosid, string location, string floorDistribution, string officeTelephone)
141 141
         {
142 142
             if (departmentBLL.Exists(code))
143 143
             {
@@ -155,6 +155,10 @@ namespace RMYY_CallCenter_Api.Controllers.System
155 155
                 dModel.F_CreateUser = User.F_UserCode;
156 156
                 dModel.T_Woid = hosid;
157 157
 
158
+                dModel.F_Location = location;
159
+                dModel.F_FloorDistribution = floorDistribution;
160
+                dModel.F_OfficeTelephone = officeTelephone;
161
+
158 162
                 int n = departmentBLL.Add(dModel);
159 163
                 if (n > 0)
160 164
                 {
@@ -177,7 +181,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
177 181
         /// <param name="sort"></param>
178 182
         /// <returns></returns>
179 183
         [HttpPost]
180
-        public ActionResult Update(int id, int pid, string code, string name, int sort,int hosid)
184
+        public ActionResult Update(int id, int pid, string code, string name, int sort,int hosid,string location,string floorDistribution,string officeTelephone)
181 185
         {
182 186
             Model.T_Sys_Department dModel = departmentBLL.GetModel(id);
183 187
             if (dModel != null)
@@ -195,7 +199,12 @@ namespace RMYY_CallCenter_Api.Controllers.System
195 199
                     dModel.F_DeptName = name;
196 200
                     dModel.F_State = 1;
197 201
                     dModel.T_Woid = hosid;
198
-                     
202
+
203
+                   dModel.F_Location= location;
204
+                    dModel.F_FloorDistribution= floorDistribution;
205
+                    dModel.F_OfficeTelephone= officeTelephone;
206
+
207
+
199 208
                     if (departmentBLL.Update(dModel))
200 209
                     {
201 210
                         return Success("修改成功");

+ 28 - 1
RMYY_CallCenter_Api/Controllers/System/UserAccountController.cs

@@ -238,8 +238,35 @@ namespace RMYY_CallCenter_Api.Controllers.System
238 238
             return Error("未知错误,请重新登陆");
239 239
         }
240 240
 
241
+        /// <summary>
242
+        /// 启用  state = 0和禁用  state = 1 用户 
243
+        /// </summary>
244
+        /// <param name="ids"></param>
245
+        /// <param name="state"></param>
246
+        /// <returns></returns>
247
+        public ActionResult DelUsers(string[] ids, int state = 0)
248
+        {
249
+            if (ids == null || ids.Length <= 0)
250
+                return Error("请选择用户");
251
+            var idStr = string.Join(",", ids);
252
+            if (string.IsNullOrEmpty(idStr))
253
+                return Error("请选择用户");
241 254
 
242
-
255
+          
256
+            //话务人员限制权限判断
257
+            if (state == 0)
258
+            {                 
259
+                    if (userbll.DeleteFlagList(idStr, state))
260
+                        return Success("设置成功");
261
+                    else
262
+                        return Error("设置失败");
263
+                 
264
+            }
265
+            if (userbll.DeleteFlagList(idStr, state))
266
+                return Success("设置成功");
267
+            else
268
+                return Error("设置失败");
269
+        }
243 270
 
244 271
     }
245 272
 }