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

代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/ManagementCenterController.cs

             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;//昨日新增客户
             int newcustomer = todaycustomer != null ? todaycustomer.Count ():0;//新增客户
             int oldcustomer = yesterday != null ? yesterday.Count() : 0;//昨日新增客户
+            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;
+            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;
             int newaftersale = 0;//售后订单量
             int oldaftersale = 0;//昨日订单量
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             {
                 state = "success",
                 message = "成功",
-                todaycustomer,//新增客户
-                yesterday,//昨日新增客户
-                 newcustomer,//新增客户下单量
-                oldcustomer,//昨日新增客户下单量
+                 newcustomer,//新增客户
+                oldcustomer,//昨日新增客户
+                neworder,//新增客户
+                oldorder ,//昨日新增客户
                 newaftersale ,//售后订单量
                 oldaftersale,//昨日订单量
                 newcustomers,//新客户下单量

代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/TodoManagementController.cs

         {
             if (input.F_Type < 0)
                 return Error("请选择待办类型");
-          //  string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+          string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             input.F_CreateTime = DateTime.Now;
-            input.F_CreateUser = "8000";
+            input.F_CreateUser = user;
             input.F_IsDelete = 0;
             var res = await _sys_todomanagementrepository.Add(input);
             if (res > 0)
                 return Error("请选择要操作的记录");
         }
         /// <summary>
-        /// 获取任务列表
+        /// 获取待办列表
         /// </summary>
         /// <param name="keyword"></param>
         /// <param name="pageindex"></param>
             conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
             if (!string.IsNullOrEmpty(keyword))
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_PeopleName", ConditionalType = ConditionalType.Like, FieldValue = keyword });
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                         new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_PeopleName", ConditionalType = ConditionalType.Like, FieldValue = keyword })
+                    }
+                });
             }
             if (type > -1)
             {
                     var model = new T_Sys_TodoManagement();
                     string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
                     model.F_Name = dr["待办标题"].ToString();
-                    model.F_Content = dr["待办标题"].ToString();
+                    model.F_Content = dr["待办内容"].ToString();
                     model.F_PeopleName = dr["待联系人姓名"].ToString();
                     model.F_Tel   = dr["待联系人电话"].ToString();
                     if (dr["分类"].ToString() == "日程")

代码/TVShoppingCallCenter_ZLJ/Controllers/Marketing/MarketingController.cs

             }
             if (!string.IsNullOrEmpty(keyword))
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_PromotionRules", ConditionalType = ConditionalType.Like, FieldValue = keyword });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Describe", ConditionalType = ConditionalType.Like, FieldValue = keyword });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_PromotionMethod", ConditionalType = ConditionalType.Like, FieldValue = keyword });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_ActivityMode", ConditionalType = ConditionalType.Like, FieldValue = keyword });
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_PromotionRules", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Describe", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_PromotionMethod", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                         new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_ActivityMode", ConditionalType = ConditionalType.Like, FieldValue = keyword })
+                    }
+                });
             }
             if (!string.IsNullOrEmpty(commodity))
             {

代码/TVShoppingCallCenter_ZLJ/Controllers/MediaCente/MediaCenteController.cs

            
             if (!string.IsNullOrEmpty(commodity))
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Commodit", ConditionalType = ConditionalType.Like, FieldValue = commodity });
+                conModels.Add(new ConditionalModel() { FieldName = "F_Commodity", ConditionalType = ConditionalType.Like, FieldValue = commodity });
             }
             if (!string.IsNullOrEmpty(type))
             {
                     foreach (var ib in spritcom)
                     {
                         if (MediaCente.F_CommodityName == "")
-                            MediaCente.F_CommodityName = _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumber;
+                            MediaCente.F_CommodityName = _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumberName;
                         else
-                            MediaCente.F_CommodityName+=","+ _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumber;
+                            MediaCente.F_CommodityName+=","+ _productRepository.GetSingle(x => x.F_ProductId ==ib).Result.F_ProductNumberName;
                     }
                 }
                 catch

代码/TVShoppingCallCenter_ZLJ/Controllers/TaskManagement/TaskManagementController.cs

         /// <returns></returns>
         [HttpGet("getlist")]
         public async Task<IActionResult> GetListMark(string keyword, string name,string parentname, string starttime, string endtime, string tasker,
-      int deptid = 0, int type = -1, int pageindex = 1, int pagesize = 20)
+      string  deptid , int type = -1, int pageindex = 1, int pagesize = 20)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             }
             if (!string.IsNullOrEmpty(tasker))
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Tasker", ConditionalType = ConditionalType.Like, FieldValue = tasker });
+                if (_sys_useraccountRepository .GetSingle(x => x.F_UserName  == tasker).Result != null)
+                {
+                    conModels.Add(new ConditionalModel() { FieldName = "F_Tasker", ConditionalType = ConditionalType.Like, FieldValue = _sys_useraccountRepository.GetSingle(x => x.F_UserName == tasker).Result.F_UserId .ToString ()  });
+                }
+                else
+                {
+                    return Error("请输入正确的任务人");
+                }
             }
             if (!string.IsNullOrEmpty(parentname))
             {
                 {
                     conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Like, FieldValue = _sys_taskmanagement_Repository.GetSingle(x => x.F_Name == parentname).Result.F_ID .ToString ()    });
                 }
+                else
+                {
+                    return Error("请输入正确的父级任务名称");
+                }
             }
             if (type > -1)
             {
            
             if (!string.IsNullOrEmpty(keyword))
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword });
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Content", ConditionalType = ConditionalType.Like, FieldValue = keyword })
+                    }
+                });
             }
 
             if (!string.IsNullOrEmpty(starttime))
             }
             string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_DeptId : 0;
-            if (deptid > 0)
+            if (!string .IsNullOrEmpty (deptid))
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal, FieldValue = deptid.ToString() });
+                conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal, FieldValue = deptid });
             }
             else
             {
                 new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = dept.ToString() });
 
             }
-
-
             #endregion
             int recordCount = 0;
             var list = await _sys_taskmanagement_Repository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });