Przeglądaj źródła

Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_API_V6.0

zhangkun 5 lat temu
rodzic
commit
c67181afb6

+ 6 - 4
代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/ManagementCenterController.cs

48
             var yesterday= _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + " 00:00:00").AddDays(-1) && x.F_CreateOn <= DateTime.Parse(time + " 23:59:59").AddDays(-1)).Result;//昨日新增客户
48
             var yesterday= _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + " 00:00:00").AddDays(-1) && x.F_CreateOn <= DateTime.Parse(time + " 23:59:59").AddDays(-1)).Result;//昨日新增客户
49
             int newcustomer = todaycustomer != null ? todaycustomer.Count ():0;//新增客户
49
             int newcustomer = todaycustomer != null ? todaycustomer.Count ():0;//新增客户
50
             int oldcustomer = yesterday != null ? yesterday.Count() : 0;//昨日新增客户
50
             int oldcustomer = yesterday != null ? yesterday.Count() : 0;//昨日新增客户
51
+            int neworder = _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00") && x.F_AddTime <= DateTime.Parse(time + " 23:59:59")).Result != null ? _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00") && x.F_AddTime <= DateTime.Parse(time + " 23:59:59")).Result.Count : 0;
52
+            int oldorder = _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00").AddDays(-1) && x.F_AddTime <= DateTime.Parse(time + " 23:59:59").AddDays(-1)).Result != null ? _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00").AddDays(-1) && x.F_AddTime <= DateTime.Parse(time + " 23:59:59").AddDays(-1)).Result.Count : 0;
51
             int newaftersale = 0;//售后订单量
53
             int newaftersale = 0;//售后订单量
52
             int oldaftersale = 0;//昨日订单量
54
             int oldaftersale = 0;//昨日订单量
53
             List<IConditionalModel> conModels = new List<IConditionalModel>();
55
             List<IConditionalModel> conModels = new List<IConditionalModel>();
106
             {
108
             {
107
                 state = "success",
109
                 state = "success",
108
                 message = "成功",
110
                 message = "成功",
109
-                todaycustomer,//新增客户
110
-                yesterday,//昨日新增客户
111
-                 newcustomer,//新增客户下单量
112
-                oldcustomer,//昨日新增客户下单量
111
+                 newcustomer,//新增客户
112
+                oldcustomer,//昨日新增客户
113
+                neworder,//新增客户
114
+                oldorder ,//昨日新增客户
113
                 newaftersale ,//售后订单量
115
                 newaftersale ,//售后订单量
114
                 oldaftersale,//昨日订单量
116
                 oldaftersale,//昨日订单量
115
                 newcustomers,//新客户下单量
117
                 newcustomers,//新客户下单量

+ 13 - 7
代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/TodoManagementController.cs

33
         {
33
         {
34
             if (input.F_Type < 0)
34
             if (input.F_Type < 0)
35
                 return Error("请选择待办类型");
35
                 return Error("请选择待办类型");
36
-          //  string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
36
+          string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
37
             input.F_CreateTime = DateTime.Now;
37
             input.F_CreateTime = DateTime.Now;
38
-            input.F_CreateUser = "8000";
38
+            input.F_CreateUser = user;
39
             input.F_IsDelete = 0;
39
             input.F_IsDelete = 0;
40
             var res = await _sys_todomanagementrepository.Add(input);
40
             var res = await _sys_todomanagementrepository.Add(input);
41
             if (res > 0)
41
             if (res > 0)
132
                 return Error("请选择要操作的记录");
132
                 return Error("请选择要操作的记录");
133
         }
133
         }
134
         /// <summary>
134
         /// <summary>
135
-        /// 获取任务列表
135
+        /// 获取待办列表
136
         /// </summary>
136
         /// </summary>
137
         /// <param name="keyword"></param>
137
         /// <param name="keyword"></param>
138
         /// <param name="pageindex"></param>
138
         /// <param name="pageindex"></param>
146
             conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
146
             conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
147
             if (!string.IsNullOrEmpty(keyword))
147
             if (!string.IsNullOrEmpty(keyword))
148
             {
148
             {
149
-                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword });
150
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword });
151
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_PeopleName", ConditionalType = ConditionalType.Like, FieldValue = keyword });
149
+                conModels.Add(new ConditionalCollections()
150
+                {
151
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
152
+                    {
153
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
154
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
155
+                         new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_PeopleName", ConditionalType = ConditionalType.Like, FieldValue = keyword })
156
+                    }
157
+                });
152
             }
