Kaynağa Gözat

Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

liyuanyuan 2 yıl önce
ebeveyn
işleme
c8a6314d6f

+ 191 - 11
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

2158
                             string jsonParam = "paras=" + paras.ToJson() + "&message=反馈工单&url=http://59.227.93.14:9000/share/fwgdfkjk&WorkOrderId=" + modelT_Bus_WorkOrder.F_WorkOrderId;
2158
                             string jsonParam = "paras=" + paras.ToJson() + "&message=反馈工单&url=http://59.227.93.14:9000/share/fwgdfkjk&WorkOrderId=" + modelT_Bus_WorkOrder.F_WorkOrderId;
2159
                             var responseString = HttpMethods.HttpPost(FrontUrl+ "/Affairs/receive_Push", jsonParam);
2159
                             var responseString = HttpMethods.HttpPost(FrontUrl+ "/Affairs/receive_Push", jsonParam);
2160
                             bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
2160
                             bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
2161
-                            if (jo.state != "success")
2161
+                            if (jo.state != "success"&& !jo.message .Contains ( "该任务单已反馈或退回"))
2162
                             {
2162
                             {
2163
                                 return Error(jo.message );
2163
                                 return Error(jo.message );
2164
                             }
2164
                             }
2165
+                            else
2166
+                            {
2167
+
2168
+                                var modellist = new BLL.T_Bus_Supervision().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
2169
+                                if (modellist!=null && modellist.Count >0)
2170
+                                {
2171
+                                    foreach (var model in modellist)
2172
+                                    {
2173
+                                        model.F_DealTime = DateTime.Now;
2174
+                                        model.F_DealUser = User.F_UserCode;
2175
+                                        model.F_Result = "已反馈";
2176
+                                        model.F_State = 1;
2177
+                                        Model.T_Bus_Operation oper2 = new Model.T_Bus_Operation();
2178
+                                        oper2.F_WorkOrderId = model.F_WorkOrderId;
2179
+                                        new BLL.T_Bus_Supervision().Update(model);
2180
+                                        oper2.F_Message = userinfo + " 监察督办反馈了工单,反馈意见:" + "已反馈";
2181
+                                        oper2.F_CreateUser = User.F_UserCode;
2182
+                                        oper2.F_CreateTime = DateTime.Now;
2183
+                                        oper2.F_IsDelete = 0;
2184
+                                        operBLL.Add(oper2);
2185
+                                        jcsupervise_finish paras1 = new jcsupervise_finish();
2186
+                                        paras1.JC_SERIALNUM = model.F_Code;
2187
+                                        paras1.JC_NAME = User.F_UserName;
2188
+                                        paras1.JC_OPINION = "已反馈";
2189
+                                        try
2190
+                                        {
2191
+                                            string jsonParam1 = "paras=" + paras1.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model.F_WorkOrderId;
2192
+                                            var responseString1 = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam1);
2193
+                                            bendiack jo1 = JsonConvert.DeserializeObject<bendiack>(responseString1);
2194
+                                        }
2195
+                                        catch
2196
+                                        {
2197
+                                        }
2198
+                                    }
2199
+                                }
2200
+                            }
2165
                         }
2201
                         }
2166
-                        catch
2202
+                        catch (Exception e)
2167
                         {
2203
                         {
2168
-
2204
+                            return Error(e.Message );
2169
                         }
2205
                         }
2170
 
2206
 
2171
                         workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);
2207
                         workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);
2241
                     string message = "";
2277
                     string message = "";
2242
                     if (string.IsNullOrEmpty(token))
2278
                     if (string.IsNullOrEmpty(token))
2243
                         return Error("token获取失败");
2279
                         return Error("token获取失败");
2280
+                    string userinfo = username + "(" + model.F_CloseUser + ")";
2244
                     try
2281
                     try
