啧啧啧啧啧啧做做做做做做做做做做做做做

CallCenterApi/CallCenterApi.DAL/T_Bus_ToExamine.cs

@@ -50,9 +50,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Bus_ToExamine(");
-            strSql.Append("F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId)");
+            strSql.Append("F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_LimitTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_CreatUser,@F_Type,@F_Result,@F_IsDelete,@AuditUser,@F_State,@F_MainDeptId)");
+            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_CreatUser,@F_Type,@F_Result,@F_IsDelete,@AuditUser,@F_State,@F_MainDeptId,@F_LimitTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,50),
@@ -63,7 +63,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     new SqlParameter("@AuditUser", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_MainDeptId", SqlDbType.NVarChar,500),
-                    new SqlParameter("@F_State", SqlDbType.Int,4)};
+                    new SqlParameter("@F_State", SqlDbType.Int,4) ,
+             new SqlParameter("@F_LimitTime", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_AssignedId;
             parameters[2].Value = model.F_CreatUser;
@@ -73,7 +74,7 @@ namespace CallCenterApi.DAL
             parameters[6].Value = model.AuditUser;
             parameters[7].Value = model.F_MainDeptId;
             parameters[8].Value = model.F_State;
-
+            parameters[9].Value = model.F_LimitTime;
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -99,6 +100,7 @@ namespace CallCenterApi.DAL
             strSql.Append("AuditUser=@AuditUser,");
             strSql.Append("F_State=@F_State,");
             strSql.Append("F_MainDeptId=@F_MainDeptId,");
+            strSql.Append("F_LimitTime=@F_LimitTime,");
             strSql.Append("F_IsDelete=@F_IsDelete");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
@@ -110,6 +112,7 @@ namespace CallCenterApi.DAL
                         new SqlParameter("@AuditUser", SqlDbType.NVarChar,50),
                          new SqlParameter("@F_State", SqlDbType.Int,4),
                           new SqlParameter("@F_MainDeptId", SqlDbType.NVarChar,500),
+                           new SqlParameter("@F_LimitTime", SqlDbType.Int,4),
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderId;
@@ -120,8 +123,9 @@ namespace CallCenterApi.DAL
             parameters[5].Value = model.AuditUser;
             parameters[6].Value = model.F_State;
             parameters[7].Value = model.F_MainDeptId;
-            parameters[8].Value = model.F_IsDelete;
-            parameters[9].Value = model.F_ID;
+            parameters[8].Value = model.F_LimitTime;
+            parameters[9].Value = model.F_IsDelete;
+            parameters[10].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -185,7 +189,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId from T_Bus_ToExamine ");
+            strSql.Append("select  top 1 F_ID,F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_LimitTime,F_MainDeptId from T_Bus_ToExamine ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -257,6 +261,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Type = int.Parse(row["F_Type"].ToString());
                 }
+                if (row["F_LimitTime"] != null && row["F_LimitTime"].ToString() != "")
+                {
+                    model.F_LimitTime = int.Parse(row["F_LimitTime"].ToString());
+                }
+                
                 if (row["F_Result"] != null)
                 {
                     model.F_Result = row["F_Result"].ToString();
@@ -288,7 +297,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId ");
+            strSql.Append("select F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId ");
             strSql.Append(" FROM T_Bus_ToExamine ");
             if (strWhere.Trim() != "")
             {
@@ -308,7 +317,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId ");
+            strSql.Append(" F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId ");
             strSql.Append(" FROM T_Bus_ToExamine ");
             if (strWhere.Trim() != "")
             {

CallCenterApi/CallCenterApi.DAL/T_SMS_RecvSMS.cs

@@ -43,7 +43,7 @@ namespace CallCenterApi.DAL
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
 					new SqlParameter("@CallerNum", SqlDbType.VarChar,20),
-					new SqlParameter("@Content", SqlDbType.NVarChar,100),
+					new SqlParameter("@Content", SqlDbType.NVarChar,-1),
 					new SqlParameter("@RecvTime", SqlDbType.DateTime),
 					new SqlParameter("@RecvModemIMEI", SqlDbType.VarChar,20),
 					new SqlParameter("@F_UserID", SqlDbType.Int,4),

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -109,14 +109,14 @@
   <add key="OutSignCode" value="$AY12345#" />
   <add key="Affairs" value="0" />
 
-<add key="APP_CODE" value="d377d97d7e9346e7831351ee5b62a418" />
+  <!--   <add key="APP_CODE" value="d377d97d7e9346e7831351ee5b62a418" />
   <add key="APP_SECRET" value="ff24bb32f2e14ea595dcd1748feceabd" />
   
-  <add key="Rmwurl" value="http://api-qa-dfbbs.peopletech.cn/pro-dfbbs-api" />
+  <add key="Rmwurl" value="http://api-qa-dfbbs.peopletech.cn/pro-dfbbs-api" />       -->  
 
-<!--<add key="APP_CODE" value="314f185e71e74dd8879ab154746f7681" />
+<add key="APP_CODE" value="314f185e71e74dd8879ab154746f7681" />
   <add key="APP_SECRET" value="900a640b37e84a8c88ffc83d6f3500f6" />
-  <add key="Rmwurl" value="http://liuyan-api.people.com.cn/api" />-->
-  
-    <add key="AppUrl" value="http://111.6.36.62:8001" />
+  <add key="Rmwurl" value="http://liuyan-api.people.com.cn/api" />
+
+  <add key="AppUrl" value="http://111.6.36.62:8001" />       
 </appSettings>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/APPController.cs

@@ -239,8 +239,8 @@ namespace CallCenterApi.Interface.Controllers
                 string url = appurl + "/gsp/uc11002";
                 var txnBodyCom = new SortedDictionary<string, string>
                {
-                {"userMobile", userMobile},//用户手机号
-                {"loginNo",loginNo},//33 自然人注册&登录  
+                {"userMobile", userMobile},
+                {"loginNo",loginNo},
                  {"acctType", "10"},
                   {"loginType", "AU09"},
                   {"loginPassword", loginPassword},

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SMSController.cs

@@ -266,6 +266,7 @@ namespace CallCenterApi.Interface.Controllers
             string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
             string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
+            int  type = RequestString.GetInt("type", 0);
             int State = RequestString.GetInt ("state", 0);
             string strpageindex = RequestString.GetQueryString("page");
             int pageindex = 1;
@@ -284,7 +285,17 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sql += " and RecvTime <= '" + Convert.ToDateTime(strendtime.Trim()) + "' ";
             }
-           
+           if (type>0)
+            {
+                if (type ==1)
+                {
+                    sql += " and F_CustomerID=1 ";
+                }
+                else
+                {
+                    sql += " and F_CustomerID is null ";
+                }
+            }
             if (strpageindex.Trim() != "")
             {
                 pageindex = Convert.ToInt32(strpageindex);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SmsNewController.cs

@@ -28,219 +28,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
         {
             return Content("Index");
         }
-        /// <summary>
-        /// 添加人民网回复
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult Reply(string workorderid, string content, string organization)
-        {
-
-            var mdoel = new BLL.T_Bus_WorkOrder().GetModelList("F_WorkOrderId='" + workorderid + "' and F_IsDelete=0");
-            if (mdoel != null && mdoel.Count > 0)
-            {
-                var modelPeople = new BLL.T_Bus_People().GetModelList("F_WorkOrderId='" + mdoel.First().F_WorkOrderId + "' ");
-                var prople = new Model.T_Bus_People();
-                if (modelPeople != null && modelPeople.Count > 0)
-                {
-                    prople = modelPeople.FirstOrDefault();
-                }
-                else
-                {
-                    return Error("此工单非从网站抓取工单");
-                }
-                if (content.Length < 20)
-                {
-                    return Error("回复内容应在20字以上");
-                }
-                string token = Login();
-                Dictionary<string, object> LY = new Dictionary<string, object>();
-                LY.Add("tid", prople.tid);
-                LY.Add("asContent", content);
-                LY.Add("organization", organization);
-                Dictionary<string, object> ParamMap = new Dictionary<string, object>();
-                ParamMap.Add("answer", LY);
-                if (prople.state == 1)
-                {
-                    //序列化参数
-                    // 发送请求
-                    var request = (HttpWebRequest)WebRequest.Create("http://api-qa-dfbbs.peopletech.cn/pro-dfbbs-api/v1/org/addExplainOne");
-                    request.Method = "POST";
-                    request.ContentType = "application/json;charset=UTF-8";
-                    var byteData = Encoding.UTF8.GetBytes(createParamMap("/v1/org/addExplainOne", ParamMap.ToJson(), token).ToJson());
-                    var length = byteData.Length;
-                    request.ContentLength = length;
-                    var writer = request.GetRequestStream();
-                    writer.Write(byteData, 0, length);
-                    writer.Close();
-                    //接收数据
-                    var response = (HttpWebResponse)request.GetResponse();
-                    var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
-                   
-                    try
-                    {
-                        JObject paras = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(responseString);
-                        var txnBodyCom = paras["result"].ToString();
-                        var result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
-                        if (result["code"].ToString()=="0")
-                        {
-                            prople.state = 3;
-                            bool n = new BLL.T_Bus_People().Update(prople);
-                            return Success("回复成功");
-                        }
-                        else
-                        {
-                            return Error ( result["msgDesc"].ToString());
-                        }
-                       
-                    }
-                    catch
-                    {
-                        return Error("回复失败");
-                    }
-                   
-                }
-                else if (prople.state == 2)
-                {
-
-                    //序列化参数
-                    // 发送请求
-                    var request = (HttpWebRequest)WebRequest.Create("http://api-qa-dfbbs.peopletech.cn/pro-dfbbs-api/v1/org/addExplainTwo");
-                    request.Method = "POST";
-                    request.ContentType = "application/json;charset=UTF-8";
-                    var byteData = Encoding.UTF8.GetBytes(createParamMap("/v1/org/addExplainTwo", ParamMap.ToJson(), token).ToJson());
-                    var length = byteData.Length;
-                    request.ContentLength = length;
-                    var writer = request.GetRequestStream();
-                    writer.Write(byteData, 0, length);
-                    writer.Close();
-                    //接收数据
-                    var response = (HttpWebResponse)request.GetResponse();
-                    var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
-
-
-                    try
-                    {
-                        JObject paras = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(responseString);
-                        var txnBodyCom = paras["result"].ToString();
-                        var result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
-                        if (result["code"].ToString() == "0")
-                        {
-                            prople.state = 3;
-                            bool n = new BLL.T_Bus_People().Update(prople);
-                            return Success("回复成功");
-                        }
-                        else
-                        {
-                            return Error(result["msgDesc"].ToString());
-                        }
-
-                    }
-                    catch
-                    {
-                        return Error("回复失败");
-                    }
-                }
-                else
-                {  //序列化参数
-                    // 发送请求
-                    var request = (HttpWebRequest)WebRequest.Create("http://api-qa-dfbbs.peopletech.cn/pro-dfbbs-api/v1/org/addAnswerOne");
-                    request.Method = "POST";
-                    request.ContentType = "application/json;charset=UTF-8";
-                    var byteData = Encoding.UTF8.GetBytes(createParamMap("/v1/org/addAnswerOne", ParamMap.ToJson(), token).ToJson());
-                    var length = byteData.Length;
-                    request.ContentLength = length;
-                    var writer = request.GetRequestStream();
-                    writer.Write(byteData, 0, length);
-                    writer.Close();
-                    //接收数据
-                    var response = (HttpWebResponse)request.GetResponse();
-                    var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
-                    try
-                    {
-                        JObject paras = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(responseString);
-                        var txnBodyCom = paras["result"].ToString();
-                        var result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
-                        if (result["code"].ToString() == "0")
-                        {
-                            prople.state = 3;
-                            bool n = new BLL.T_Bus_People().Update(prople);
-                            return Success("回复成功");
-                        }
-                        else
-                        {
-                            return Error(result["msgDesc"].ToString());
-                        }
-
-                    }
-                    catch
-                    {
-                        return Error("回复失败");
-                    }
-
-                }
-
-            }
-            else
-            {
-                return Error("工单不存在");
-            }
-
-
-        }
-
-        public string Login()
-        {
-            Dictionary<string, string> login = new Dictionary<string, string>();
-            login.Add("loginName", "ayszxx");
-            login.Add("password", "5116008");
-            //序列化参数
-
-            // 发送请求
-            //序列化参数
-
-            // 发送请求
-            var request = (HttpWebRequest)WebRequest.Create("http://api-qa-dfbbs.peopletech.cn/pro-dfbbs-api/v1/user/login");
-            request.Method = "POST";
-            request.ContentType = "application/json;charset=UTF-8";
-
-            var byteData = Encoding.UTF8.GetBytes(createParamMap("/v1/user/login", login.ToJson()).ToJson());
-            var length = byteData.Length;
-            request.ContentLength = length;
-            var writer = request.GetRequestStream();
-            writer.Write(byteData, 0, length);
-            writer.Close();
-            //接收数据
-            var response = (HttpWebResponse)request.GetResponse();
-            var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
-            JObject paras = null;
-            paras = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(responseString);
-            var txnBodyCom = paras["resultData"].ToString();
-            var result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
-            //  token = jo["token"].ToString();
-            // string result = SmsNewHelper.Send(mobiles, Content);
-
-            return result["token"].ToString();
-        }
-        private string APP_CODE = "d377d97d7e9346e7831351ee5b62a418";
-        private string APP_SECRET = "ff24bb32f2e14ea595dcd1748feceabd";
-        public Dictionary<string, string> createParamMap(string url, string param)
-        {
-            Dictionary<string, string> parame = new Dictionary<string, string>();
-            parame.Add("appCode", APP_CODE);
-            parame.Add("param", param);
-            parame.Add("signature", Md5(url + param + APP_SECRET));
-            return parame;
-        }
-
-        public Dictionary<string, string> createParamMap(string url, string param, string token)
-        {
-            Dictionary<string, string> parame = new Dictionary<string, string>();
-            parame.Add("token", token);
-            parame.Add("appCode", APP_CODE);
-            parame.Add("param", param);
-            parame.Add("signature", Md5(url + param + APP_SECRET + token));
-            return parame;
-        }
+        private BLL.T_Bus_Operation operBLL = new BLL.T_Bus_Operation();
         /// <summary>
         /// MD5加密
         /// </summary>
@@ -338,6 +126,16 @@ namespace CallCenterApi.Interface.Controllers.Sms
                                         keyValuePairs.Add("F_StandardIDS", "");
                                         keyValuePairs.Add("F_ToBereply", 0);
                                         new BLL .T_Bus_WorkOrder ().UpdateWorkOrder(model.F_Id, keyValuePairs);
+                                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                                        oper.F_WorkOrderId = model.F_WorkOrderId;
+                                        // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
+                                        oper.F_State = model.F_WorkState;
+                                        oper.F_Message = "市民短信评议基本满意，自动结案";
+                                        oper.F_CreateUser = User.F_UserCode;
+                                        oper.F_CreateTime = DateTime.Now;
+                                        oper.F_IsDelete = 0;
+                                        operBLL.Add(oper);
+                                       
                                     }
                                     else if (Split[1].Trim().Trim('+').Contains("满意") || Split[1].Trim().Trim('+').Contains("1"))
                                     {
@@ -353,6 +151,15 @@ namespace CallCenterApi.Interface.Controllers.Sms
                                         keyValuePairs.Add("F_StandardIDS", "");
                                         keyValuePairs.Add("F_ToBereply", 0);
                                         new BLL.T_Bus_WorkOrder().UpdateWorkOrder(model.F_Id, keyValuePairs);
+                                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                                        oper.F_WorkOrderId = model.F_WorkOrderId;
+                                        // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
+                                        oper.F_State = model.F_WorkState;
+                                        oper.F_Message = "市民短信评议满意，自动结案";
+                                        oper.F_CreateUser = User.F_UserCode;
+                                        oper.F_CreateTime = DateTime.Now;
+                                        oper.F_IsDelete = 0;
+                                        operBLL.Add(oper);
                                     }
                                     else
                                     {
@@ -362,6 +169,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
                                     string strSql = string.Format(@"INSERT INTO PublicComment ( [WorkOrderId], [strStm_Src_Dsc], [strWrkOrder_Cst_Ssf_Cd], [strUdt_Psn_ID], [strSsf_Cst_Ass_CntDsc], [strRltv_InsID], [strInpt_Inst_Nm], [strHpCnt], [CreateTime],[str_type]) 
                    values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}') ;select @@IDENTITY ", model.F_WorkOrderId , strStm_Src_Dsc, strWrkOrder_Cst_Ssf_Cd, "", content, "", "", "", DateTime.Now, 1);
                                     object objres = DbHelperSQL.GetSingle(strSql);
+                                    dModel.F_CustomerID = 1;
                                 }
                                 
                             }
@@ -415,6 +223,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
                                     string strSql = string.Format(@"INSERT INTO PublicComment ( [WorkOrderId], [strStm_Src_Dsc], [strWrkOrder_Cst_Ssf_Cd], [strUdt_Psn_ID], [strSsf_Cst_Ass_CntDsc], [strRltv_InsID], [strInpt_Inst_Nm], [strHpCnt], [CreateTime],[str_type]) 
                    values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}') ;select @@IDENTITY ", model.F_WorkOrderId, strStm_Src_Dsc, strWrkOrder_Cst_Ssf_Cd, "", content, "", "", "", DateTime.Now, 1);
                                     object objres = DbHelperSQL.GetSingle(strSql);
+                                    dModel.F_CustomerID = 1;
                                 }
 
 
@@ -578,6 +387,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
                 jsArr.Add("templateCode", templateCode);
               
                 //"[\"变量值1\",\"变量值2\"]"
+                if (!string .IsNullOrEmpty (templateParam))
                 jsArr.Add("templateParam", templateParam);
               
                 //将headers参与与接口报文参数合并、排序，并生成本次请求的签名信息
@@ -602,7 +412,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
                 JObject jo = (JObject)JsonConvert.DeserializeObject(result);
                
                 string code = jo["code"].ToString();
-              
+               
 
                 if (code == "200")
                 {
@@ -626,7 +436,9 @@ namespace CallCenterApi.Interface.Controllers.Sms
                 }
                 else
                 {
-                    return code;
+                    string desc = jo["message"].ToString();
+                    return code+"("+ desc+")";
+                    
                 }
                 
             }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TotalTelController.cs

@@ -25,7 +25,7 @@ namespace CallCenterApi.Interface.Controllers.report
         }
         private string[] getcols()
         {
-            String[] str = { "时间", "电话呼入次数", "电话呼出次数", "正常呼入接听次数", "呼入未接通次数", "呼入主动放弃次数", "黑名单拒接", "平均呼入时间", "峰值排队人数" };
+            String[] str = { "时间", "电话呼入次数", "电话呼出次数", "正常呼入接听次数", "呼入未接通次数", "呼入主动放弃次数", "黑名单拒接", "平均呼入时间", "峰值排队人数", "正常呼出接听次数" };
             return str;
         }
 
