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

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

@@ -22,7 +22,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
         private readonly ISys_DepartmentRepository _sys_departmentRepository;//部门
         private readonly ISys_PlanManagemenRepository _sys_planmanagemenRepository;//广告
         private readonly ISys_MarketingRepository _sys_marketing_Repository;//营销活动
-        public ManagementCenterController(ICus_VipInfoRepository cus_vip_infoRepository, ISys_TaskManagementRepository sys_taskmanagement_Repository, ISys_DepartmentRepository sys_departmentRepository, ISys_UserAccountRepository sys_useraccountRepository,IBus_OrderRepository bus_OrderRepository, ISys_PlanManagemenRepository sys_planmanagemenRepository,ISys_MarketingRepository sys_marketing_Repository)
+        private readonly ISys_TodoManagementRepository _sys_todomanagementrepository;
+        public ManagementCenterController(ICus_VipInfoRepository cus_vip_infoRepository, ISys_TaskManagementRepository sys_taskmanagement_Repository, ISys_DepartmentRepository sys_departmentRepository, ISys_UserAccountRepository sys_useraccountRepository,IBus_OrderRepository bus_OrderRepository, ISys_PlanManagemenRepository sys_planmanagemenRepository,ISys_MarketingRepository sys_marketing_Repository, ISys_TodoManagementRepository sys_todomanagementrepository)
         {
             _bus_OrderRepository = bus_OrderRepository;
             _cus_vip_infoRepository = cus_vip_infoRepository;
@@ -31,6 +32,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             _sys_useraccountRepository = sys_useraccountRepository;
             _sys_planmanagemenRepository = sys_planmanagemenRepository;
             _sys_marketing_Repository = sys_marketing_Repository;
+            _sys_todomanagementrepository = sys_todomanagementrepository;
         }
         /// <summary>
         /// 实时销售行为分析
@@ -104,8 +106,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             {
                 state = "success",
                 message = "成功",
-                 newcustomer,//新增客户
-                oldcustomer ,//昨日新增客户
+                todaycustomer,//新增客户
+                yesterday,//昨日新增客户
+                 newcustomer,//新增客户下单量
+                oldcustomer,//昨日新增客户下单量
                 newaftersale ,//售后订单量
                 oldaftersale,//昨日订单量
                 newcustomers,//新客户下单量
@@ -147,7 +151,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             if (userid > 0)
             {
                 List<IConditionalModel> conModels = new List<IConditionalModel>();
-                conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
+                conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal , FieldValue = "0" });
                 conModels.Add(new ConditionalModel() { FieldName = "F_CreateTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = DateTime .Parse ( time).AddMonths (1).AddDays (-1).ToString("yyyy-MM-dd 23:59:59") });
                 conModels.Add(new ConditionalModel() { FieldName = "F_CreateTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = DateTime.Parse(time).ToString("yyyy-MM-01 00:00:00") });
                 conModels.Add(new ConditionalModel() { FieldName = "F_Tasker", ConditionalType = ConditionalType.Equal , FieldValue = userid+"" });
@@ -187,9 +191,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
         [HttpGet("todolist")]
         public async Task<IActionResult> Todolist(string time)
         {
+            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             if (string.IsNullOrEmpty(time))
                 time = DateTime.Now.ToString("yyyy-MM");
-          
                 var Order = _bus_OrderRepository.GetListALL(x => x.F_State  >=0).Result;//订单总量
                 int tobeexamine=0/*待审核*/, reviewreturn = 0/*审核退回*/, tobedistribution = 0/*待分配*/,
                 aftersale = 0/*售后*/, tobecollected = 0/*待回款*/, toberefunded = 0/*待退款*/, pendingclaims = 0/*待理赔*/, tobecontacted = 0/*待联系客户*/;
@@ -201,8 +205,29 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
                     tobedistribution = Order.Where(x => x.F_State == 3).Count();//审核退回
                     tobecollected = Order.Where(x => x.F_PayState == 0).Count();//待回款
                 }
-              
-                var obj = new
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal , FieldValue = "0" });
+         //   conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "0" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_CreateUser", ConditionalType = ConditionalType.Equal, FieldValue = user });
+            var Todo = _sys_todomanagementrepository.GetListALL(conModels, " F_CreateTime DESC").Result;//待办总量 
+            if (Todo != null)
+            {
+                tobecontacted = Todo.Where(x => x.F_Type == 1&&x .F_State ==0).Count();//待联系客户
+               var tobe = Todo.Where(x => x.F_Type == 0);//审核退回
+                if (tobe!=null )
+                {
+                    foreach (var it  in tobe)
+                    {
+                        Dictionaries dictionaries = new Dictionaries();
+                        dictionaries.key = it.F_Name;
+                        dictionaries.value =(int ) it.F_State;
+                        tobetask.Add(dictionaries);
+                    }
+                }
+               
+            }
+
+            var obj = new
                 {
                     state = "success",
                     message = "成功",

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

@@ -33,9 +33,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
         {
             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 = user;
+            input.F_CreateUser = "8000";
             input.F_IsDelete = 0;
             var res = await _sys_todomanagementrepository.Add(input);
             if (res > 0)