158
             }
153
             if (type > -1)
159
             if (type > -1)
154
             {
160
             {
214
                     var model = new T_Sys_TodoManagement();
220
                     var model = new T_Sys_TodoManagement();
215
                     string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
221
                     string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
216
                     model.F_Name = dr["待办标题"].ToString();
222
                     model.F_Name = dr["待办标题"].ToString();
217
-                    model.F_Content = dr["待办标题"].ToString();
223
+                    model.F_Content = dr["待办内容"].ToString();
218
                     model.F_PeopleName = dr["待联系人姓名"].ToString();
224
                     model.F_PeopleName = dr["待联系人姓名"].ToString();
219
                     model.F_Tel   = dr["待联系人电话"].ToString();
225
                     model.F_Tel   = dr["待联系人电话"].ToString();
220
                     if (dr["分类"].ToString() == "日程")
226
                     if (dr["分类"].ToString() == "日程")

+ 10 - 4
代码/TVShoppingCallCenter_ZLJ/Controllers/Marketing/MarketingController.cs

137
             }
137
             }
138
             if (!string.IsNullOrEmpty(keyword))
138
             if (!string.IsNullOrEmpty(keyword))
139
             {
139
             {
140
-                conModels.Add(new ConditionalModel() { FieldName = "F_PromotionRules", ConditionalType = ConditionalType.Like, FieldValue = keyword });
141
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Describe", ConditionalType = ConditionalType.Like, FieldValue = keyword });
142
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_PromotionMethod", ConditionalType = ConditionalType.Like, FieldValue = keyword });
143
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_ActivityMode", ConditionalType = ConditionalType.Like, FieldValue = keyword });
140
+                conModels.Add(new ConditionalCollections()
141
+                {
142
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
143
+                    {
144
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_PromotionRules", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
145
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Describe", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
146
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_PromotionMethod", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
147
+                         new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_ActivityMode", ConditionalType = ConditionalType.Like, FieldValue = keyword })
148
+                    }
149
+                });
144
             }
150
             }
145
             if (!string.IsNullOrEmpty(commodity))
151
             if (!string.IsNullOrEmpty(commodity))
