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

代码/System.Model/T_Sys_TodoManagement.cs

         private DateTime? _f_deletetime;
         private string _f_deleteuser;
         private string _f_tel;
+        private DateTime? _f_remindertime;
+        private int? _f_isremind;
+        /// <summary>
+        /// 提醒时间
+        /// </summary>
+        public DateTime? F_Remindertime
+        {
+            set { _f_remindertime = value; }
+            get { return _f_remindertime; }
+        }
+        /// <summary>
+        /// 提醒时间
+        /// </summary>
+        public int ? F_IsRemind
+        {
+            set { _f_isremind = value; }
+            get { return _f_isremind; }
+        }
         /// <summary>
         /// 
         /// </summary>

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

         /// </summary>
         /// <param name="id">id</param>
         /// <returns></returns>
-        [HttpGet("operation")]
+        [HttpPost("operation")]
         public async Task<IActionResult> GetOperationAsync(int[] ids, int state)
         {
             var res = 0;
                         model.F_State = 0;
                     else
                         model.F_State = 0;
+                    if (!string .IsNullOrEmpty (dr["待办提醒时间"].ToString()))
+                    {
+                        try
+                        {
+                            model.F_Remindertime = DateTime.Parse(dr["待办提醒时间"].ToString());
+                        }
+                        catch
+                        {
+                            errmsg = errmsg + "\r\n第" + index + "行导入失败！待办提醒时间格式错误";
+                            continue;
+                        }
+                    }
+                       
                     model.F_CreateTime = DateTime.Now;
                     model.F_CreateUser = user;
                     model.F_IsDelete = 0;

代码/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,
-      string  deptid , int type = -1, int pageindex = 1, int pagesize = 20)
+      string  deptid , int parentid=0,int type = -1, int pageindex = 1, int pagesize = 20)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Like, FieldValue = type.ToString() });
             }
-           
+            conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal , FieldValue = parentid.ToString() });
             if (!string.IsNullOrEmpty(keyword))
             {
                 conModels.Add(new ConditionalCollections()