@@ -75,7 +75,8 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc8 = new DataColumn("电话骚扰次数", Type.GetType("System.String"));
             DataColumn dc9 = new DataColumn("平均呼入时间", Type.GetType("System.String"));
             DataColumn dc10 = new DataColumn("峰值排队人数", Type.GetType("System.String"));
-
+            DataColumn dc11 = new DataColumn("正常呼出接听次数", Type.GetType("System.String"));
+          
             dtNew.Columns.Add(dc1);
             dtNew.Columns.Add(dc2);
             dtNew.Columns.Add(dc3);
@@ -86,6 +87,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc8);
             dtNew.Columns.Add(dc9);
             dtNew.Columns.Add(dc10);
+            dtNew.Columns.Add(dc11);
             #endregion
 
             DateTime beginTime;
@@ -125,6 +127,10 @@ namespace CallCenterApi.Interface.Controllers.report
                 int callincount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0").Length;
                 int calloutcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1").Length;
                 int callinjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0 and CallState=1 ").Length;
+                int callinhcjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1 and CallState=1 ").Length;
+
+
+
                 //int lycount = dtly.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and DealType=4 ").Length; ;
                 //int lycount = dtly.Select("F_LeaveTime >='" + t.ToString() + "' and F_LeaveTime<'" + t.AddDays(1).ToString() + "' ").Length; ;
                 int srcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and DealType=1 ").Length;