146
             {
152
             {

+ 3 - 3
代码/TVShoppingCallCenter_ZLJ/Controllers/MediaCente/MediaCenteController.cs

216
            
216
            
217
             if (!string.IsNullOrEmpty(commodity))
217
             if (!string.IsNullOrEmpty(commodity))
218
             {
218
             {
219
-                conModels.Add(new ConditionalModel() { FieldName = "F_Commodit", ConditionalType = ConditionalType.Like, FieldValue = commodity });
219
+                conModels.Add(new ConditionalModel() { FieldName = "F_Commodity", ConditionalType = ConditionalType.Like, FieldValue = commodity });
220
             }
220
             }
221
             if (!string.IsNullOrEmpty(type))
221
             if (!string.IsNullOrEmpty(type))
222
             {
222
             {
354
                     foreach (var ib in spritcom)
354
                     foreach (var ib in spritcom)
355
                     {
355
                     {
356
                         if (MediaCente.F_CommodityName == "")
356
                         if (MediaCente.F_CommodityName == "")
357
-                            MediaCente.F_CommodityName = _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumber;
357
+                            MediaCente.F_CommodityName = _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumberName;
358
                         else
358
                         else
359
-                            MediaCente.F_CommodityName+=","+ _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumber;
359
+                            MediaCente.F_CommodityName+=","+ _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumberName;
360
                     }
360
                     }
361
                 }
361
                 }
362
                 catch
362
                 catch

+ 23 - 8
代码/TVShoppingCallCenter_ZLJ/Controllers/TaskManagement/TaskManagementController.cs

177
         /// <returns></returns>
177
         /// <returns></returns>
178
         [HttpGet("getlist")]
178
         [HttpGet("getlist")]
179
         public async Task<IActionResult> GetListMark(string keyword, string name,string parentname, string starttime, string endtime, string tasker,
179
         public async Task<IActionResult> GetListMark(string keyword, string name,string parentname, string starttime, string endtime, string tasker,
180
-      int deptid = 0, int type = -1, int pageindex = 1, int pagesize = 20)
180
+      string  deptid , int type = -1, int pageindex = 1, int pagesize = 20)
181
         {
181
         {
182
             List<IConditionalModel> conModels = new List<IConditionalModel>();
182
             List<IConditionalModel> conModels = new List<IConditionalModel>();
183
             #region 条件筛选
183
             #region 条件筛选
188
             }
188
             }
189
             if (!string.IsNullOrEmpty(tasker))
189
             if (!string.IsNullOrEmpty(tasker))
190
             {
190
             {
191
-                conModels.Add(new ConditionalModel() { FieldName = "F_Tasker", ConditionalType = ConditionalType.Like, FieldValue = tasker });
191
+                if (_sys_useraccountRepository .GetSingle(x => x.F_UserName  == tasker).Result != null)
192
+                {
193
+                    conModels.Add(new ConditionalModel() { FieldName = "F_Tasker", ConditionalType = ConditionalType.Like, FieldValue = _sys_useraccountRepository.GetSingle(x => x.F_UserName == tasker).Result.F_UserId .ToString ()  });
194
+                }
195
+                else
196
+                {
197
+                    return Error("请输入正确的任务人");
198
+                }
192
             }
199
             }
193
             if (!string.IsNullOrEmpty(parentname))
200
             if (!string.IsNullOrEmpty(parentname))
194
             {
201
             {
196
                 {
203
                 {
197
                     conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Like, FieldValue = _sys_taskmanagement_Repository.GetSingle(x => x.F_Name == parentname).Result.F_ID .ToString ()    });
204
                     conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Like, FieldValue = _sys_taskmanagement_Repository.GetSingle(x => x.F_Name == parentname).Result.F_ID .ToString ()    });
198
                 }
205
                 }
206
+                else
207
+                {
208
+                    return Error("请输入正确的父级任务名称");
209
+                }
199
             }
210
             }
200
             if (type > -1)
211
             if (type > -1)
201
             {
212
             {
204
            
215
            
205
             if (!string.IsNullOrEmpty(keyword))
216
             if (!string.IsNullOrEmpty(keyword))
206
             {
217
             {
207
-                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword });
208
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword });
218
+                conModels.Add(new ConditionalCollections()
219
+                {
220
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
221
+                    {
222
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
223
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword })
224
+                    }
225
+                });
209
             }
226
             }
210
 
227
 
211
             if (!string.IsNullOrEmpty(starttime))
228
             if (!string.IsNullOrEmpty(starttime))
218
             }
235
             }
219
             string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
236
             string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
220
             var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_DeptId : 0;
237
             var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_DeptId : 0;
221
-            if (deptid > 0)
238
+            if (!string .IsNullOrEmpty (deptid))
222
             {
239
             {
223
-                conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal, FieldValue = deptid.ToString() });
240
+                conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal, FieldValue = deptid });
224
             }
241
             }
225
             else
242
             else
226
             {
243
             {
228
                 new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = dept.ToString() });
245
                 new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = dept.ToString() });
229
 
246
 
230
             }
247
             }
231
-
232
-
233
             #endregion
248
             #endregion
234
             int recordCount = 0;
249
             int recordCount = 0;
235
             var list = await _sys_taskmanagement_Repository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
250
             var list = await _sys_taskmanagement_Repository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });