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

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

@@ -25,13 +25,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             _sys_departmentRepository = sys_departmentRepository;
             _sys_useraccountRepository = sys_useraccountRepository;
         }
+        /// <summary>
+        /// 实时销售行为分析
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
         [HttpGet("realtimesales")]
         public async Task<IActionResult> Realtimesales(string time)
         {
             if (string.IsNullOrEmpty(time))
                 time = DateTime.Now.ToString("yyyy-MM-dd");
-            int newcustomer = _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00")).Result!=null ? _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00")).Result.Count:0;//新增客户
-            int oldcustomer = _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00").AddDays (-1)).Result != null ? _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00").AddDays(-1)).Result.Count : 0;//昨日新增客户
+            var customer = _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")).Result;
+            int newcustomer = customer .Select (x=>x.F_CreateOn >= DateTime.Parse(time + "00:00:00")&& x.F_CreateOn <= DateTime.Parse(time + "23:59:59")) != null ? customer .Select(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00") && x.F_CreateOn <= DateTime.Parse(time + "23:59:59")).Count ():0;//新增客户
+            int oldcustomer = customer.Select(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00").AddDays (-1) && x.F_CreateOn <= DateTime.Parse(time + "23:59:59").AddDays(-1)) != null ? customer.Select(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00").AddDays(-1) && x.F_CreateOn <= DateTime.Parse(time + "23:59:59").AddDays(-1)).Count() : 0;//昨日新增客户
+            int newaftersale = 0;//售后订单量
+            int oldaftersale = 0;//昨日订单量
+            int customerorder = 0;
 
 
             return null;

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

@@ -453,6 +453,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
                         model.F_State = 0;
                     model.F_CreateTime = DateTime.Now;
                     model.F_CreateUser  = user;
+                    model.F_IsDelete = 0;
+                    model.F_Parentid = parentid;
                     int b = await _sys_taskmanagement_Repository.Add(model);
                     if (b <= 0)
                     {