duhongyu 3 anni fa
parent
commit
316b7e4cf2

+ 20 - 16
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

263
                         {
263
                         {
264
                             foreach (var iv in user)
264
                             foreach (var iv in user)
265
                             {
265
                             {
266
-                                if (!string.IsNullOrEmpty(iv.F_Mobile))
267
-                                {
268
-                                    string count = " 您有工单24小时后超期,请及时处理,工单号" + it.F_WorkOrderId;
269
-                                    Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
270
-                                    keyValuePairs.Add("F_Remind", "1");
271
-                                    bool t = new BLL.T_Bus_WorkOrder().UpdateWorkOrder(it.F_Id, keyValuePairs);
272
-                                    PushApp("临期提醒", count, iv.F_UserCode);
273
-                                }
266
+                                string count = " 您有工单24小时后超期,请及时处理,工单号" + it.F_WorkOrderId;
267
+                                PushApp("临期提醒", count, iv.F_UserCode);
268
+                                //if (!string.IsNullOrEmpty(iv.F_Mobile))
269
+                                //{
270
+                                  
271
+                                //    Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
272
+                                //    keyValuePairs.Add("F_Remind", "1");
273
+                                //    bool t = new BLL.T_Bus_WorkOrder().UpdateWorkOrder(it.F_Id, keyValuePairs);
274
+                                   
275
+                                //}
274
                             }
276
                             }
275
                         }
277
                         }
276
                     }
278
                     }
287
                     {
289
                     {
288
                         foreach (var iv in user)
290
                         foreach (var iv in user)
289
                         {
291
                         {
290
-                            if (!string.IsNullOrEmpty(iv.F_Mobile))
291
-                            {
292
-                                string count = " 您有工单已超期,请及时处理,工单号" + it.F_WorkOrderId;
293
-                                Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
294
-                                keyValuePairs.Add("F_Remind", "2");
295
-                                bool t = new BLL.T_Bus_WorkOrder().UpdateWorkOrder(it.F_Id, keyValuePairs);
296
-                                PushApp("超期提醒", count, iv.F_UserCode);
297
-                            }
292
+                            string count = " 您有工单已超期,请及时处理,工单号" + it.F_WorkOrderId;
293
+                            PushApp("超期提醒", count, iv.F_UserCode);
294
+                            //if (!string.IsNullOrEmpty(iv.F_Mobile))
295
+                            //{
296
+                               
297
+                            //    Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
298
+                            //    keyValuePairs.Add("F_Remind", "2");
299
+                            //    bool t = new BLL.T_Bus_WorkOrder().UpdateWorkOrder(it.F_Id, keyValuePairs);
300
+                               
301
+                            //}
298
                         }
302
                         }
299
                     }
303
                     }
300
                 }
304
                 }

+ 29 - 22
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

98
             if (isopen > -1)
98
             if (isopen > -1)
99
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
99
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
100
 
100
 
101
+            string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("strworkorderid"));
102
+            if (strworkorderid.Trim() != "" && strworkorderid != "undefined")
103
+            {
101
 
104
 
105
+                sql += " and F_WorkOrderId in( select F_WorkOrderId   from T_Sys_Affairs  where CASE_SERIAL like'%" + strworkorderid + "%') ";
106
+            }
102
             if (IsRelease > 0)
107
             if (IsRelease > 0)
103
             {
108
             {
104
                 if (IsRelease == 1)
109
                 if (IsRelease == 1)
12824
                 {
12829
                 {
12825
                     foreach (var iv in user)
12830
                     foreach (var iv in user)
12826
                     {
12831
                     {
12827
-
12828
-                        msg.AddInternalMessagesInfo("催单消息", "您的工单" + workorderid + "收到催办,请及时处理!", iv.F_UserCode, User.F_UserCode, (int)EnumSmsType.additional);
12829
-                        if (!string.IsNullOrEmpty(iv.F_Mobile))
12830
-                        {
12831
-                            string count = "您的工单" + workorderid + "收到催办,请及时处理!";
12832
-                            // string msg = workorderid;
12833
-                            //bool n = SMSController.AddSmS(0, msg, count, iv.F_Mobile, "165151", "", workorderid);
12834
-                            string mag = "[\"" + workorderid + "\"]";
12835
-                            string v = SmsNewController.AddSmS(0, count, iv.F_Mobile, "681240804383522816", mag,
12836
-                            workorderid);
12837
-                            string c = PushMessageController.PushApp("催单提醒", count, iv.F_UserCode);
12838
-                        }
12832
+                        string count = "您的工单" + workorderid + "收到催办,请及时处理!";
12833
+                        string c = PushMessageController.PushApp("催单提醒", count, iv.F_UserCode);
12834
+                        //msg.AddInternalMessagesInfo("催单消息", "您的工单" + workorderid + "收到催办,请及时处理!", iv.F_UserCode, User.F_UserCode, (int)EnumSmsType.additional);
12835
+                        //if (!string.IsNullOrEmpty(iv.F_Mobile))
12836
+                        //{
12837
+                           
12838
+                        //    // string msg = workorderid;
12839
+                        //    //bool n = SMSController.AddSmS(0, msg, count, iv.F_Mobile, "165151", "", workorderid);
12840
+                        //    string mag = "[\"" + workorderid + "\"]";
12841
+                        //    string v = SmsNewController.AddSmS(0, count, iv.F_Mobile, "681240804383522816", mag,
12842
+                        //    workorderid);
12843
+                           
12844
+                        //}
12839
                     }
12845
                     }
12840
                 }
12846
                 }
12841
 
12847
 
12847
                 {
12853
                 {
12848
                     foreach (var iv in user)
12854
                     foreach (var iv in user)
12849
                     {
12855
                     {
12850
-
12851
-                        msg.AddInternalMessagesInfo("催单消息", "您的工单" + workorderid + "收到催办,请及时处理!", iv.F_UserCode, User.F_UserCode, (int)EnumSmsType.additional);
12852
-                        if (!string.IsNullOrEmpty(iv.F_Mobile))
12853
-                        {
12854
-                            string count = "您的工单" + workorderid + "收到催办,请及时处理!";
12855
-                            string mag = "[\"" + workorderid + "\"]";
12856
-                            string v = SmsNewController.AddSmS(0, count, iv.F_Mobile, "681240804383522816", mag,
12857
-                            workorderid);
12858
-                            string c = PushMessageController.PushApp("催单提醒", count, iv.F_UserCode);
12859
-                        }
12856
+                        string count = "您的工单" + workorderid + "收到催办,请及时处理!";
12857
+                        string c = PushMessageController.PushApp("催单提醒", count, iv.F_UserCode);
12858
+                        //msg.AddInternalMessagesInfo("催单消息", "您的工单" + workorderid + "收到催办,请及时处理!", iv.F_UserCode, User.F_UserCode, (int)EnumSmsType.additional);
12859
+                        //if (!string.IsNullOrEmpty(iv.F_Mobile))
12860
+                        //{
12861
+                          
12862
+                        //    string mag = "[\"" + workorderid + "\"]";
12863
+                        //    string v = SmsNewController.AddSmS(0, count, iv.F_Mobile, "681240804383522816", mag,
12864
+                        //    workorderid);
12865
+                           
12866
+                        //}
12860
                     }
12867
                     }
12861
                 }
12868
                 }
12862
             }
12869
             }