@@ -152,6 +158,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 //drNew["语音留言次数"] = lycount;
                 drNew["主动放弃次数"] = fqcount;
                 drNew["电话骚扰次数"] = srcount;
+                drNew["正常呼出接听次数"] = callinhcjtcount;
                 if ((callincount + calloutcount) > 0 && double.Parse(thsc) > 0)
                     drNew["平均呼入时间"] = DateTimeConvert.parseTimeSeconds((int)(double.Parse(thsc) / callinjtcount), 0);
                 else
@@ -174,6 +181,8 @@ namespace CallCenterApi.Interface.Controllers.report
             //drtNew["语音留言次数"] = tlycount;
             drtNew["主动放弃次数"] = tfqcount;
             drtNew["电话骚扰次数"] = tsrcount;
+            
+            
             if ((tcallincount + tcalloutcount) > 0 && tthsc > 0)
                 drtNew["平均呼入时间"] = DateTimeConvert.parseTimeSeconds((int)(tthsc / tcallinjtcount), 0);
             else

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/ZuoXiWorkTotalController.cs

@@ -29,7 +29,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         ,"平均接听通话秒数","平均振铃秒数","呼入占有率","用户评价","坐席登录次数"
                         ,"登录时长分钟数","工作时长分钟数","平均每天工作时长（小时）"
                         ,"置忙次数","休息时长分钟数","平均每天休息时长（小时）"
-                        ,"置忙平均休息分钟数"//,"质检平均成绩"
+                        ,"置忙平均休息分钟数","回拨量"//,"质检平均成绩"
                 };
             return Success("获取坐席工作统计表头成功", str);
         }
@@ -87,6 +87,7 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc23 = new DataColumn("休息时长分钟数");
             DataColumn dc24 = new DataColumn("平均每天休息时长");
             DataColumn dc25 = new DataColumn("置忙平均休息分钟数");
+            DataColumn dc26 = new DataColumn("回拨量");
             //DataColumn dc26 = new DataColumn("质检平均成绩");
 
             dtNew.Columns.Add(dc1);
@@ -114,7 +115,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc23);
             dtNew.Columns.Add(dc24);
             dtNew.Columns.Add(dc25);
-            //dtNew.Columns.Add(dc26);
+            dtNew.Columns.Add(dc26);
             #endregion
             int days = 30;
             string sqltimeCallRecords = "";
@@ -163,12 +164,16 @@ namespace CallCenterApi.Interface.Controllers.report
             DataTable dtCallEvey = DbHelperSQL.Query("select usercode,COUNT(*) as ct,SUM(TalkLongTime) as sc from T_Call_CallRecords WITH(NOLOCK) where CallState=1 " + strsqlcall + " group by usercode ").Tables[0];
             DataTable dtAgent = DbHelperSQL.Query("select AgentId,COUNT(*) as dl,SUM(LoginTimes) as dlsc,SUM(reposenum) as zm,SUM(ReposeTimes) as xx from rep_agent_detail WITH(NOLOCK) where 1=1 " + strsqlAgent + " group by AgentId ").Tables[0];
             DataTable dtzj = DbHelperSQL.Query("select usercode,convert(int,SUM(f_qcscore)) as fs,COUNT(*) as fsct from T_Call_CallRecords WITH(NOLOCK) where F_QCState=1 " + strsqlcall + " group by usercode ").Tables[0];
-            
+            DataTable hb = DbHelperSQL.Query(" select UserCode, COUNT(1) count from T_Call_CallRecords WITH(NOLOCK) where  CallId in(select CallbackCallid    from T_Call_CallRecords WITH(NOLOCK)  where CallbackCallid is not null" + strsqlcall + ")  group by   UserCode").Tables[0];
+
+
+
             if (dtUser != null && dtUser.Rows.Count > 0)
             {
                 for (int i = 0; i < dtUser.Rows.Count; i++)
                 {
                     #region
+                  
                     int ijtcs = 0;//接听通话次数 
                     int ithms = 0;//通话秒数
                     int izlms = 0;//振铃秒数
@@ -199,11 +204,15 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["坐席工号"] = dtUser.Rows[i]["F_WorkNumber"].ToString();
 
                         #region 部门名称
+                       
                         DataRow[] dtDept = dtdpt.Select(" F_DeptId="+ dtUser.Rows[i]["F_DeptId"].ToString() + " ");
-                        drNew["部门"] = dtDept[0]["F_DeptName"].ToString();
+                        if (dtDept != null && dtDept.Count() > 0)
+                            drNew["部门"] = dtDept[0]["F_DeptName"].ToString();
+                        else
+                            drNew["部门"] = "";
                         #endregion
 
-                        #region 呼入数据
+                            #region 呼入数据
                         DataRow[] drTrunk = dtTrunk.Select(" AgentID='" + dtUser.Rows[i]["F_UserCode"].ToString() + "'");
                         DataRow[] drCallIn = dtcall.Select(" CallType=0 and UserCode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "'");
                         DataRow[] drCallInJT = dtcall.Select(" CallType=0 and CallState=1 and UserCode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "'");
@@ -233,8 +242,14 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["接通率"] = (itrunkjtl * 100).ToString("0.00") + "%";
                         drNew["呼损率"] = (itrunkhsl * 100).ToString("0.00") + "%";
                         drNew["平均排队时间"] = itrunkpjpd.ToString("0.00");
-                        #endregion
-                        #region 坐席接听数据
+                        DataRow[] hbext = hb.Select("UserCode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "'");
+                        if (hbext != null && hbext.Count() > 0)
+                            drNew["回拨量"] = hbext[0]["count"].ToString();
+                        else
+                            drNew["回拨量"] = 0;
+
+                            #endregion
+                            #region 坐席接听数据
                         DataRow[] drExt = dtext.Select(" CalleeAgentID='" + dtUser.Rows[i]["F_UserCode"].ToString() + "'");
                         DataRow[] drCallEvey = dtCallEvey.Select(" usercode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "'");
                         if (drCallEvey != null && drCallEvey.Count() > 0)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -30,6 +30,7 @@ namespace CallCenterApi.Interface.Controllers.tel
             string extnumber = HttpUtility.UrlDecode(RequestString.GetQueryString("extnumber"));
             string PhoneType = HttpUtility.UrlDecode(RequestString.GetQueryString("phoneType"));
             string group = HttpUtility.UrlDecode(RequestString.GetQueryString("group"));
+            int callback = RequestString.GetInt("callback", 0);
             int type = RequestString.GetInt("type", 0);
             int islike = RequestString.GetInt("islike", 1);
             int notconnected = RequestString.GetInt("notconnected", 0);
@@ -56,6 +57,11 @@ namespace CallCenterApi.Interface.Controllers.tel
             }
             if (PhoneType != null && PhoneType.Trim() != "")
             {
+                if (PhoneType =="12366")
+                {
+                    sql += " and PhoneType in('12366','2214605')";
+                }
+                else 
                 sql += " and PhoneType='"+ PhoneType + "'";
             }
             
@@ -73,7 +79,17 @@ namespace CallCenterApi.Interface.Controllers.tel
                     sql += " and CallNumber = '" + phone + "'";
                 }
             }
-            
+            if (callback>0)
+            {
+                if (callback==1)
+                {
+                    sql += " and CallbackCallid is not null ";
+                }
+               else
+                {
+                    sql += " and CallbackCallid is null";
+                }
+            }
             if (!string .IsNullOrEmpty (CallbackCallid))
             {
                 sql += "and CallbackCallid='" + CallbackCallid + "'";
@@ -216,7 +232,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                         out recordCount);
 
                     var config = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
-
+                    dt.Columns.Add("WaitTime", typeof(string));
                     foreach (DataRow dr in dt.Rows)
                     {
                         string path = dr["FilePath"] != null ? dr["FilePath"].ToString() : "";
@@ -233,6 +249,29 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                             dr["FilePath"] = wlpath;
                         }
+                        if (dr["TalkStartTime"]!=null && dr["TalkStartTime"].ToString() != "" && dr["BeginTime"] != null
+                            && dr["BeginTime"].ToString() != "")
+                        {
+                            var ltime = DateTime.Parse(dr["TalkStartTime"].ToString ());
+                            TimeSpan ts = ltime.Subtract(DateTime.Parse(dr["BeginTime"].ToString()));
+                            double tss = double.Parse(Math.Round(ts.TotalSeconds, 0).ToString());
+                            dr["WaitTime"] = DateTimeConvert.parseTimeSeconds(tss, 1);
+                        }
+                        else if (dr["EndTime"] != null && dr["EndTime"].ToString() != "" && dr["BeginTime"] != null && dr["BeginTime"].ToString() != "")
+                        {
+                            var ltime = DateTime.Parse(dr["EndTime"].ToString());
+                            TimeSpan ts = ltime.Subtract(DateTime.Parse(dr["BeginTime"].ToString()));
+                            double tss = double.Parse(Math.Round(ts.TotalSeconds, 0).ToString());
+                            dr["WaitTime"] = DateTimeConvert.parseTimeSeconds(tss, 1);
+                        }
+                        if (dr["PhoneType"] != null && dr["PhoneType"].ToString() != "")
+                        {
+                            if (dr["PhoneType"].ToString() == "2214605")
+                            {
+                                dr["PhoneType"] = "12366";
+                            }
+                        }
+
                     }
                 }
              

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -1141,6 +1141,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             RedisHelper.StringSet("zmhd10014" + sql, obj.ToJson().Replace("state", "C-Response-Desc").Replace("message", "C-API-Status").Replace("returnList", "C-Response-Body"), new TimeSpan(0, 30, 0));
             return Content(obj.ToJson().Replace("state", "C-Response-Desc").Replace("message", "C-API-Status").Replace("returnList", "C-Response-Body"));
         }
+        private BLL.T_Bus_Operation operBLL = new BLL.T_Bus_Operation();
         //市民评议
         public ActionResult zmhd10012()
         {
@@ -1204,6 +1205,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     strWrkOrdr_Cst_Ssf_Cd = "非常不满意";
                 }
             }
+            if (strWrkOrdr_Cst_Ssf_Cd== "非常满意" || strWrkOrdr_Cst_Ssf_Cd == "满意" || strWrkOrdr_Cst_Ssf_Cd == "基本满意")
+            {
+                var model = new BLL.T_Bus_WorkOrder().GetModel(strWrkOrdr_ID);
+                if (model!=null )
+                {
+                    Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
+                    keyValuePairs.Add("F_WorkState", 9);
+                    keyValuePairs.Add("F_IsSatisfie", 1);
+                    keyValuePairs.Add("F_IsClosed", 1);
+                    keyValuePairs.Add("F_CloseUser", "");
+                    keyValuePairs.Add("F_CloseTime", DateTime.Now);
+                    keyValuePairs.Add("F_FinalOpinion", "市民评议满意自动结案");
+                    keyValuePairs.Add("F_IsStandard", 1);
+                    keyValuePairs.Add("F_StandardIDS", "");
+                    keyValuePairs.Add("F_ToBereply", 0);
+                    new BLL.T_Bus_WorkOrder().UpdateWorkOrder(model.F_Id, keyValuePairs);
+                    Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                    oper.F_WorkOrderId = model.F_WorkOrderId;
+                    // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
+                    oper.F_State = model.F_WorkState;
+                    oper.F_Message = "市民网站评议满意，自动结案";
+                    oper.F_CreateUser = User.F_UserCode;
+                    oper.F_CreateTime = DateTime.Now;
+                    oper.F_IsDelete = 0;
+                    operBLL.Add(oper);
+                }
+               
+
+            }
+           
+
             var rescon = DbHelperSQL.GetSingle("select count(*) from T_Bus_WorkOrder where F_WorkOrderId='" + strWrkOrdr_ID + "'");
             if (rescon.ToString() == "0")
             {
@@ -3083,7 +3115,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var txnCommComresult = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnCommCom);
 
 
-            LogFactory.GetLogger("111").Warn(txnCommComresult + "----" + txnBodyComresult);
+         
             string strtel = txnBodyComresult["strRdial_Tel"] == null ? "" : txnBodyComresult["strRdial_Tel"].ToString(); //市民电话
             var source = txnBodyComresult["strStm_Src_Dsc"] == null ? "" : txnBodyComresult["strStm_Src_Dsc"].ToString();// 1 市长热线 2 市长信箱 0 连线政府 3 人民网
             string strkey = txnBodyComresult["strWrkOrdr_Ttl_Dtl"] == null ? "" : txnBodyComresult["strWrkOrdr_Ttl_Dtl"].ToString();//关键字检索
@@ -3478,7 +3510,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var txnBodyComresult = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
 
             var txnCommComresult = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnCommCom);
-            LogFactory.GetLogger("111").Warn(txnCommComresult + "----" + txnBodyComresult);
+          
             string strtel = txnBodyComresult["strRdial_Tel"] == null ? "" : txnBodyComresult["strRdial_Tel"].ToString(); //市民电话
 
 
@@ -4005,6 +4037,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             public string subject { set; get; }
             public int dataType { set; get; }
             public string stateInfo { set; get; }
+           
 
         }
         public class details
@@ -4088,266 +4121,283 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //接收数据
             var response = (HttpWebResponse)request.GetResponse();
             var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
-            //  var responseString = HttpMethods.HttpPost(Smsurl, jsonParam, "application/json;charset=UTF-8");
-            JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
-            resultData resultData = JsonConvert.DeserializeObject<resultData>(jo["resultData"].ToString());
-
-            if (resultData.data != null && resultData.data.Count > 0)
+           try
             {
-                foreach (var it in resultData.data)
-                {
-                    lastItem = resultData.lastItem;
-                    var Peoples = new BLL.T_Bus_People().GetModelList("tid='" + it.tid + "'");
-                    Model.T_Bus_People People = new Model.T_Bus_People();
-                    if (Peoples != null && Peoples.Count > 0)
-                    {
-                        People = Peoples.FirstOrDefault();
-                        if (display == 1)
-                            continue;
-                        else if (searchState == "wait_to_first_explain" && People.state == 1)
-                            continue;
-                        else if (searchState == "wait_to_second_explain" && People.state == 2)
-                            continue;
+                //  var responseString = HttpMethods.HttpPost(Smsurl, jsonParam, "application/json;charset=UTF-8");
+                JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
+                resultData resultData = JsonConvert.DeserializeObject<resultData>(jo["resultData"].ToString());
 
-                        GetHFLY(People, token, searchState);
-                    }
-                    else
+                if (resultData.data != null && resultData.data.Count > 0)
+                {
+                    foreach (var it in resultData.data)
                     {
-                        if (display != 1)
-                            continue;
-                        Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
-                        using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
+                        lastItem = resultData.lastItem;
+                        var Peoples = new BLL.T_Bus_People().GetModelList("tid='" + it.tid + "'");
+                        Model.T_Bus_People People = new Model.T_Bus_People();
+                        if (Peoples != null && Peoples.Count > 0)
                         {
-                            #region 保存工单信息
-                            string creattime = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
-                            string endtime = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+                            People = Peoples.FirstOrDefault();
+                            if (display == 1)
+                                continue;
+                            else if (searchState == "wait_to_first_explain" && People.state == 1)
+                                continue;
+                            else if (searchState == "wait_to_second_explain" && People.state == 2)
+                               continue;
+                            GetHFLY(People, token, searchState);
+                            
+                        }
+                        else
+                        {
+                            if (display != 1)
+                                continue;
+                            Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
+                            using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
+                            {
+                                #region 保存工单信息
+                                string creattime = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+                                string endtime = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+
+                                modelT_Bus_WorkOrder.F_WorkOrderId = new BLL.T_Bus_WorkOrder().GetNewWorkOrderID(4, 4964, creattime, endtime);
+                                modelT_Bus_WorkOrder.F_InfoSource = 4;//信息来源
+                                modelT_Bus_WorkOrder.F_PhoneType = "";//电话类型
+                                if (it.typeName == "咨询")
+                                    modelT_Bus_WorkOrder.F_InfoType = 9;
+                                else if (it.typeName == "建言")
+                                    modelT_Bus_WorkOrder.F_InfoType = 12;
+                                else if (it.typeName == "投诉")
+                                    modelT_Bus_WorkOrder.F_InfoType = 11;
+                                else if (it.typeName == "求助")
+                                    modelT_Bus_WorkOrder.F_InfoType = 10;
+                                else if (it.typeName == "感谢")
+                                    modelT_Bus_WorkOrder.F_InfoType = 13;
+                                else
+                                    modelT_Bus_WorkOrder.F_InfoType = 90;
 
-                            modelT_Bus_WorkOrder.F_WorkOrderId = new BLL.T_Bus_WorkOrder().GetNewWorkOrderID(4, 4964, creattime, endtime);
-                            modelT_Bus_WorkOrder.F_InfoSource = 4;//信息来源
-                            modelT_Bus_WorkOrder.F_PhoneType = "";//电话类型
-                            if (it.typeName == "咨询")
-                                modelT_Bus_WorkOrder.F_InfoType = 9;
-                            else if (it.typeName == "建言")
-                                modelT_Bus_WorkOrder.F_InfoType = 12;
-                            else if (it.typeName == "投诉")
-                                modelT_Bus_WorkOrder.F_InfoType = 11;
-                            else if (it.typeName == "求助")
-                                modelT_Bus_WorkOrder.F_InfoType = 10;
-                            else if (it.typeName == "感谢")
-                                modelT_Bus_WorkOrder.F_InfoType = 13;
-                            else
-                                modelT_Bus_WorkOrder.F_InfoType = 90;
 
-                      
 
-                            if (it.hiddenInfo != null)
-                            {
-                                modelT_Bus_WorkOrder.F_CusName = it.hiddenInfo.realName;
-                                modelT_Bus_WorkOrder.F_CusPhone = it.hiddenInfo.phone;
-                                modelT_Bus_WorkOrder.F_ConName = it.hiddenInfo.realName;
-                                modelT_Bus_WorkOrder.F_ConPhone = it.hiddenInfo.realName;
-                            }
-                            modelT_Bus_WorkOrder.F_CusSex = "2";
-                            modelT_Bus_WorkOrder.F_CusAddress = "";
-                            modelT_Bus_WorkOrder.F_ComTitle = "【" + it.domainName + " " + it.typeName + "】" + it.subject;
-                            modelT_Bus_WorkOrder.F_ComContent = it.content;
-                            modelT_Bus_WorkOrder.F_Key = "";
-                            modelT_Bus_WorkOrder.F_IsProtect = 1;
-                            modelT_Bus_WorkOrder.F_Latitude = 0;
-                            modelT_Bus_WorkOrder.F_Longitude = 0;
-                            modelT_Bus_WorkOrder.F_VisitType = 0;
-                            string path = "/Upload/People/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
-                            string resid = "";
-                            if (it.attachment == 1)
-                            {
-                                if (it.attachmentList != null && it.attachmentList.Count > 0)
+                                if (it.hiddenInfo != null)
                                 {
-                                    foreach (var ia in it.attachmentList)
+                                    modelT_Bus_WorkOrder.F_CusName = it.hiddenInfo.realName;
+                                    modelT_Bus_WorkOrder.F_CusPhone = it.hiddenInfo.phone;
+                                    modelT_Bus_WorkOrder.F_ConName = it.hiddenInfo.realName;
+                                    modelT_Bus_WorkOrder.F_ConPhone = it.hiddenInfo.realName;
+                                }
+                                modelT_Bus_WorkOrder.F_CusSex = "2";
+                                modelT_Bus_WorkOrder.F_CusAddress = "";
+                                modelT_Bus_WorkOrder.F_ComTitle = "【" + it.domainName + " " + it.typeName + "】" + it.subject;
+
+                                modelT_Bus_WorkOrder.F_Key = "";
+                                modelT_Bus_WorkOrder.F_IsProtect = 1;
+                                modelT_Bus_WorkOrder.F_Latitude = 0;
+                                modelT_Bus_WorkOrder.F_Longitude = 0;
+                                modelT_Bus_WorkOrder.F_VisitType = 0;
+                                string path = "/Upload/People/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
+                                string resid = "";
+                                if (it.attachment == 1)
+                                {
+                                    if (it.attachmentList != null && it.attachmentList.Count > 0)
                                     {
-                                        string item = "";
-                                        if (ia.originalType == 1)
-                                        {
-                                            item = ia.orgFileUrl;
-                                        }
-                                        else
-                                        {
-                                            item = ia.videoPicUrl;
-                                        }
-                                        var filename = fileup.GetFileName(item);
-                                        var fileext = fileup.GetExt(item);
-                                        ImageUpload iu = new ImageUpload();
-                                        iu.SavePath = path;
-                                        var re = iu.downloadurl(item, filename);
-
-                                        if (re == "")
+                                        foreach (var ia in it.attachmentList)
                                         {
-                                            #region 附件保存
-                                            Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
-                                            model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
-                                            model_T_Sys_Accessories.F_FileName = filename;//附件名称
-                                            model_T_Sys_Accessories.F_FileType = fileext;//附件类型
-                                            model_T_Sys_Accessories.F_FileUrl = path + filename;//附件地址
-                                            model_T_Sys_Accessories.F_Size = 0;//iu.FileSize;
-                                            model_T_Sys_Accessories.F_UserCode = "人民网";//上传人  
-                                            var assid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
-                                            model_T_Sys_Accessories.F_FileId = assid;
-                                            #endregion
-                                            if (assid > 0)
+                                            string item = "";
+                                            if (ia.originalType == 1)
                                             {
-                                                resid += "," + assid.ToString();
+                                                item = ia.orgFileUrl;
                                             }
                                             else
-                                                continue;
-                                        }
+                                            {
+                                                item = ia.videoPicUrl;
+                                            }
+                                            var filename = fileup.GetFileName(item);
+                                            var fileext = fileup.GetExt(item);
+                                            ImageUpload iu = new ImageUpload();
+                                            iu.SavePath = path;
+                                            var re = iu.downloadurl(item, filename);
 
+                                            if (re == "")
+                                            {
+                                                #region 附件保存
+                                                Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                                                model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                                                model_T_Sys_Accessories.F_FileName = filename;//附件名称
+                                                model_T_Sys_Accessories.F_FileType = fileext;//附件类型
+                                                model_T_Sys_Accessories.F_FileUrl = path + filename;//附件地址
+                                                model_T_Sys_Accessories.F_Size = 0;//iu.FileSize;
+                                                model_T_Sys_Accessories.F_UserCode = "人民网";//上传人  
+                                                var assid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                                                model_T_Sys_Accessories.F_FileId = assid;
+                                                #endregion
+                                                if (assid > 0)
+                                                {
+                                                    resid += "," + assid.ToString();
+                                                }
+                                                else
+                                                    continue;
+                                            }
+
+                                        }
                                     }
-                                }
 
-                            }
-                            if (!string.IsNullOrEmpty(it.videoUrl))
-                            {
-                                string item = it.videoUrl;
-                                var filename = fileup.GetFileName(item);
-                                var fileext = fileup.GetExt(item);
-                                ImageUpload iu = new ImageUpload();
-                                iu.SavePath = path;
-                                var re = iu.downloadurl(item, filename);
-                                if (re == "")
+                                }
+                                if (!string.IsNullOrEmpty(it.videoUrl))
                                 {
-                                    #region 附件保存
-                                    Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
-                                    model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
-                                    model_T_Sys_Accessories.F_FileName = filename;//附件名称
-                                    model_T_Sys_Accessories.F_FileType = fileext;//附件类型
-                                    model_T_Sys_Accessories.F_FileUrl = path + filename;//附件地址
-                                    model_T_Sys_Accessories.F_Size = 0;//iu.FileSize;
-                                    model_T_Sys_Accessories.F_UserCode = "人民网";//上传人  
-                                    var assid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
-                                    model_T_Sys_Accessories.F_FileId = assid;
-                                    #endregion
-                                    if (assid > 0)
+                                    string item = it.videoUrl;
+                                    var filename = fileup.GetFileName(item);
+                                    var fileext = fileup.GetExt(item);
+                                    ImageUpload iu = new ImageUpload();
+                                    iu.SavePath = path;
+                                    var re = iu.downloadurl(item, filename);
+                                    if (re == "")
                                     {
-                                        resid += "," + assid.ToString();
+                                        #region 附件保存
+                                        Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                                        model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                                        model_T_Sys_Accessories.F_FileName = filename;//附件名称
+                                        model_T_Sys_Accessories.F_FileType = fileext;//附件类型
+                                        model_T_Sys_Accessories.F_FileUrl = path + filename;//附件地址
+                                        model_T_Sys_Accessories.F_Size = 0;//iu.FileSize;
+                                        model_T_Sys_Accessories.F_UserCode = "人民网";//上传人  
+                                        var assid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                                        model_T_Sys_Accessories.F_FileId = assid;
+                                        #endregion
+                                        if (assid > 0)
+                                        {
+                                            resid += "," + assid.ToString();
+                                        }
+                                        else
+                                            continue;
                                     }
-                                    else
-                                        continue;
                                 }
-                            }
-                            if (!string.IsNullOrEmpty(resid))
-                            {
-                                modelT_Bus_WorkOrder.F_File = resid.TrimStart(',');
-                            }
-                            modelT_Bus_WorkOrder.F_Level = 1;
-                            modelT_Bus_WorkOrder.F_IsResult = 0;
-                            modelT_Bus_WorkOrder.F_CreateUser = "人民网";//登记人工号
-                            try
-                            {
-                                modelT_Bus_WorkOrder.F_CreateTime = DateTimeConvert.FromSendTimetag(it.dateline);
-                            }
-                            catch
-                            {
-                                modelT_Bus_WorkOrder.F_CreateTime = DateTime.Now;//登记时间
-                            }
-                            modelT_Bus_WorkOrder.F_WorkState = 1;// 0;//工单状态0登记中
-                            modelT_Bus_WorkOrder.F_IsClosed = 0;//工单是否关闭
-                            modelT_Bus_WorkOrder.F_IsOverdue = 0;//是否逾期(0:否，1：是)
-                            modelT_Bus_WorkOrder.F_IsDelete = 0;//是否删除(0:否，1：是)
-                            modelT_Bus_WorkOrder.F_ToBereply = 0;
-                            modelT_Bus_WorkOrder.F_Business = 0;
-                            if (it.forumName.Contains ("市长"))
-                            modelT_Bus_WorkOrder.F_SplitUser = "市长";
-                            else if (it.forumName.Contains("省长"))
-                                modelT_Bus_WorkOrder.F_SplitUser = "省长";
-                            else
-                                modelT_Bus_WorkOrder.F_SplitUser = it.forumName;
-                            details resultDatas = GetDetails(token, it .tid);
-                            if (resultDatas!=null && resultDatas.contentList!=null && resultDatas.contentList .Count >0)
-                            {
-
-                                modelT_Bus_WorkOrder.F_Longitude = resultDatas.contentList[0].longitude;
-                                modelT_Bus_WorkOrder.F_Latitude  = resultDatas.contentList[0].latitude ;
-                                modelT_Bus_WorkOrder.F_SourceAddress = resultDatas.contentList[0].threadPlace ;
-                            }
-                            #region
-                            #endregion
-                            modelT_Bus_WorkOrder.F_Id = new BLL.T_Bus_WorkOrder().Add(modelT_Bus_WorkOrder);
-                            #endregion
-                            if (modelT_Bus_WorkOrder.F_Id > 0)
-                            {
-                                People.tid = it.tid;
-                                People.forumName = it.forumName;
-                                People.subject = it.subject;
-                                People.nickName = it.nickName;
-                                People.typeName = it.typeName;
-                                People.domainName = it.domainName;
-                                People.stateInfo = it.stateInfo;
-                                //待回复wait_to_answer 待一次解释 待二次解释wait_to_second_explain
-                                if (display == 1)
-                                    People.state = 0;
-                                else if (searchState == "wait_to_first_explain")
-                                    People.state = 1;
-                                else if (searchState == "wait_to_second_explain")
-                                    People.state = 2;
-                                People.dateline = DateTimeConvert.FromSendTimetag(it.dateline);
-                                People.videoImgUrl = it.videoImgUrl;
-                                People.videoUrl = it.videoUrl;
-                                People.videoDuration = it.videoDuration;
-                                People.content = it.content;
-                                People.threadsCheckTime = DateTimeConvert.FromSendTimetag(it.threadsCheckTime);
-                                if (it.hiddenInfo != null)
+                                if (!string.IsNullOrEmpty(resid))
+                                {
+                                    modelT_Bus_WorkOrder.F_File = resid.TrimStart(',');
+                                }
+                                modelT_Bus_WorkOrder.F_Level = 1;
+                                modelT_Bus_WorkOrder.F_IsResult = 0;
+                                modelT_Bus_WorkOrder.F_CreateUser = "人民网";//登记人工号
+                                try
+                                {
+                                    modelT_Bus_WorkOrder.F_CreateTime = DateTimeConvert.FromSendTimetag(it.dateline);
+                                }
+                                catch
+                                {
+                                    modelT_Bus_WorkOrder.F_CreateTime = DateTime.Now;//登记时间
+                                }
+                                modelT_Bus_WorkOrder.F_WorkState = 1;// 0;//工单状态0登记中
+                                modelT_Bus_WorkOrder.F_IsClosed = 0;//工单是否关闭
+                                modelT_Bus_WorkOrder.F_IsOverdue = 0;//是否逾期(0:否，1：是)
+                                modelT_Bus_WorkOrder.F_IsDelete = 0;//是否删除(0:否，1：是)
+                                modelT_Bus_WorkOrder.F_ToBereply = 0;
+                                modelT_Bus_WorkOrder.F_Business = 0;
+                                if (it.forumName.Contains("市长"))
+                                    modelT_Bus_WorkOrder.F_SplitUser = "市长";
+                                else if (it.forumName.Contains("省长"))
+                                    modelT_Bus_WorkOrder.F_SplitUser = "省长";
+                                else
+                                    modelT_Bus_WorkOrder.F_SplitUser = it.forumName;
+                                details resultDatas = GetDetails(token, it.tid);
+                                if (resultDatas != null && resultDatas.contentList != null && resultDatas.contentList.Count > 0)
                                 {
-                                    People.realName = it.hiddenInfo.realName;
-                                    People.phone = it.hiddenInfo.phone;
-                                    People.remark = it.hiddenInfo.remark;
 
+                                    modelT_Bus_WorkOrder.F_Longitude = resultDatas.contentList[0].longitude;
+                                    modelT_Bus_WorkOrder.F_Latitude = resultDatas.contentList[0].latitude;
+                                    modelT_Bus_WorkOrder.F_SourceAddress = resultDatas.contentList[0].threadPlace;
                                 }
-                                if (it.attachment == 1)
+                                Review result = ReReview(token, it.tid);
+                                if (result != null)
                                 {
-                                    if (it.attachmentList != null && it.attachmentList.Count > 0)
+                                    modelT_Bus_WorkOrder.F_ComContent = result.contentList[0].content;
+                                }
+                                else
+                                {
+                                    modelT_Bus_WorkOrder.F_ComContent = it.content;
+                                }
+                                #region
+                                #endregion
+                                modelT_Bus_WorkOrder.F_Id = new BLL.T_Bus_WorkOrder().Add(modelT_Bus_WorkOrder);
+                                #endregion
+                                if (modelT_Bus_WorkOrder.F_Id > 0)
+                                {
+                                    People.tid = it.tid;
+                                    People.forumName = it.forumName;
+                                    People.subject = it.subject;
+                                    People.nickName = it.nickName;
+                                    People.typeName = it.typeName;
+                                    People.domainName = it.domainName;
+                                    People.stateInfo = it.stateInfo;
+                                    //待回复wait_to_answer 待一次解释 待二次解释wait_to_second_explain
+                                    if (display == 1)
+                                        People.state = 0;
+                                    else if (searchState == "wait_to_first_explain")
+                                        People.state = 1;
+                                    else if (searchState == "wait_to_second_explain")
+                                        People.state = 2;
+                                    People.dateline = DateTimeConvert.FromSendTimetag(it.dateline);
+                                    People.videoImgUrl = it.videoImgUrl;
+                                    People.videoUrl = it.videoUrl;
+                                    People.videoDuration = it.videoDuration;
+                                    People.content = it.content;
+                                    People.threadsCheckTime = DateTimeConvert.FromSendTimetag(it.threadsCheckTime);
+                                    if (it.hiddenInfo != null)
                                     {
-                                        foreach (var ia in it.attachmentList)
+                                        People.realName = it.hiddenInfo.realName;
+                                        People.phone = it.hiddenInfo.phone;
+                                        People.remark = it.hiddenInfo.remark;
+
+                                    }
+                                    if (it.attachment == 1)
+                                    {
+                                        if (it.attachmentList != null && it.attachmentList.Count > 0)
                                         {
-                                            People.aid += "," + ia.aid;
+                                            foreach (var ia in it.attachmentList)
+                                            {
+                                                People.aid += "," + ia.aid;
+                                            }
                                         }
+                                        if (!string.IsNullOrEmpty(People.aid))
+                                            People.aid = People.aid.TrimStart(',');
                                     }
-                                    if (!string.IsNullOrEmpty(People.aid))
-                                        People.aid = People.aid.TrimStart(',');
-                                }
-                                People.topicMainTitle = it.topicMainTitle;
-                                People.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                                    People.topicMainTitle = it.topicMainTitle;
+                                    People.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
 
-                                if (Peoples != null && Peoples.Count > 0)
-                                    new BLL.T_Bus_People().Update(People);
-                                else
-                                    new BLL.T_Bus_People().Add(People);
-                                string userinfo = "人民网";
-                                string message = "";
-                                message = userinfo + " 登记并提交工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
-                                // var curuser = User;
-                                #region 插入操作记录
-                                Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
-                                oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
-                                oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
-                                oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
-                                oper.F_File = modelT_Bus_WorkOrder.F_File;
-                                oper.F_Message = message;
-                                oper.F_CreateUser = "人民网";
-                                oper.F_CreateTime = DateTime.Now;
-                                oper.F_IsDelete = 0;
-                                new BLL.T_Bus_Operation().Add(oper);
-                                #endregion
+                                    if (Peoples != null && Peoples.Count > 0)
+                                        new BLL.T_Bus_People().Update(People);
+                                    else
+                                        new BLL.T_Bus_People().Add(People);
+                                    string userinfo = "人民网";
+                                    string message = "";
+                                    message = userinfo + " 登记并提交工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
+                                    // var curuser = User;
+                                    #region 插入操作记录
+                                    Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                                    oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                                    oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
+                                    oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
+                                    oper.F_File = modelT_Bus_WorkOrder.F_File;
+                                    oper.F_Message = message;
+                                    oper.F_CreateUser = "人民网";
+                                    oper.F_CreateTime = DateTime.Now;
+                                    oper.F_IsDelete = 0;
+                                    new BLL.T_Bus_Operation().Add(oper);
+                                    #endregion
+                                }
+                                trans.Complete();
                             }
-                            trans.Complete();
-                        }
 
-                    }
+                        }
 
 
 