2245
                     {
2282
                     {
2246
 
2283
 
2260
                                 string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
2297
                                 string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
2261
                    values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", model.F_WorkOrderId, jsonParam, DateTime.Now, jo.code, jo.message, "反馈工单", "", "");
2298
                    values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", model.F_WorkOrderId, jsonParam, DateTime.Now, jo.code, jo.message, "反馈工单", "", "");
2262
                                 object objres = DbHelperSQL.GetSingle(strSql);
2299
                                 object objres = DbHelperSQL.GetSingle(strSql);
2300
+
2301
+                                var modellist = new BLL.T_Bus_Supervision().GetModelList($"F_WorkOrderId='{model.F_WorkOrderId }'");
2302
+                                if (modellist != null && modellist.Count > 0)
2303
+                                {
2304
+                                    foreach (var model1 in modellist)
2305
+                                    {
2306
+                                        model1.F_DealTime = DateTime.Now;
2307
+                                        model1.F_DealUser = model.F_CloseUser;
2308
+                                        model1.F_Result = "已反馈";
2309
+                                        model1.F_State = 1;
2310
+                                        Model.T_Bus_Operation oper2 = new Model.T_Bus_Operation();
2311
+                                        oper2.F_WorkOrderId = model1.F_WorkOrderId;
2312
+                                        new BLL.T_Bus_Supervision().Update(model1);
2313
+                                        oper2.F_Message = userinfo + " 监察督办反馈了工单,反馈意见:" + "已反馈";
2314
+                                        oper2.F_CreateUser = model.F_CloseUser;
2315
+                                        oper2.F_CreateTime = DateTime.Now;
2316
+                                        oper2.F_IsDelete = 0;
2317
+                                        operBLL.Add(oper2);
2318
+                                        jcsupervise_finish paras1 = new jcsupervise_finish();
2319
+                                        paras1.JC_SERIALNUM = model1.F_Code;
2320
+                                        paras1.JC_NAME = username;
2321
+                                        paras1.JC_OPINION = "已反馈";
2322
+                                        try
2323
+                                        {
2324
+                                            string jsonParam1 = "paras=" + paras1.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model1.F_WorkOrderId;
2325
+                                            var responseString1 = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam1);
2326
+                                            bendiack jo1 = JsonConvert.DeserializeObject<bendiack>(responseString1);
2327
+                                        }
2328
+                                        catch
2329
+                                        {
2330
+                                        }
2331
+                                    }
2332
+                                }
2263
                             }
2333
                             }
2264
                             else
2334
                             else
2265
                             {
2335
                             {
2266
-                                Dictionary<string, object> keyValuePairs1 = new Dictionary<string, object>();
2267
-                                keyValuePairs1.Add("F_Administrative", "1");
2268
-                                workorderBLL.UpdateWorkOrder(model.F_Id, keyValuePairs1);
2269
-
2336
+                                if (jo.message .Contains ( "该任务单已反馈或退回"))
2337
+                                {
2338
+                                    Dictionary<string, object> keyValuePairs1 = new Dictionary<string, object>();
2339
+                                    keyValuePairs1.Add("F_Administrative", "0");
2340
+                                    workorderBLL.UpdateWorkOrder(model.F_Id, keyValuePairs1);
2341
+                                    var modellist = new BLL.T_Bus_Supervision().GetModelList($"F_WorkOrderId='{model.F_WorkOrderId }'");
2342
+                                    if (modellist != null && modellist.Count > 0)
2343
+                                    {
2344
+                                        foreach (var model1 in modellist)
2345
+                                        {
2346
+                                            model1.F_DealTime = DateTime.Now;
2347
+                                            model1.F_DealUser = model.F_CloseUser;
2348
+                                            model1.F_Result = "已反馈";
2349
+                                            model1.F_State = 1;
2350
+                                            Model.T_Bus_Operation oper2 = new Model.T_Bus_Operation();
2351
+                                            oper2.F_WorkOrderId = model1.F_WorkOrderId;
2352
+                                            new BLL.T_Bus_Supervision().Update(model1);
2353
+                                            oper2.F_Message = userinfo + " 监察督办反馈了工单,反馈意见:" + "已反馈";
2354
+                                            oper2.F_CreateUser = model.F_CloseUser;
2355
+                                            oper2.F_CreateTime = DateTime.Now;
2356
+                                            oper2.F_IsDelete = 0;
2357
+                                            operBLL.Add(oper2);
2358
+                                            jcsupervise_finish paras1 = new jcsupervise_finish();
2359
+                                            paras1.JC_SERIALNUM = model1.F_Code;
2360
+                                            paras1.JC_NAME = username;
2361
+                                            paras1.JC_OPINION = "已反馈";
2362
+                                            try
2363
+                                            {
2364
+                                                string jsonParam1 = "paras=" + paras1.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model1.F_WorkOrderId;
2365
+                                                var responseString1 = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam1);
2366
+                                                bendiack jo1 = JsonConvert.DeserializeObject<bendiack>(responseString1);
2367
+                                            }
2368
+                                            catch
2369
+                                            {
2370
+                                            }
2371
+                                        }
2372
+                                    }
2373
+                                }
2374
+                                else
2375
+                                {
2376
+                                    Dictionary<string, object> keyValuePairs1 = new Dictionary<string, object>();
2377
+                                    keyValuePairs1.Add("F_Administrative", "1");
2378
+                                    workorderBLL.UpdateWorkOrder(model.F_Id, keyValuePairs1);
2379
+                                }
2270
 
2380
 
2271
                                 message = " 反馈省政务平台工单失败 " + jo.message;
2381
                                 message = " 反馈省政务平台工单失败 " + jo.message;
2272
                                 LogFactory.GetLogger("1234567").Error(responseString);
2382
                                 LogFactory.GetLogger("1234567").Error(responseString);
2315
                     }
2425
                     }
2316
                     else
2426
                     else
2317
                     {
2427
                     {
2318
-                        string userinfo = username + "(" + model.F_CloseUser + ")";
2428
+                       
2319
                         oper1.F_Message = userinfo + message;
2429
                         oper1.F_Message = userinfo + message;
2320
                     }
2430
                     }
2321
                     oper1.F_CreateUser = model.F_CloseUser;
2431
                     oper1.F_CreateUser = model.F_CloseUser;
2598
             public string JC_OPINION { set; get; }
2708
             public string JC_OPINION { set; get; }
2599
         }
2709
         }
2600
         /// <summary>
2710
         /// <summary>
2711
+        /// 监察督办批量反馈接口
2712
+        /// </summary>
2713
+        /// <returns></returns>
2714
+       // [Authority]
2715
+        public ActionResult batchreceive_jcsupervise_finish()
2716
+        {
2717
+            var modellist = new BLL.T_Bus_Supervision().GetModelList ("F_State=0");
2718
+            if (modellist != null&& modellist.Count >0)
2719
+            {
2720
+               foreach (var model in modellist)
2721
+                {
2722
+                    var modelbusworkorder = new BLL.T_Bus_WorkOrder().GetModel(model.F_WorkOrderId);
2723
+                    if (modelbusworkorder!=null && modelbusworkorder.F_WorkState ==9)
2724
+                    {
2725
+                        #region 
2726
+                        model.F_DealTime = DateTime.Now;
2727
+                        model.F_DealUser = modelbusworkorder.F_CloseUser;
2728
+                        model.F_Result = "已反馈";
2729
+                        model.F_State = 1;
2730
+                        #endregion
2731
+                        #region 插入操作记录
2732
+                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
2733
+                        oper.F_WorkOrderId = model.F_WorkOrderId;
2734
+                        new BLL.T_Bus_Supervision().Update(model);
2735
+                        //  oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
2736
+                        string username = "匿名";
2737
+                        if (!string.IsNullOrEmpty(modelbusworkorder.F_CloseUser))
2738
+                        {
2739
+                            var user = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + modelbusworkorder.F_CloseUser + "')");
2740
+                            if (user != null)
2741
+                                username = user.ToString();
2742
+                        }
2743
+                        string userinfo = username + "(" + modelbusworkorder.F_CloseUser + ")";
2744
+                        oper.F_Message = userinfo + " 监察督办反馈了工单,反馈意见:" + "已反馈";
2745
+                        oper.F_CreateUser = modelbusworkorder.F_CloseUser;
2746
+                        oper.F_CreateTime = DateTime.Now;
2747
+                        oper.F_IsDelete = 0;
2748
+                        operBLL.Add(oper);
2749
+                        jcsupervise_finish paras = new jcsupervise_finish();
2750
+                        paras.JC_SERIALNUM = model.F_Code;
2751
+                        paras.JC_NAME = username;
2752
+                        paras.JC_OPINION = "已反馈";
2753
+
2754
+                        try
2755
+                        {
2756
+                            string jsonParam = "paras=" + paras.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model.F_WorkOrderId;
2757
+                            var responseString = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam);
2758
+                            bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
2759
+                            if (jo.state != "success")
2760
+                                return Error("监察督办反馈失败"+jo.message );
2761
+
2762
+                        }
2763
+                        catch
2764
+                        {
2765
+                            return Error("监察督办反馈失败");
2766
+                        }
2767
+                        #endregion
2768
+                    }
2769
+                }
2770
+                return Success("操作成功");
2771
+            }
2772
+            else
2773
+            {
2774
+                return Error("操作失败");
2775
+            }
2776
+
2777
+        }
2778
+
2779
+
2780
+
2781
+
2782
+        /// <summary>
2601
         /// 监察督办反馈接口
