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

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -2158,14 +2158,50 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             string jsonParam = "paras=" + paras.ToJson() + "&message=反馈工单&url=http://59.227.93.14:9000/share/fwgdfkjk&WorkOrderId=" + modelT_Bus_WorkOrder.F_WorkOrderId;
                             var responseString = HttpMethods.HttpPost(FrontUrl+ "/Affairs/receive_Push", jsonParam);
                             bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
-                            if (jo.state != "success")
+                            if (jo.state != "success"&& !jo.message .Contains ( "该任务单已反馈或退回"))
                             {
                                 return Error(jo.message );
                             }
+                            else
+                            {
+
+                                var modellist = new BLL.T_Bus_Supervision().GetModelList($"F_WorkOrderId='{modelT_Bus_WorkOrder.F_WorkOrderId }'");
+                                if (modellist!=null && modellist.Count >0)
+                                {
+                                    foreach (var model in modellist)
+                                    {
+                                        model.F_DealTime = DateTime.Now;
+                                        model.F_DealUser = User.F_UserCode;
+                                        model.F_Result = "已反馈";
+                                        model.F_State = 1;
+                                        Model.T_Bus_Operation oper2 = new Model.T_Bus_Operation();
+                                        oper2.F_WorkOrderId = model.F_WorkOrderId;
+                                        new BLL.T_Bus_Supervision().Update(model);
+                                        oper2.F_Message = userinfo + " 监察督办反馈了工单，反馈意见：" + "已反馈";
+                                        oper2.F_CreateUser = User.F_UserCode;
+                                        oper2.F_CreateTime = DateTime.Now;
+                                        oper2.F_IsDelete = 0;
+                                        operBLL.Add(oper2);
+                                        jcsupervise_finish paras1 = new jcsupervise_finish();
+                                        paras1.JC_SERIALNUM = model.F_Code;
+                                        paras1.JC_NAME = User.F_UserName;
+                                        paras1.JC_OPINION = "已反馈";
+                                        try
+                                        {
+                                            string jsonParam1 = "paras=" + paras1.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model.F_WorkOrderId;
+                                            var responseString1 = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam1);
+                                            bendiack jo1 = JsonConvert.DeserializeObject<bendiack>(responseString1);
+                                        }
+                                        catch
+                                        {
+                                        }
+                                    }
+                                }
+                            }
                         }
-                        catch
+                        catch (Exception e)
                         {
-
+                            return Error(e.Message );
                         }
 
                         workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);
@@ -2241,6 +2277,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     string message = "";
                     if (string.IsNullOrEmpty(token))
                         return Error("token获取失败");
