Browse Source

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

zhangkun 5 years ago
parent
commit
45a93f346e

+ 18 - 0
代码/System.Model/T_Sys_TodoManagement.cs

28
         private DateTime? _f_deletetime;
28
         private DateTime? _f_deletetime;
29
         private string _f_deleteuser;
29
         private string _f_deleteuser;
30
         private string _f_tel;
30
         private string _f_tel;
31
+        private DateTime? _f_remindertime;
32
+        private int? _f_isremind;
33
+        /// <summary>
34
+        /// 提醒时间
35
+        /// </summary>
36
+        public DateTime? F_Remindertime
37
+        {
38
+            set { _f_remindertime = value; }
39
+            get { return _f_remindertime; }
40
+        }
41
+        /// <summary>
42
+        /// 提醒时间
43
+        /// </summary>
44
+        public int ? F_IsRemind
45
+        {
46
+            set { _f_isremind = value; }
47
+            get { return _f_isremind; }
48
+        }
31
         /// <summary>
49
         /// <summary>
32
         /// 
50
         /// 
33
         /// </summary>
51
         /// </summary>

+ 14 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/TodoManagementController.cs

108
         /// </summary>
108
         /// </summary>
109
         /// <param name="id">id</param>
109
         /// <param name="id">id</param>
110
         /// <returns></returns>
110
         /// <returns></returns>
111
-        [HttpGet("operation")]
111
+        [HttpPost("operation")]
112
         public async Task<IActionResult> GetOperationAsync(int[] ids, int state)
112
         public async Task<IActionResult> GetOperationAsync(int[] ids, int state)
113
         {
113
         {
114
             var res = 0;
114
             var res = 0;
231
                         model.F_State = 0;
231
                         model.F_State = 0;
232
                     else
232
                     else
233
                         model.F_State = 0;
233
                         model.F_State = 0;
234
+                    if (!string .IsNullOrEmpty (dr["待办提醒时间"].ToString()))
235
+                    {
236
+                        try
237
+                        {
238
+                            model.F_Remindertime = DateTime.Parse(dr["待办提醒时间"].ToString());
239
+                        }
240
+                        catch
241
+                        {
242
+                            errmsg = errmsg + "\r\n第" + index + "行导入失败!待办提醒时间格式错误";
243
+                            continue;
244
+                        }
245
+                    }
246
+                       
234
                     model.F_CreateTime = DateTime.Now;
247
                     model.F_CreateTime = DateTime.Now;
235
                     model.F_CreateUser = user;
248
                     model.F_CreateUser = user;
236
                     model.F_IsDelete = 0;
249
                     model.F_IsDelete = 0;

+ 2 - 2
代码/TVShoppingCallCenter_ZLJ/Controllers/TaskManagement/TaskManagementController.cs

177
         /// <returns></returns>
177
         /// <returns></returns>
178
         [HttpGet("getlist")]
178
         [HttpGet("getlist")]
179
         public async Task<IActionResult> GetListMark(string keyword, string name,string parentname, string starttime, string endtime, string tasker,
179
         public async Task<IActionResult> GetListMark(string keyword, string name,string parentname, string starttime, string endtime, string tasker,
180
-      string  deptid , int type = -1, int pageindex = 1, int pagesize = 20)
180
+      string  deptid , int parentid=0,int type = -1, int pageindex = 1, int pagesize = 20)
181
         {
181
         {
182
             List<IConditionalModel> conModels = new List<IConditionalModel>();
182
             List<IConditionalModel> conModels = new List<IConditionalModel>();
183
             #region 条件筛选
183
             #region 条件筛选
212
             {
212
             {
213
                 conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Like, FieldValue = type.ToString() });
213
                 conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Like, FieldValue = type.ToString() });
214
             }
214
             }
215
-           
215
+            conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal , FieldValue = parentid.ToString() });
216
             if (!string.IsNullOrEmpty(keyword))
216
             if (!string.IsNullOrEmpty(keyword))
217
             {
217
             {
218
                 conModels.Add(new ConditionalCollections()
218
                 conModels.Add(new ConditionalCollections()