2783
         /// 监察督办反馈接口
2602
         /// </summary>
2784
         /// </summary>
2603
         /// <returns></returns>
2785
         /// <returns></returns>
2644
 
2826
 
2645
                     try
2827
                     try
2646
                     {
2828
                     {
2647
-
2648
-
2649
                         string jsonParam = "paras=" + paras.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model.F_WorkOrderId;
2829
                         string jsonParam = "paras=" + paras.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model.F_WorkOrderId;
2650
                         var responseString = HttpMethods.HttpPost(FrontUrl +"/Affairs/receive_Push", jsonParam);
2830
                         var responseString = HttpMethods.HttpPost(FrontUrl +"/Affairs/receive_Push", jsonParam);
2651
                         bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
2831
                         bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
3782
             #region 参数
3962
             #region 参数
3783
             int type = RequestString.GetInt("type", 0);//0监察督办1督察督办
3963
             int type = RequestString.GetInt("type", 0);//0监察督办1督察督办
3784
             sql += " and F_Type ='" + type + "'";
3964
             sql += " and F_Type ='" + type + "'";
3785
-            int state = RequestString.GetInt("state", -1);//0未回复1已回复
3965
+            int state = RequestString.GetInt("state", 0);//0未回复1已回复
3786
             if (state > -1)
3966
             if (state > -1)
3787
                 sql += " and F_State ='" + state + "'";
3967
                 sql += " and F_State ='" + state + "'";
3788
             string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
3968
             string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));

+ 6 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

441
                         {
441
                         {
442
 
442
 
443
                             if (InfoSource == "2580")
443
                             if (InfoSource == "2580")
444
-                                buttons.Add(ejdelay());
444
+                            {
445
+                                //buttons.Add(ejdelay());
446
+                            }
445
                             else
447
                             else
446
                                 buttons.Add(delay());
448
                                 buttons.Add(delay());
447
                             if (ispd == "0" || ispd == ""|| ispd == "3")
449
                             if (ispd == "0" || ispd == ""|| ispd == "3")
716
 
718
 
717
                         buttons.Add(feedback());
719
                         buttons.Add(feedback());
718
                         if (InfoSource == "2580")
720
                         if (InfoSource == "2580")
719
-                            buttons.Add(ejdelay());
721
+                        {
722
+                           // buttons.Add(ejdelay());
723
+                        }
720
                         else
724
                         else
721
                             buttons.Add(delay());
725
                             buttons.Add(delay());
722
                         buttons.Add(split());
726
                         buttons.Add(split());