+                    }
+                    LYlIST(token, display, searchState);
                 }
-                LYlIST(token, display, searchState);
+                return Success("添加成功");
+            }
+            catch(Exception e)
+            {
+                return Success(e.ToString ());
             }
-            return Success("添加成功");
+          
         }
         public details GetDetails(string token,int tid)
         {
@@ -4373,22 +4423,52 @@ namespace CallCenterApi.Interface.Controllers.workorder
             details resultData = JsonConvert.DeserializeObject<details>(jo["resultData"].ToString());
             return resultData;
         }
-        public void GetHFLY(Model.T_Bus_People People, string token,string searchState)
+        public Review ReReview(string token, int tid)
+        {
+            
+            Dictionary<string, object> LY = new Dictionary<string, object>();
+            LY.Add("tid", tid);
+            //序列化参数
+            // 发送请求
+            var request = (HttpWebRequest)WebRequest.Create(rmwurl + "/v1/org/threads/content");
+            request.Method = "POST";
+            request.ContentType = "application/json;charset=UTF-8";
+
+            var byteData = Encoding.UTF8.GetBytes(createParamMap("/v1/org/threads/content", LY.ToJson(), token).ToJson());
+            var length = byteData.Length;
+            request.ContentLength = length;
+            var writer = request.GetRequestStream();
+            writer.Write(byteData, 0, length);
+            writer.Close();
+            //接收数据
+            var response = (HttpWebResponse)request.GetResponse();
+            var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
+
+            //  var responseString = HttpMethods.HttpPost(Smsurl, jsonParam, "application/json;charset=UTF-8");
+            JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
+            Review resultData = JsonConvert.DeserializeObject<Review>(jo["resultData"].ToString());
+            return resultData;
+
+        }
+        public string  GetHFLY(Model.T_Bus_People People, string token,string searchState)
         {
-            if (searchState == "wait_to_first_explain")
-                People.state = 1;
-            else if (searchState == "wait_to_second_explain")
-                People.state = 2;
-            new BLL.T_Bus_People().Update(People);
-            Dictionary<string, object > LY = new Dictionary<string, object>();
-                LY.Add("tid", People.tid );
+            try
+            {
+                if (searchState == "wait_to_first_explain")
+                    People.state = 1;
+                else if (searchState == "wait_to_second_explain")
+                    People.state = 2;
+                new BLL.T_Bus_People().Update(People);
+                Dictionary<string, object> LY = new Dictionary<string, object>();
+                LY.Add("tid", (int )People.tid );
                 //序列化参数
                 // 发送请求
-                var request = (HttpWebRequest)WebRequest.Create(rmwurl+"/v1/org/threads/content");
+                var request = (HttpWebRequest)WebRequest.Create(rmwurl + "/v1/org/threads/content");
                 request.Method = "POST";
                 request.ContentType = "application/json;charset=UTF-8";
 
                 var byteData = Encoding.UTF8.GetBytes(createParamMap("/v1/org/threads/content", LY.ToJson(), token).ToJson());
+               
                 var length = byteData.Length;
                 request.ContentLength = length;
                 var writer = request.GetRequestStream();
@@ -4425,6 +4505,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
 
                 }
+                return "";
+            }
+            catch(Exception e)
+            {
+                return e.Message.ToString();
+            }
+            
+               
+
+            
+           
             
         }
         public void LYlIST(string token, int display, string searchState)
