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

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

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.IRepositories;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
+{
+    [Produces("application/json")]
+    [Route("api/[controller]")]
+    public class ManagementCenterController : BaseController
+    {
+        private readonly ICus_VipInfoRepository _cus_vip_infoRepository;
+        private readonly ISys_UserAccountRepository _sys_useraccountRepository;
+        private readonly ISys_TaskManagementRepository _sys_taskmanagement_Repository;
+        private readonly ISys_DepartmentRepository _sys_departmentRepository;
+        public ManagementCenterController(ICus_VipInfoRepository cus_vip_infoRepository, ISys_TaskManagementRepository sys_taskmanagement_Repository, ISys_DepartmentRepository sys_departmentRepository,
+            ISys_UserAccountRepository sys_useraccountRepository)
+        {
+            _cus_vip_infoRepository = cus_vip_infoRepository;
+            _sys_taskmanagement_Repository = sys_taskmanagement_Repository;
+            _sys_departmentRepository = sys_departmentRepository;
+            _sys_useraccountRepository = sys_useraccountRepository;
+        }
+        //[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.GetSingle 
+        //}
+      
+   }
+}

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

@@ -104,8 +104,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
              // string user = "8000";
          string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             input.F_IsDelete = 0;
-            input.F_UpdateUser = user;
-            input.F_UpdateTime = DateTime.Now;
+            input.F_CreateUser  = model.F_CreateUser;
+            input.F_CreateTime = model.F_CreateTime ;
             input.F_UpdateTime = DateTime.Now;
             input.F_UpdateUser = user;
             // model.F_UpdateUser = "8000";
@@ -224,10 +224,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
             }
             else
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal , FieldValue = dept .ToString ()});
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_CreateUser", ConditionalType = ConditionalType.Equal , FieldValue = user });
-               
+                conModels.Add(new ConditionalModel() { FieldName = "F_CreateUser", ConditionalType = ConditionalType.Equal , FieldValue = user  });
+                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 });
@@ -482,6 +484,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
         private TaskManagementInput Convert(T_Sys_TaskManagement it, int type = 0)
         {
             TaskManagementInput task  = new TaskManagementInput();
+            task.F_ID = it.F_ID;
             task.F_Name = it.F_Name;
             task.F_Content = it.F_Content;
             task.F_StartTime = it.F_StartTime;