duhongyu %!s(int64=5) %!d(string=hace) años
padre
commit
85bfaabce9

+ 6 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/InternalMessages/InternalMessagesController.cs

17
     {
17
     {
18
         private readonly ISMS_InternalMessagesReposytory _sys_internalMessagesrepository;
18
         private readonly ISMS_InternalMessagesReposytory _sys_internalMessagesrepository;
19
         private readonly ISys_UserAccountRepository _sys_useraccountRepository;
19
         private readonly ISys_UserAccountRepository _sys_useraccountRepository;
20
+
20
         public InternalMessagesController(ISMS_InternalMessagesReposytory sys_internalMessagesrepository, ISys_UserAccountRepository sys_useraccountRepository)
21
         public InternalMessagesController(ISMS_InternalMessagesReposytory sys_internalMessagesrepository, ISys_UserAccountRepository sys_useraccountRepository)
21
         {
22
         {
22
             _sys_useraccountRepository = sys_useraccountRepository;
23
             _sys_useraccountRepository = sys_useraccountRepository;
30
         /// <param name="receiveUserCode"></param>
31
         /// <param name="receiveUserCode"></param>
31
         /// <param name="sendUserCode"></param>
32
         /// <param name="sendUserCode"></param>
32
         /// <returns></returns>
33
         /// <returns></returns>
33
-        public bool AddInternalMessagesInfo(string title, string content, string sendUserCode, int smstype = 0, int smstop = 0,int deptid=0, string receiveUserCode="",int receivingType=0)
34
+        public bool AddInternalMessagesInfo(int id,string title, string content, string sendUserCode, DateTime time, int smstype = 0, int smstop = 0,  int deptid=0,  string receiveUserCode="",int receivingType=0)
34
         {
35
         {
35
             if (!string.IsNullOrEmpty (title) && !string.IsNullOrEmpty(content) && !string.IsNullOrEmpty(sendUserCode))
36
             if (!string.IsNullOrEmpty (title) && !string.IsNullOrEmpty(content) && !string.IsNullOrEmpty(sendUserCode))
36
             {
37
             {
38
                     return false;
39
                     return false;
39
 
40
 
40
                 T_SMS_InternalMessages model = new  T_SMS_InternalMessages();
41
                 T_SMS_InternalMessages model = new  T_SMS_InternalMessages();
42
+                model.F_ID = id;
41
                 model.SMS_Title = title;
43
                 model.SMS_Title = title;
42
                 model.SMS_Content = content;
44
                 model.SMS_Content = content;
43
                 model.SMS_ReceiveUserCode = receiveUserCode;
45
                 model.SMS_ReceiveUserCode = receiveUserCode;
44
                 model.SMS_SendUserCode = sendUserCode;
46
                 model.SMS_SendUserCode = sendUserCode;
45
                 model.SMS_IsRead = 0;
47
                 model.SMS_IsRead = 0;
46
                 model.SMS_SendTime = DateTime.Now;
48
                 model.SMS_SendTime = DateTime.Now;
49
+                model.SMS_Remindertime = time;
47
                 model.SMS_Deptid = deptid;
50
                 model.SMS_Deptid = deptid;
48
                 model.SMS_IsDelete = 0;
51
                 model.SMS_IsDelete = 0;
49
                 model.SMS_Order = 0;
52
                 model.SMS_Order = 0;
122
             {
125
             {
123
                 conModels.Add(new ConditionalModel() { FieldName = "SMS_ReceiveUserCode", ConditionalType = ConditionalType.Equal, FieldValue = user });
126
                 conModels.Add(new ConditionalModel() { FieldName = "SMS_ReceiveUserCode", ConditionalType = ConditionalType.Equal, FieldValue = user });
124
             }
127
             }
128
+            conModels.Add(new ConditionalModel() { FieldName = "SMS_Remindertime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = DateTime .Now .ToString () });
125
             #endregion
129
             #endregion
126
             int recordCount = 0;
130
             int recordCount = 0;
127
             if (pageindex > 0 && pagesize > 0)
131
             if (pageindex > 0 && pagesize > 0)
213
                 return Error("请选择要操作的记录");
217
                 return Error("请选择要操作的记录");
214
         }
218
         }
215
 
219
 
220
+        
216
     }
221
     }
217
 }
222
 }

+ 60 - 4
代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/TodoManagementController.cs

18
     public class TodoManagementController : BaseController
18
     public class TodoManagementController : BaseController
19
     {
19
     {
20
         private readonly ISys_TodoManagementRepository _sys_todomanagementrepository;
20
         private readonly ISys_TodoManagementRepository _sys_todomanagementrepository;
21
-     
22
-        public TodoManagementController(ISys_TodoManagementRepository sys_todomanagementrepository)
21
+        private readonly ISMS_InternalMessagesReposytory _sys_internalMessagesrepository;
22
+        private readonly ISys_UserAccountRepository _sys_useraccountRepository;
23
+        public TodoManagementController(ISys_TodoManagementRepository sys_todomanagementrepository, ISys_UserAccountRepository sys_useraccountRepository, ISMS_InternalMessagesReposytory sys_internalMessagesrepository)
23
         {
24
         {
24
             _sys_todomanagementrepository = sys_todomanagementrepository;
25
             _sys_todomanagementrepository = sys_todomanagementrepository;
26
+            _sys_useraccountRepository = sys_useraccountRepository;
27
+            _sys_internalMessagesrepository = sys_internalMessagesrepository;
25
         }
28
         }
26
         /// <summary>
29
         /// <summary>
27
         /// 添加待办
30
         /// 添加待办
37
             input.F_CreateTime = DateTime.Now;
40
             input.F_CreateTime = DateTime.Now;
38
             input.F_CreateUser = user;
41
             input.F_CreateUser = user;
39
             input.F_IsDelete = 0;
42
             input.F_IsDelete = 0;
40
-            var res = await _sys_todomanagementrepository.Add(input);
41
-            if (res > 0)
43
+            string title = "", count = "";
44
+            if (input.F_Type == 0)
45
+            {
46
+                title = "日程提醒";
47
+                count = input.F_Content;
48
+            }
49
+            else
42
             {
50
             {
51
+                title = "待联系人提醒";
52
+                count = "待联系人"+ input.F_PeopleName ;
53
+            }
54
+                var res = await _sys_todomanagementrepository.Add(input);
55
+            if (res > 0)
56
+            {    try
57
+                {
58
+                    bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(res, title, count, user, DateTime.Parse(input.F_Remindertime.ToString()) , 1, 1, 0, user, 1);
59
+                }
60
+                catch
61
+                {
62
+
63
+                }
43
                 return Success("添加成功");
64
                 return Success("添加成功");
44
             }
65
             }
45
             else
66
             else
67
             input.F_CreateTime = model.F_CreateTime;
88
             input.F_CreateTime = model.F_CreateTime;
68
             input.F_UpdateTime = DateTime.Now;
89
             input.F_UpdateTime = DateTime.Now;
69
             input.F_UpdateUser = user;
90
             input.F_UpdateUser = user;
91
+            string title = "", count = "";
92
+            if (input.F_Type == 0)
93
+            {
94
+                title = "日程提醒";
95
+                count = input.F_Content;
96
+            }
97
+            else
98
+            {
99
+                title = "待联系人提醒";
100
+                count = "待联系人" + input.F_PeopleName;
101
+            }
70
             // model.F_UpdateUser = "8000";
102
             // model.F_UpdateUser = "8000";
71
             var b = await _sys_todomanagementrepository.Update(input);
103
             var b = await _sys_todomanagementrepository.Update(input);
72
             if (b)
104
             if (b)
105
+            {
106
+                try
107
+                {
108
+                    var InternalMessages = _sys_internalMessagesrepository.GetSingle(x => x.F_ID == model.F_ID).Result;
109
+                    if (InternalMessages!=null )
110
+                    {
111
+                        InternalMessages.SMS_Title  = title;
112
+                        InternalMessages.SMS_Content = count;
113
+                        InternalMessages.SMS_Remindertime = input.F_Remindertime;
114
+                        InternalMessages.SMS_ReceiveUserCode = user ;
115
+                        bool n = await _sys_internalMessagesrepository.Update(InternalMessages);
116
+                    }
117
+                    else
118
+                    {
119
+                        bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(model.F_ID, title, count, user, DateTime.Parse(input.F_Remindertime.ToString()), 1, 1, 0, user, 1);
120
+                    }
121
+                  
122
+                }
123
+                catch
124
+                {
125
+
126
+                }
73
                 return Success("修改成功");
127
                 return Success("修改成功");
128
+            }
129
+               
74
             return Error("修改失败");
130
             return Error("修改失败");
75
         }
131
         }
76
         /// <summary>
132
         /// <summary>

+ 62 - 2
代码/TVShoppingCallCenter_ZLJ/Controllers/MediaCente/MediaCenteController.cs

23
         private readonly ISys_MediaManagementRepository _sys_mediaManagement_Repository;
23
         private readonly ISys_MediaManagementRepository _sys_mediaManagement_Repository;
24
         private readonly IBus_ProductRepository _productRepository;
24
         private readonly IBus_ProductRepository _productRepository;
25
         private readonly ISys_DepartmentRepository _sys_departmentRepository;
25
         private readonly ISys_DepartmentRepository _sys_departmentRepository;
26
-        public MediaCenteController(ISys_MediaCenteRepository sys_mediacenter_Repository, ISys_PlanManagemenRepository sys_planmanagemenRepository,
27
-            ISys_DictionaryValueRepository sys_dictionaryRepository, ISys_MediaManagementRepository sys_mediaManagement_Repository, IBus_ProductRepository productRepository, ISys_DepartmentRepository sys_departmentRepository,ISys_AreaRepository sys_areaRepository)
26
+        private readonly ISMS_InternalMessagesReposytory _sys_internalMessagesrepository;
27
+        private readonly ISys_UserAccountRepository _sys_useraccountRepository;
28
+        public MediaCenteController(ISys_MediaCenteRepository sys_mediacenter_Repository, ISys_PlanManagemenRepository sys_planmanagemenRepository, ISys_UserAccountRepository sys_useraccountRepository,
29
+            ISys_DictionaryValueRepository sys_dictionaryRepository, ISys_MediaManagementRepository sys_mediaManagement_Repository, IBus_ProductRepository productRepository, ISys_DepartmentRepository sys_departmentRepository,ISys_AreaRepository sys_areaRepository, ISMS_InternalMessagesReposytory sys_internalMessagesrepository
30
+           )
28
         {
31
         {
29
             _sys_mediacenter_Repository = sys_mediacenter_Repository;
32
             _sys_mediacenter_Repository = sys_mediacenter_Repository;
30
             _sys_planmanagemenRepository = sys_planmanagemenRepository;
33
             _sys_planmanagemenRepository = sys_planmanagemenRepository;
33
             _productRepository = productRepository;
36
             _productRepository = productRepository;
34
             _sys_departmentRepository = sys_departmentRepository;
37
             _sys_departmentRepository = sys_departmentRepository;
35
             _sys_areaRepository = sys_areaRepository;
38
             _sys_areaRepository = sys_areaRepository;
39
+            _sys_internalMessagesrepository = sys_internalMessagesrepository;
40
+            _sys_useraccountRepository = sys_useraccountRepository;
41
+
36
         }
42
         }
37
         /// <summary>
43
         /// <summary>
38
         /// 产品列表
44
         /// 产品列表
94
             var res = await _sys_mediacenter_Repository.Add(model);
100
             var res = await _sys_mediacenter_Repository.Add(model);
95
             if (res > 0)
101
             if (res > 0)
96
             {
102
             {
103
+                if (input.F_IsRemind >0)
104
+                {
105
+                    try
106
+                    {
107
+                        DateTime time = DateTime.Parse(input.F_ReminderTime.ToString());
108
+                        bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(res, "媒体中心提醒", _sys_mediaManagement_Repository.GetSingle(x => x.F_ID == input.F_Name).Result.F_Name + "媒体提醒", user, time, 1, 1, int.Parse(input.F_DeptId.Split(',')[input.F_DeptId.Split(',').Length - 1]), "", 0);
109
+                    }
110
+                    catch
111
+                    {
112
+
113
+                    }
114
+                  
115
+                }
116
+               
97
                 return Success("添加成功");
117
                 return Success("添加成功");
98
             }
118
             }
99
             else
119
             else
138
             var res = await _sys_mediacenter_Repository.Update (model);
158
             var res = await _sys_mediacenter_Repository.Update (model);
139
             if (res)
159
             if (res)
140
             {
160
             {
161
+                var InternalMessages = _sys_internalMessagesrepository.GetSingle(x => x.F_ID == model.F_ID).Result ;
162
+                if (InternalMessages!=null )
163
+                {
164
+                    if (input.F_IsRemind > 0)
165
+                    {
166
+                        try
167
+                        {
168
+                            InternalMessages.SMS_Content = _sys_mediaManagement_Repository.GetSingle(x => x.F_ID == input.F_Name).Result.F_Name + "媒体提醒";
169
+                            InternalMessages.SMS_Remindertime = input.F_ReminderTime;
170
+                            InternalMessages.SMS_Deptid = int.Parse(input.F_DeptId.Split(',')[input.F_DeptId.Split(',').Length - 1]);
171
+                            bool n = await _sys_internalMessagesrepository.Update(InternalMessages);
172
+                        }
173
+                        catch
174
+                        {
175
+
176
+                        }
177
+                    }
178
+                }
179
+                else
180
+                {
181
+                    if (input.F_IsRemind > 0)
182
+                    {
183
+                        try
184
+                        {
185
+                            bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(model.F_ID, "媒体中心提醒", _sys_mediaManagement_Repository.GetSingle(x => x.F_ID == input.F_Name).Result.F_Name + "媒体提醒", user, DateTime.Parse(input.F_ReminderTime.ToString()), 1, 1, int.Parse(input.F_DeptId.Split(',')[input.F_DeptId.Split(',').Length - 1]), "", 0);
186
+                        }
187
+                        catch
188
+                        {
189
+
190
+                        }
191
+                      
192
+                      
193
+                    }
194
+
195
+                }
196
+               
141
                 return Success("修改成功");
197
                 return Success("修改成功");
142
             }
198
             }
143
             else
199
             else
547
             model.F_IsRemind = input.F_IsRemind;// 是否提醒 0否1是
603
             model.F_IsRemind = input.F_IsRemind;// 是否提醒 0否1是
548
             if (model.F_IsRemind>0)
604
             if (model.F_IsRemind>0)
549
             {
605
             {
606
+               
607
+               
550
                 model.F_DeptId = input.F_DeptId;// 提醒部门
608
                 model.F_DeptId = input.F_DeptId;// 提醒部门
551
                 model.F_ReminderTime = input.F_ReminderTime;// 提醒时间
609
                 model.F_ReminderTime = input.F_ReminderTime;// 提醒时间
610
+                
552
             }
611
             }
553
             string MediaChangeid = "";
612
             string MediaChangeid = "";
554
             if (input.F_MediaChangeList != null)
613
             if (input.F_MediaChangeList != null)
607
             model.F_IsDelete = 0;
666
             model.F_IsDelete = 0;
608
             return model;
667
             return model;
609
         }
668
         }
669
+
610
         /// model转input
670
         /// model转input
611
         /// </summary>
671
         /// </summary>
612
         /// <param name="input"></param>
672
         /// <param name="input"></param>

+ 78 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/TaskManagement/TaskManagementController.cs

18
     [Route("api/[controller]")]
18
     [Route("api/[controller]")]
19
     public class TaskManagementController : BaseController
19
     public class TaskManagementController : BaseController
20
     {
20
     {
21
+        private readonly ISMS_InternalMessagesReposytory _sys_internalMessagesrepository;
21
         private readonly ISys_UserAccountRepository _sys_useraccountRepository;
22
         private readonly ISys_UserAccountRepository _sys_useraccountRepository;
22
         private readonly ISys_TaskManagementRepository _sys_taskmanagement_Repository;
23
         private readonly ISys_TaskManagementRepository _sys_taskmanagement_Repository;
23
         private readonly ISys_DepartmentRepository _sys_departmentRepository;
24
         private readonly ISys_DepartmentRepository _sys_departmentRepository;
24
         public TaskManagementController(ISys_TaskManagementRepository sys_taskmanagement_Repository, ISys_DepartmentRepository sys_departmentRepository,
25
         public TaskManagementController(ISys_TaskManagementRepository sys_taskmanagement_Repository, ISys_DepartmentRepository sys_departmentRepository,
25
-            ISys_UserAccountRepository sys_useraccountRepository)
26
+            ISys_UserAccountRepository sys_useraccountRepository, ISMS_InternalMessagesReposytory sys_internalMessagesrepository)
26
         {
27
         {
27
             _sys_taskmanagement_Repository = sys_taskmanagement_Repository;
28
             _sys_taskmanagement_Repository = sys_taskmanagement_Repository;
28
             _sys_departmentRepository = sys_departmentRepository;
29
             _sys_departmentRepository = sys_departmentRepository;
29
             _sys_useraccountRepository = sys_useraccountRepository;
30
             _sys_useraccountRepository = sys_useraccountRepository;
31
+            _sys_internalMessagesrepository = sys_internalMessagesrepository;
30
         }
32
         }
31
         /// <summary>
33
         /// <summary>
32
         /// 添加任务
34
         /// 添加任务
61
             input.F_CreateTime = DateTime.Now;
63
             input.F_CreateTime = DateTime.Now;
62
             input.F_CreateUser = user;
64
             input.F_CreateUser = user;
63
             input.F_IsDelete = 0;
65
             input.F_IsDelete = 0;
66
+
67
+           
68
+            
64
             var res = await _sys_taskmanagement_Repository.Add(input);
69
             var res = await _sys_taskmanagement_Repository.Add(input);
65
             if (res > 0)
70
             if (res > 0)
66
             {
71
             {
72
+                try
73
+                {
74
+                    DateTime time = DateTime.Parse(input.F_Remindertime.ToString());
75
+                    if (input .F_Tasker >0)
76
+                    {
77
+                        string usercode = _sys_useraccountRepository.GetSingle(x => x.F_UserId == input.F_Tasker).Result.F_UserCode;
78
+                        bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(res, "任务提醒", input.F_Name + "任务提醒", user, time, 1, 1, 0, usercode, 1);
79
+                    }
80
+                    else
81
+                    {
82
+                        bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(res, "任务提醒", input.F_Name + "任务提醒", user, time, 1, 1, int.Parse(input.F_Deptid.Split(',')[input.F_Deptid.Split(',').Length - 1]), "", 0);
83
+                    }
84
+                   
85
+                }
86
+                catch
87
+                {
88
+
89
+                }
67
                 return Success("添加成功");
90
                 return Success("添加成功");
68
             }
91
             }
69
             else
92
             else
112
             // model.F_UpdateUser = "8000";
135
             // model.F_UpdateUser = "8000";
113
             var b = await _sys_taskmanagement_Repository.Update(input);
136
             var b = await _sys_taskmanagement_Repository.Update(input);
114
             if (b)
137
             if (b)
138
+            {
139
+                DateTime time = DateTime.Parse(input.F_Remindertime.ToString());
140
+                var InternalMessages = _sys_internalMessagesrepository.GetSingle(x => x.F_ID == model.F_ID).Result;
141
+                if (InternalMessages!=null )
142
+                {
143
+                    try
144
+                    {
145
+                        if (input.F_Tasker > 0)
146
+                        {
147
+                            string usercode = _sys_useraccountRepository.GetSingle(x => x.F_UserId == input.F_Tasker).Result.F_UserCode;
148
+                            InternalMessages.SMS_Content = input.F_Name + "任务提醒";
149
+                            InternalMessages.SMS_Remindertime = input.F_Remindertime;
150
+                            InternalMessages.SMS_ReceiveUserCode = usercode;
151
+                            bool n = await _sys_internalMessagesrepository.Update(InternalMessages);
152
+                        }
153
+                        else
154
+                        {
155
+                            InternalMessages.SMS_Content = input.F_Name + "任务提醒";
156
+                            InternalMessages.SMS_Remindertime = input.F_Remindertime;
157
+                            InternalMessages.SMS_Deptid = int.Parse(input.F_Deptid.Split(',')[input.F_Deptid.Split(',').Length - 1]);
158
+                            bool n = await _sys_internalMessagesrepository.Update(InternalMessages);
159
+                        }
160
+                    }
161
+                    catch
162
+                    {
163
+
164
+                    }
165
+                 
166
+                }
167
+                else
168
+                {
169
+                    try
170
+                    {
171
+                        if (input.F_Tasker > 0)
172
+                        {
173
+                            string usercode = _sys_useraccountRepository.GetSingle(x => x.F_UserId == input.F_Tasker).Result.F_UserCode;
174
+                            bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(model.F_ID, "任务提醒", input.F_Name + "任务提醒", user, time, 1, 1, 0, usercode, 1);
175
+                        }
176
+                        else
177
+                        {
178
+                            bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_useraccountRepository).AddInternalMessagesInfo(model.F_ID, "任务提醒", input.F_Name + "任务提醒", user, time, 1, 1, int.Parse(input.F_Deptid.Split(',')[input.F_Deptid.Split(',').Length - 1]), "", 0);
179
+                        }
180
+                    }
181
+                    catch
182
+                    {
183
+
184
+                    }
185
+                  
186
+                }
187
+               
188
+                
115
                 return Success("修改成功");
189
                 return Success("修改成功");
190
+            }
191
+               
116
             return Error("修改失败");
192
             return Error("修改失败");
117
         }
193
         }
194
+        
118
         /// <summary>
195
         /// <summary>
119
         /// 删除任务
196
         /// 删除任务
120
         /// </summary>
197
         /// </summary>