+                    string userinfo = username + "(" + model.F_CloseUser + ")";
                     try
                     {
 
@@ -2260,13 +2297,86 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
                    values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", model.F_WorkOrderId, jsonParam, DateTime.Now, jo.code, jo.message, "反馈工单", "", "");
                                 object objres = DbHelperSQL.GetSingle(strSql);
+
+                                var modellist = new BLL.T_Bus_Supervision().GetModelList($"F_WorkOrderId='{model.F_WorkOrderId }'");
+                                if (modellist != null && modellist.Count > 0)
+                                {
+                                    foreach (var model1 in modellist)
+                                    {
+                                        model1.F_DealTime = DateTime.Now;
+                                        model1.F_DealUser = model.F_CloseUser;
+                                        model1.F_Result = "已反馈";
+                                        model1.F_State = 1;
+                                        Model.T_Bus_Operation oper2 = new Model.T_Bus_Operation();
+                                        oper2.F_WorkOrderId = model1.F_WorkOrderId;
+                                        new BLL.T_Bus_Supervision().Update(model1);
+                                        oper2.F_Message = userinfo + " 监察督办反馈了工单，反馈意见：" + "已反馈";
+                                        oper2.F_CreateUser = model.F_CloseUser;
+                                        oper2.F_CreateTime = DateTime.Now;
+                                        oper2.F_IsDelete = 0;
+                                        operBLL.Add(oper2);
+                                        jcsupervise_finish paras1 = new jcsupervise_finish();
+                                        paras1.JC_SERIALNUM = model1.F_Code;
+                                        paras1.JC_NAME = username;
+                                        paras1.JC_OPINION = "已反馈";
+                                        try
+                                        {
+                                            string jsonParam1 = "paras=" + paras1.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model1.F_WorkOrderId;
+                                            var responseString1 = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam1);
+                                            bendiack jo1 = JsonConvert.DeserializeObject<bendiack>(responseString1);
+                                        }
+                                        catch
+                                        {
+                                        }
+                                    }
+                                }
                             }
                             else
                             {
-                                Dictionary<string, object> keyValuePairs1 = new Dictionary<string, object>();
-                                keyValuePairs1.Add("F_Administrative", "1");
-                                workorderBLL.UpdateWorkOrder(model.F_Id, keyValuePairs1);
-
+                                if (jo.message .Contains ( "该任务单已反馈或退回"))
+                                {
+                                    Dictionary<string, object> keyValuePairs1 = new Dictionary<string, object>();
+                                    keyValuePairs1.Add("F_Administrative", "0");
+                                    workorderBLL.UpdateWorkOrder(model.F_Id, keyValuePairs1);
+                                    var modellist = new BLL.T_Bus_Supervision().GetModelList($"F_WorkOrderId='{model.F_WorkOrderId }'");
+                                    if (modellist != null && modellist.Count > 0)
+                                    {
+                                        foreach (var model1 in modellist)
+                                        {
+                                            model1.F_DealTime = DateTime.Now;
+                                            model1.F_DealUser = model.F_CloseUser;
+                                            model1.F_Result = "已反馈";
+                                            model1.F_State = 1;
+                                            Model.T_Bus_Operation oper2 = new Model.T_Bus_Operation();
+                                            oper2.F_WorkOrderId = model1.F_WorkOrderId;
+                                            new BLL.T_Bus_Supervision().Update(model1);
+                                            oper2.F_Message = userinfo + " 监察督办反馈了工单，反馈意见：" + "已反馈";
+                                            oper2.F_CreateUser = model.F_CloseUser;
+                                            oper2.F_CreateTime = DateTime.Now;
+                                            oper2.F_IsDelete = 0;
+                                            operBLL.Add(oper2);
+                                            jcsupervise_finish paras1 = new jcsupervise_finish();
+                                            paras1.JC_SERIALNUM = model1.F_Code;
+                                            paras1.JC_NAME = username;
+                                            paras1.JC_OPINION = "已反馈";
+                                            try
+                                            {
+                                                string jsonParam1 = "paras=" + paras1.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model1.F_WorkOrderId;
+                                                var responseString1 = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam1);
+                                                bendiack jo1 = JsonConvert.DeserializeObject<bendiack>(responseString1);
+                                            }
+                                            catch
+                                            {
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    Dictionary<string, object> keyValuePairs1 = new Dictionary<string, object>();
+                                    keyValuePairs1.Add("F_Administrative", "1");
+                                    workorderBLL.UpdateWorkOrder(model.F_Id, keyValuePairs1);
+                                }
 
                                 message = " 反馈省政务平台工单失败 " + jo.message;
                                 LogFactory.GetLogger("1234567").Error(responseString);
@@ -2315,7 +2425,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else
                     {
-                        string userinfo = username + "(" + model.F_CloseUser + ")";
+                       
                         oper1.F_Message = userinfo + message;
                     }
                     oper1.F_CreateUser = model.F_CloseUser;
@@ -2598,6 +2708,78 @@ namespace CallCenterApi.Interface.Controllers.workorder
             public string JC_OPINION { set; get; }
         }
         /// <summary>
+        /// 监察督办批量反馈接口
+        /// </summary>
+        /// <returns></returns>
+       // [Authority]
+        public ActionResult batchreceive_jcsupervise_finish()
+        {
+            var modellist = new BLL.T_Bus_Supervision().GetModelList ("F_State=0");
+            if (modellist != null&& modellist.Count >0)
+            {
+               foreach (var model in modellist)
+                {
+                    var modelbusworkorder = new BLL.T_Bus_WorkOrder().GetModel(model.F_WorkOrderId);
+                    if (modelbusworkorder!=null && modelbusworkorder.F_WorkState ==9)
+                    {
+                        #region 
+                        model.F_DealTime = DateTime.Now;
+                        model.F_DealUser = modelbusworkorder.F_CloseUser;
+                        model.F_Result = "已反馈";
+                        model.F_State = 1;
+                        #endregion
+                        #region 插入操作记录
+                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                        oper.F_WorkOrderId = model.F_WorkOrderId;
+                        new BLL.T_Bus_Supervision().Update(model);
+                        //  oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
+                        string username = "匿名";
+                        if (!string.IsNullOrEmpty(modelbusworkorder.F_CloseUser))
+                        {
+                            var user = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + modelbusworkorder.F_CloseUser + "')");
+                            if (user != null)
+                                username = user.ToString();
+                        }
+                        string userinfo = username + "(" + modelbusworkorder.F_CloseUser + ")";
+                        oper.F_Message = userinfo + " 监察督办反馈了工单，反馈意见：" + "已反馈";
+                        oper.F_CreateUser = modelbusworkorder.F_CloseUser;
+                        oper.F_CreateTime = DateTime.Now;
+                        oper.F_IsDelete = 0;
+                        operBLL.Add(oper);
+                        jcsupervise_finish paras = new jcsupervise_finish();
+                        paras.JC_SERIALNUM = model.F_Code;
+                        paras.JC_NAME = username;
+                        paras.JC_OPINION = "已反馈";
+
+                        try
+                        {
+                            string jsonParam = "paras=" + paras.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model.F_WorkOrderId;
+                            var responseString = HttpMethods.HttpPost(FrontUrl + "/Affairs/receive_Push", jsonParam);
+                            bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
+                            if (jo.state != "success")
+                                return Error("监察督办反馈失败"+jo.message );
+
+                        }
+                        catch
+                        {
+                            return Error("监察督办反馈失败");
+                        }
+                        #endregion
+                    }
+                }
+                return Success("操作成功");
+            }
+            else
+            {
+                return Error("操作失败");
+            }
+
+        }
+
+
+
+
+        /// <summary>
         /// 监察督办反馈接口
         /// </summary>
         /// <returns></returns>
@@ -2644,8 +2826,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                     try
                     {
-
-
                         string jsonParam = "paras=" + paras.ToJson() + "&message=监察督办反馈&url=http://59.227.93.14:9000/share/jcdbfkjk&WorkOrderId=" + model.F_WorkOrderId;
                         var responseString = HttpMethods.HttpPost(FrontUrl +"/Affairs/receive_Push", jsonParam);
                         bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
@@ -3782,7 +3962,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #region 参数
             int type = RequestString.GetInt("type", 0);//0监察督办1督察督办
             sql += " and F_Type ='" + type + "'";
-            int state = RequestString.GetInt("state", -1);//0未回复1已回复
+            int state = RequestString.GetInt("state", 0);//0未回复1已回复
             if (state > -1)
                 sql += " and F_State ='" + state + "'";
             string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -441,7 +441,9 @@ namespace CallCenterApi.Interface.Models.Common
                         {
 
                             if (InfoSource == "2580")
-                                buttons.Add(ejdelay());
+                            {
+                                //buttons.Add(ejdelay());
+                            }
                             else
                                 buttons.Add(delay());
                             if (ispd == "0" || ispd == ""|| ispd == "3")
@@ -716,7 +718,9 @@ namespace CallCenterApi.Interface.Models.Common
 
                         buttons.Add(feedback());
                         if (InfoSource == "2580")
-                            buttons.Add(ejdelay());
+                        {
+                           // buttons.Add(ejdelay());
+                        }
                         else
                             buttons.Add(delay());
                         buttons.Add(split());