@@ -4513,8 +4604,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
 
                             modelT_Bus_WorkOrder.F_ComTitle = "【" + it.domainName + " " + it.typeName + "】" + it.subject;
-
-                            modelT_Bus_WorkOrder.F_ComContent = it.content;
+                            Review result = ReReview(token, it.tid);
+                            if (result != null)
+                            {
+                                modelT_Bus_WorkOrder.F_ComContent = result.contentList[0].content;
+                            }
+                            else
+                            {
+                                modelT_Bus_WorkOrder.F_ComContent = it .content;
+                            }
                             modelT_Bus_WorkOrder.F_Key = "";
 
                             modelT_Bus_WorkOrder.F_IsProtect = 1;
@@ -4758,11 +4856,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return result["token"].ToString();
         }
         private string APP_CODE = Configs.GetValue("APP_CODE");
-        private string APP_SECRET = Configs.GetValue("APP_SECRET");
+       private string APP_SECRET = Configs.GetValue("APP_SECRET");
         private string rmwurl = Configs.GetValue("Rmwurl");
-        //private string APP_CODE = "314f185e71e74dd8879ab154746f7681";
-        //private string APP_SECRET = "900a640b37e84a8c88ffc83d6f3500f6";
-        //private string rmwurl = "http://liuyan-api.people.com.cn/api";
+       // private string APP_CODE = "314f185e71e74dd8879ab154746f7681";
+       // private string APP_SECRET = "900a640b37e84a8c88ffc83d6f3500f6";
+       // private string rmwurl = "http://liuyan-api.people.com.cn/api";
         public Dictionary<string, string> createParamMap(string url, string param)
         {
             Dictionary<string, string> parame = new Dictionary<string, string>();

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -327,7 +327,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                             foreach (var u in users)
                             {
-                                if (u.F_RoleCode == "WLDW" && u.F_IsSms == 1)
+                                if (u.F_RoleCode == "WLDW" && u.F_IsSms != null && u.F_IsSms == 1)
                                 {
                                     continue;
                                 }
@@ -848,7 +848,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         {
                                             foreach (var it in user)
                                             {
-                                                if (it.F_RoleCode == "WLDW" && it.F_IsSms == 1)
+                                                if (it.F_RoleCode == "WLDW" && it.F_IsSms != null && it.F_IsSms == 1)
                                                 {
                                                     continue;
                                                 }
@@ -988,7 +988,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 foreach (var it in user)
                                 {
-                                    if (it.F_RoleCode == "WLDW" && it.F_IsSms == 1)
+                                    if (it.F_RoleCode == "WLDW" && it.F_IsSms != null && it.F_IsSms == 1)
                                     {
                                         continue;
                                     }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -23,18 +23,18 @@ namespace CallCenterApi.Interface
             //clq 增加异常日志记录 自定义 HandleErrorAttribute
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
             _worker = new QuartzWorker();
-           var satisfactionClose = new SatisfactionClose();
-            _worker.AddWork(satisfactionClose);
-            _worker.Start();
+         // var satisfactionClose = new SatisfactionClose();
+         //  _worker.AddWork(satisfactionClose);
+        //   _worker.Start();
            var ZhengWuDuiJie = new ZhengWuDuiJie();
            _worker.AddWork(ZhengWuDuiJie);
            _worker.Start();
            var Peoplewebsite = new Peoplewebsite();
-           _worker.AddWork(Peoplewebsite);
+          _worker.AddWork(Peoplewebsite);
            _worker.Start();
-            var PushWorkorder = new PushWorkorder();
-            _worker.AddWork(PushWorkorder);
-            _worker.Start();
+           var PushWorkorder = new PushWorkorder();
+           _worker.AddWork(PushWorkorder);
+          _worker.Start();
         }
         protected void Application_End()
         {

CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -59,6 +59,7 @@
     <Compile Include="T_Bus_CityTurn.cs" />
     <Compile Include="T_Bus_Feedback_Next.cs" />
     <Compile Include="T_Bus_NoticeCriticism.cs" />
+    <Compile Include="T_Bus_People.cs" />
     <Compile Include="T_Bus_PerformDuties.cs" />
     <Compile Include="T_Bus_PerformDutiesRecords.cs" />
     <Compile Include="T_Bus_Supervision.cs" />

CallCenterApi/CallCenterApi.Model/T_Bus_ToExamine.cs

@@ -87,6 +87,7 @@ namespace CallCenterApi.Model
         {
             set;get;
         }
+        public int? F_LimitTime { set; get; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -733,6 +733,10 @@ namespace CallCenterApi.Model
         /// </summary>
         public DateTime? F_VisitExamineTime { set; get; }
         public string F_VisitAssignUser { set; get; }
+        /// <summary>
+        /// 是否营商
+        /// </summary>
+        public int ? F_IsBusiness { set; get; }
         ///// <summary>
         /////任务单唯一标识
         ///// </summary>

CallCenterCommon/CallCenter.QuartzService/Peoplewebsite.cs

@@ -25,15 +25,23 @@ namespace CallCenter.QuartzService
         {
          if (Configs .GetValue ("APP_CODE")== "314f185e71e74dd8879ab154746f7681")
             {
-                WebClient web = new WebClient();
-                web.Encoding = Encoding.UTF8;
-                string Dataurl = web.DownloadString("http://docking.zwfw.anyang.gov.cn:9998/APPS/GetLY" + "?display=1&searchState=wait_to_answer");
+               //  WebClient web = new WebClient();
+               //  web.Encoding = Encoding.UTF8;
+                 // string Dataurl = web.DownloadString("http://localhost/APPS/GetLY" + "?display=1&searchState=wait_to_answer");
+                var Dataurl = HttpMethods.HttpPost("http://localhost/APPS/GetLY" + "?display=1&searchState=wait_to_answer");
+                LogFactory.GetLogger("33333").Warn(Dataurl);
                 if (!string.IsNullOrEmpty(Dataurl))
                 {
-                    string Dataur2 = web.DownloadString("http://docking.zwfw.anyang.gov.cn:9998/APPS/GetLY" + "?display=2&searchState=wait_to_first_explain");
+                    var Dataur2 = HttpMethods.HttpPost("http://localhost/APPS/GetLY" + "?display=2&searchState=wait_to_first_explain");
+                  // string Dataur2 = web.DownloadString("http://localhost/APPS/GetLY" + "?display=2&searchState=wait_to_first_explain");
+
+                    LogFactory.GetLogger("444444").Warn(Dataur2);
                     if (!string.IsNullOrEmpty(Dataur2))
                     {
-                        string Dataur3 = web.DownloadString("http://docking.zwfw.anyang.gov.cn:9998/APPS/GetLY" + "?display=2&searchState=wait_to_second_explain");
+                         var Dataur3 = HttpMethods.HttpPost("http://localhost/APPS/GetLY" + "?display=2&searchState=wait_to_second_explain");
+
+                       // string Dataur3 = web.DownloadString("http://localhost/APPS/GetLY" + "?display=2&searchState=wait_to_second_explain");
+                        LogFactory.GetLogger("55555").Warn(Dataur3);
                     }
                 }
             }

CallCenterCommon/CallCenter.QuartzService/PushWorkorder.cs

@@ -18,7 +18,7 @@ namespace CallCenter.QuartzService
 
         public PushWorkorder()
         {
-            CronExpression = "0 50 09 * * ? *";
+            CronExpression = "0 0 0 * * ? *";
             DoWork += GetLY;
         }
 
@@ -27,19 +27,20 @@ namespace CallCenter.QuartzService
            
              while (true)
              {
-               // if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour <= 7)
-               // {
+               if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour <7)
+                {
                     Thread.Sleep(6000);
                     string t = TSWORKORDER();
-                    if (t != "推送成功")
+                   
+                    if (t != "推送成功"&& t != "推送失败")
                     {
                         LogFactory.GetLogger("22222").Warn(t);
                         break;
                     }
                         
-              //  }
-               // else
-                  //  break;
+                }
+               else
+                   break;
              }
            
         }
@@ -143,13 +144,13 @@ namespace CallCenter.QuartzService
         {
             try
             {
-                if (DateTime.Now.Hour >= 9 && DateTime.Now.Hour <= 15)
+                if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour <7)
                 {
-                    
+
                     string token = GetToken();
                     if (string.IsNullOrEmpty(token))
                         return "token 错误";
-                   
+
                     int count = 0;
                     DataTable Push = new DataTable();
                     string PushWorkorder = "SELECT top 1  *  FROM T_Bus_PushWorkorder";
@@ -159,13 +160,15 @@ namespace CallCenter.QuartzService
                         id = int.Parse(Push.Rows[0]["id"].ToString());
                         count = int.Parse(Push.Rows[0]["count"].ToString());
                     }
-                    var modellist = new CallCenterApi.BLL.T_Bus_WorkOrder().GetModelList(5, "F_CreateTime>='2021-02-18 07:37:00'and F_Id>" + id + " and F_IsDelete=0 and F_CreateTime <'2021-12-13 10:06:53.000'", " F_CreateTime ASC");
+                    var modellist = new CallCenterApi.BLL.T_Bus_WorkOrder().GetModelList(5, "F_CreateTime>='2021-02-18 07:37:00'and F_Id>" + id + " and F_IsDelete=0 and F_CreateTime <'2021-12-13 10:06:53.000' AND F_Email ='' " +
+                        "and F_CreateUser !='人民网' ", " F_CreateTime ASC");
                     if (modellist != null && modellist.Count > 0)
                     {
                         submit_case_info paras = new submit_case_info();
                         paras.jsonList = new List<jsonList>();
                         foreach (var model in modellist)
                         {
+                           
                             jsonList jsonList = new jsonList();
                             string newwokrkorder = "";
                             if (model.F_WorkOrderId.Contains("XX"))
@@ -204,7 +207,10 @@ namespace CallCenter.QuartzService
                                 jsonList.HWY_NAME = model.F_CreateUser;
                             jsonList.HWY_LOGINID = model.F_CreateUser;
                             jsonList.CASE_TIME = model.F_CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                            if(!string .IsNullOrEmpty (model.F_ComTitle))
                             jsonList.CASE_TITLE = model.F_ComTitle;
+                            else 
+                            jsonList.CASE_TITLE = "无";
                             jsonList.CASE_CONTENT = model.F_ComContent;
                             if (model.F_InfoSource == 1)
                                 jsonList.CASE_SOURCE = "DH";
@@ -256,73 +262,120 @@ namespace CallCenter.QuartzService
                             jsonList.CASE_EMOTION = "70";
                             jsonList.CASE_ADDRESS = model.F_SourceAddress;
 
-                           
+                            try
+                            {
                                 if (!string.IsNullOrEmpty(model.F_File))
                                 {
                                     fjcl(token, newwokrkorder, model.F_File, model.F_SourceArea.ToString(), model.F_Id, "10");
                                 }
                                 if (model.F_CallRecordId > 0)
                                 {
-                                  dianhua(token, model.F_WorkOrderId);
+                                    dianhua(token, model.F_WorkOrderId);
                                 }
-                            
+                            }
+                            catch
+                            {
+
+                            }
+                           
+
                             paras.jsonList.Add(jsonList);
                         }
 
                         if (paras.jsonList != null && paras.jsonList.Count > 0)
                         {
                             string jsonParam = "access_token=" + token + "&paras=" + paras.ToJson();
-                            var responseString = HttpMethods.HttpPost("http://59.227.104.19:8000/share/submit_case_info", jsonParam);
-                           
-                            Push jo = JsonConvert.DeserializeObject<Push>(responseString);
-                            if (jo.code == "1")
+
+                          
+                            var responseString = HttpMethods.HttpPost("http://59.227.104.19:8000/share/submit_case_info", jsonParam
+                              );
+                            try
                             {
-                                id = modellist[modellist.Count - 1].F_Id;
-                                count += modellist.Count;
-                                string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
+                                Push jo = JsonConvert.DeserializeObject<Push>(responseString);
+                                if (jo.code == "1")
+                                {
+                                    id = modellist[modellist.Count - 1].F_Id;
+                                    count += modellist.Count;
+                                    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 ", modellist.FirstOrDefault().F_Id, "", DateTime.Now, jo.code, jo.message, "批量推送工单", "", "推送成功数：" + jo.body.successCount + " 推送总数：" + jo.body.totalCount);
-                                object objres = DbHelperSQL.GetSingle(strSql);
-                                string ts = "update T_Bus_PushWorkorder set id='" + id + "' ,count='" + count + "'";
-                                var rh = DbHelperSQL.GetSingle(ts);
-                                yiji(token, modellist);
-                                erji(token, modellist);
-                                pingjia(token, modellist);
-                                bajie(token, modellist);
-                                liucheng(token, modellist);
-                                huifangjilu(token, modellist);
-                                return "推送成功1";
-                            }
-                            else
-                            {
+                                    object objres = DbHelperSQL.GetSingle(strSql);
+                                    string ts = "update T_Bus_PushWorkorder set id='" + id + "' ,count='" + count + "'";
+                                    var rh = DbHelperSQL.GetSingle(ts);
+                                    try
+                                    {
+                                        yiji(token, modellist);
+                                        erji(token, modellist);
+                                        pingjia(token, modellist);
+                                        bajie(token, modellist);
+                                        liucheng(token, modellist);
+                                        huifangjilu(token, modellist);
 
-                                string error = "";
-                                if (jo.body.errorObjs != null && jo.body.errorObjs.Length > 0)
+                                    }
+                                    catch
+                                    {
+                                        return "推送失败";
+                                    }
+
+                                    return "推送成功";
+                                }
+                                else
                                 {
-                                    foreach (var it in jo.body.errorObjs)
+                                    id = modellist[modellist.Count - 1].F_Id;
+                                    count += modellist.Count;
+                                    string error = "";
+                                    if (jo.body.errorObjs != null && jo.body.errorObjs.Length > 0)
                                     {
-                                        if (!string.IsNullOrEmpty(it.resturl))
-                                        {
-                                            error += " 推送接口名称:" + it.resturl;
-                                        }
-                                        if (!string.IsNullOrEmpty(it.caseserial))
-                                        {
-                                            error += " 推送工单号:" + it.caseserial;
-                                        }
-                                        if (!string.IsNullOrEmpty(it.resturl))
+                                        foreach (var it in jo.body.errorObjs)
                                         {
-                                            error += " 推送标识:" + it.errorid;
-                                        }
-                                        if (!string.IsNullOrEmpty(it.resturl))
-                                        {
-                                            error += " 推送失败原因:" + it.errormsg;
+                                            if (!string.IsNullOrEmpty(it.resturl))
+                                            {
+                                                error += " 推送接口名称:" + it.resturl;
+                                            }
+                                            if (!string.IsNullOrEmpty(it.caseserial))
+                                            {
+                                                error += " 推送工单号:" + it.caseserial;
+                                            }
+                                            if (!string.IsNullOrEmpty(it.resturl))
+                                            {
+                                                error += " 推送标识:" + it.errorid;
+                                            }
+                                            if (!string.IsNullOrEmpty(it.resturl))
+                                            {
+                                                error += " 推送失败原因:" + it.errormsg;
+                                            }
                                         }
                                     }
-                                }
-                                string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
+                                    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 ", "", jsonParam, DateTime.Now, jo.code, jo.message, "批量推送工单失败", error, "推送成功数：" + jo.body.successCount + " 推送总数：" + jo.body.totalCount);
-                                object objres = DbHelperSQL.GetSingle(strSql);
+                                    object objres = DbHelperSQL.GetSingle(strSql);
+                                    string ts = "update T_Bus_PushWorkorder set id='" + id + "' ,count='" + count + "'";
+                                    var rh = DbHelperSQL.GetSingle(ts);
+                                    try
+                                    {
+                                        yiji(token, modellist);
+                                        erji(token, modellist);
+                                        pingjia(token, modellist);
+                                        bajie(token, modellist);
+                                        liucheng(token, modellist);
+                                        huifangjilu(token, modellist);
+
+                                    }
+                                    catch
+                                    {
+                                        return "推送失败";
+                                    }
+                                    return "推送失败";
+                                }
+                            }
+                            catch 
+                            {
+                                id = modellist[modellist.Count - 1].F_Id;
+                             //   count += modellist.Count;
+                                string ts = "update T_Bus_PushWorkorder set id='" + id + "'";
+                                var rh = DbHelperSQL.GetSingle(ts);
                                 return "推送失败";
                             }
+                           
                         }
                         else
                         {
@@ -353,7 +406,7 @@ namespace CallCenter.QuartzService
 
             foreach (var model in modellist)
             {
-                if (model.F_WorkState == 9)
+                if (model.F_WorkState == 9 && model.F_DealTime!=null )
                 {
                     finish_info jsonList = new finish_info();
                     string newwokrkorder = model.F_WorkOrderId;
@@ -389,7 +442,7 @@ namespace CallCenter.QuartzService
                     else
                     {
                         jsonList.FINISH_TYPE = "20";
-                        if (model.F_MainDeptId!=null && model.F_MainDeptId > 0)
+                        if (model.F_MainDeptId!=null && model.F_MainDeptId > 0&& model.F_DealTime !=null )
                         {
                             jsonList.END_TIME = model.F_DealTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                             if (DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_MainDeptId + "')") != null)
@@ -911,7 +964,6 @@ namespace CallCenter.QuartzService
 
             submit_case_process_info paras = new submit_case_process_info();
             paras.jsonList = new List<process_info>();
-            LogFactory.GetLogger("HttpPost").Warn(modellist.ToJson ()+"afggreeh");
             foreach (var models in modellist)
             {
                 var process = new CallCenterApi.BLL.T_Bus_Operation().GetModelList("F_WorkOrderId='" + models.F_WorkOrderId + "'");
@@ -1009,7 +1061,7 @@ namespace CallCenter.QuartzService
         {
             submit_case_visit_detail_info paras = new submit_case_visit_detail_info();
             paras.jsonList = new List<detail_info>();
-            LogFactory.GetLogger("HttpPost").Warn(modellist.ToJson()+"ttssds");
+          //  LogFactory.GetLogger("HttpPost").Warn(modellist.ToJson()+"ttssds");
             foreach (var models in modellist)
             {
                 var modelslist = new CallCenterApi.BLL.T_Bus_VisitResult().GetModelList("F_WorkOrderId='" + models.F_WorkOrderId + "'");

CallCenterCommon/CallCenter.Utility/Http/HttpMethods.cs

@@ -19,7 +19,8 @@ namespace CallCenter.Utility
         /// <param name="url">URL.</param>
         /// <param name="param">POST的数据</param>
         /// <returns></returns>
-        public static string HttpPost(string url, string param = null, string contentType = "application/x-www-form-urlencoded")
+        public static string HttpPost(string url, string param = null, string contentType = "application/x-www-form-urlencoded"
+            )
         {
             HttpWebRequest request;
           
@@ -34,22 +35,21 @@ namespace CallCenter.Utility
             {
                 request = WebRequest.Create(url) as HttpWebRequest;
             }
+
           
             request.Method = "POST";
             request.ContentType = contentType;
             request.Accept = "*/*";
             request.Timeout = 15000;
             request.AllowAutoRedirect = false;
-
-           
-
-            StreamWriter requestStream = null;
+         
+               StreamWriter requestStream = null;
             WebResponse response = null;
             string responseStr = null;
 
             try
             {
-                LogFactory.GetLogger("HttpPost").Debug(url + "\r\n" + param + "\r\n");
+               LogFactory.GetLogger("HttpPost").Debug(url + "\r\n" + param + "\r\n");
 
                 requestStream = new StreamWriter(request.GetRequestStream());
                 requestStream.Write(param);