延期工单筛选修改，上下班时间增加坐席，坐席增加省市

codegit/CallCenterApi/CallCenterApi.DAL/T_SMS_RecvSMS.cs

             SqlParameter[] parameters = {
                      new SqlParameter("@RecvModemIMEI", SqlDbType.VarChar,20) ,
                         new SqlParameter("@CallerNum", SqlDbType.VarChar,20) ,
-                        new SqlParameter("@Content", SqlDbType.NVarChar,100) ,
+                        new SqlParameter("@Content", SqlDbType.NVarChar,200) ,
                         new SqlParameter("@RecvTime", SqlDbType.DateTime) ,
                         new SqlParameter("@F_UserID", SqlDbType.Int,4) ,
                         new SqlParameter("@F_CustomerID", SqlDbType.Int,4) ,
                         new SqlParameter("@SMSID", SqlDbType.Int,4) ,
                          new SqlParameter("@RecvModemIMEI", SqlDbType.VarChar,20) ,
                         new SqlParameter("@CallerNum", SqlDbType.VarChar,20) ,
-                        new SqlParameter("@Content", SqlDbType.NVarChar,100) ,
+                        new SqlParameter("@Content", SqlDbType.NVarChar,200) ,
                         new SqlParameter("@RecvTime", SqlDbType.DateTime) ,
                         new SqlParameter("@F_UserID", SqlDbType.Int,4) ,
                         new SqlParameter("@F_CustomerID", SqlDbType.Int,4) ,

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_SeatGroup.cs

         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_SeatGroup(");
-            strSql.Append("F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName)");
+            strSql.Append("F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName,F_Region)");
             strSql.Append(" values (");
-            strSql.Append("@F_ZXZCode,@F_ZXZName,@F_IVRKey,@F_WHBDKey,@F_WHWDKey,@F_ZXAtt,@F_Des,@F_CreateTime,@F_CreateBy,@F_CreateByName)");
+            strSql.Append("@F_ZXZCode,@F_ZXZName,@F_IVRKey,@F_WHBDKey,@F_WHWDKey,@F_ZXAtt,@F_Des,@F_CreateTime,@F_CreateBy,@F_CreateByName,@F_Region)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ZXZCode", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Des", SqlDbType.NText),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_CreateBy", SqlDbType.Int,4),
+                     new SqlParameter("@F_Region", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_CreateByName", SqlDbType.NVarChar,50)};
             parameters[0].Value = model.F_ZXZCode;
             parameters[1].Value = model.F_ZXZName;
             parameters[6].Value = model.F_Des;
             parameters[7].Value = model.F_CreateTime;
             parameters[8].Value = model.F_CreateBy;
-            parameters[9].Value = model.F_CreateByName;
+            parameters[9].Value = model.F_Region;
+            parameters[10].Value = model.F_CreateByName;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             strSql.Append("F_Des=@F_Des,");
             strSql.Append("F_CreateTime=@F_CreateTime,");
             strSql.Append("F_CreateBy=@F_CreateBy,");
+            strSql.Append("F_Region=@F_Region,");
             strSql.Append("F_CreateByName=@F_CreateByName");
             strSql.Append(" where F_ZXZID=@F_ZXZID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Des", SqlDbType.NText),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_CreateBy", SqlDbType.Int,4),
+                     new SqlParameter("@F_Region", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_CreateByName", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_ZXZID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_ZXZCode;
             parameters[6].Value = model.F_Des;
             parameters[7].Value = model.F_CreateTime;
             parameters[8].Value = model.F_CreateBy;
-            parameters[9].Value = model.F_CreateByName;
-            parameters[10].Value = model.F_ZXZID;
+            parameters[9].Value = model.F_Region;
+            parameters[10].Value = model.F_CreateByName;
+            parameters[11].Value = model.F_ZXZID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ZXZID,F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName from T_Sys_SeatGroup ");
+            strSql.Append("select  top 1 F_ZXZID,F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName ,F_Region from T_Sys_SeatGroup ");
             strSql.Append(" where F_ZXZID=@F_ZXZID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ZXZID", SqlDbType.Int,4)
                 {
                     model.F_CreateByName = row["F_CreateByName"].ToString();
                 }
+                if (row["F_Region"] != null)
+                {
+                    model.F_Region = row["F_Region"].ToString();
+                }
             }
             return model;
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

             public string RecvTime;
 
         }
-        public bool AddSmS(string tel, string cont, int F_UserID)
+        public bool AddSmS(string tel, string cont, int F_UserID,string RecvModemIMEI="")
         {
             Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
             dModel.CallerNum = tel.Trim();
                                     try
                                     {
                                         model.F_SMSReply = int.Parse(replyResult.replys[i].text);
+                                        AddSmS(replyResult.replys[i].mobile, replyResult.replys[i].text, 0,"1");
                                         workOrder.Update(model);
-                                        string msg = "【心连心客服中心】心连心感谢您的评价，祝你生活愉快！";
+                                        string msg = "【心连心客服中心】您好，心连心感谢您的评价，祝您生活愉快！";
                                         SMSSingleshot(replyResult.replys[i].mobile, msg);
                                         string mag = "心连心感谢您的评价，祝你生活愉快！";
                                         AddSmS(replyResult.replys[i].mobile, mag, 0);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

                     sModel.F_IVRKey = input.IVRKey;
                 if (input.Des != null)
                     sModel.F_Des = input.Des.Trim();
+                if (input.Region  != null)
+                    sModel.F_Region = input.Region.Trim();
                 if (!Validate.IsNumber(input.WHWDKey.ToString()))
                 {
                     res = Error("外呼外地前缀必须为数字");
                     sModel.F_IVRKey = input.IVRKey;
                 if (input.Des != null)
                     sModel.F_Des = input.Des.Trim();
-
+                if (input.Region != null)
+                    sModel.F_Region = input.Region.Trim();
                 if (seatBLL.Update(sModel))
                     return Success("编辑成功");
                 return Error("编辑失败");

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/WorkcalendarController.cs

                 pageindex,
                 true,
                 out recordCount);
-
+            List<Model.T_Sys_WorkTimes> modlelist = new BLL.T_Sys_WorkTimes().DataTableToList(dt);
+            List<Model.T_Sys_WorkTimes> Input = modeltooip(modlelist);
             var obj = new
             {
                 state = "success",
                 message = "成功",
-                rows = dt,
+                rows = Input,
                 total = recordCount
             };
 
             //}
             //return res;
         }
-
-        //获取某一条时间段信息
-        public ActionResult GetTimes(string id)
+        private List<Model.T_Sys_WorkTimes> modeltooip(List<Model.T_Sys_WorkTimes> model1)
+        {
+            List<Model.T_Sys_WorkTimes> WorkTimes = new List<Model.T_Sys_WorkTimes>();
+            foreach (var it in model1)
+            {
+                string msg = "";
+                if (!string .IsNullOrEmpty (it .F_GroupCode))
+                {
+                    var GroupIDList = it.F_GroupCode.Split('|');
+                    if (GroupIDList.Length > 0)
+                    {
+                        foreach (var iv in GroupIDList)
+                        {
+                            Model.T_Sys_SeatGroup sm = new BLL.T_Sys_SeatGroup().GetModel(int.Parse(iv));
+                            if (sm != null)
+                            {
+                                if (msg!="")
+                                {
+                                    msg += "|" + sm.F_ZXZName;
+                                }
+                                else
+                                {
+                                    msg += sm.F_ZXZName;
+                                }
+                                
+                            }
+                        }
+                    }
+                    it.F_GroupCode = msg;
+                    WorkTimes.Add(it);
+                }
+               
+            }
+            return WorkTimes;
+        }
+            //获取某一条时间段信息
+            public ActionResult GetTimes(string id)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
         }
 
         //添加/修改上班时间段
-        public ActionResult AddTimes(string workid, string workstart, string workend, string timename, string remark, string holidayscode = "")
+        public ActionResult AddTimes(string workid, string workstart, string workend, string timename, string remark, string groupcode,string holidayscode = "")
         {
             if (Request.IsAuthenticated)
             {
                                     dModel.F_HolidaysCode = holidayscode;
                                     dModel.F_Name = timename.Trim();
                                     dModel.F_Remark = remark.Trim();
-
+                                    dModel .F_GroupCode = groupcode.Trim();
                                     bool b = dBLL.Update(dModel);
                                     if (b)
                                     {
                             _model.F_Name = timename.Trim();
                             _model.F_Remark = remark.Trim();
                             _model.F_HolidaysCode = holidayscode.Trim();
-                            _model.F_GroupCode = ua.groupcode;
+                            _model.F_GroupCode = groupcode.Trim();
                             _model.F_CreateUser = ua.F_UserCode;
                             _model.F_CreateTime = DateTime.Now;
 

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

                         {
                             return Success("无操作权限"); ;
                         }
+                        sql += "and F_State !=11 and F_State !=10";
                         break;
                     case 12://微信未通过工单
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                             if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                             {
                                 sql += $" and F_ID in(" + GetDelay() + ")";
+                                sql += "and F_State !=11 and F_State !=10";
                             }
                             else
                             {
         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult ReturnvisitOrder(long orderid, string cont, string reason, string call ,string F_VisitRemarks,int  isOver=0)
+        public ActionResult ReturnvisitOrder(long orderid, string cont, string reason, string call ,string F_VisitRemarks,int  isOver=0, int sms = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
                     //验证信息
                     if (model != null)
                     {
-                        var res = Retu(ua, model, cont, reason, F_VisitRemarks, call, isOver);
+                        var res = Retu(ua, model, cont, reason, F_VisitRemarks, call, isOver, sms);
                         if (res)
                             return Success("回访成功");
                         else
           
             string sid = "";
             var opt = "回访";
-            string smscont = "为更好的为你提供服务，请你对我们的服务进行评价，满意请按1，一般请按2，不满意请按3.";
+            string smscont = "您好，您的反馈公司已安排人员给予解决，请您对我们的服务进行评价，满意请回复1，一般请回复2，不满意请回复3。谢谢！";
             int optbut = (int)EnumItemOpt.visit;
             int wostate = (int)EnumWorkOrderState.evaluate;
             if (isOver==0)
                 {
                     if (!string.IsNullOrEmpty(model.F_CusPhone.Trim () ))
                     {
-                        string msg = "【心连心客服中心】为更好的为你提供服务，请你对我们的服务进行评价，满意请按1，一般请按2，不满意请按3.";
+                        string msg = "【心连心客服中心】您好，您的反馈公司已安排人员给予解决，请您对我们的服务进行评价，满意请回复1，一般请回复2，不满意请回复3。谢谢！";
                         SmsSingleSenderResult result = new SMSController().SMSSingleshot(model.F_CusPhone.Trim(), msg);
                         bool n = new SMSController().AddSmS(model.F_CusPhone, smscont, nowUser.F_UserId);
                         if (result !=null )
                 smscont = "建议";
             }
             string[] mag = { smscont };
-            string smsmsg= "你有一条新的" + smscont + "工单,请及时处理";
+            string smsmsg= "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
            
             string touser = ""; string tousername = "";
 
                         if (!string .IsNullOrEmpty (clus.F_Mobile.Trim ()))
                         {
                           
-                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191, mag, clus.F_Mobile.Trim());
+                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, clus.F_Mobile.Trim());
                             bool n = new SMSController().AddSmS(clus.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
                         }
                         
                     {
                         if (!string.IsNullOrEmpty(l.F_Mobile.Trim ()))
                         {
-                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191, mag,l.F_Mobile.Trim());
+                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag,l.F_Mobile.Trim());
                             bool n = new SMSController().AddSmS(l.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
                         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/SeatGroupInput.cs

             set;
             get;
         }
+        /// <summary>
+        /// 描述说明
+        /// </summary>
+        public string Region
+        {
+            set;
+            get;
+        }
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_SeatGroup.cs

         private DateTime? _f_createtime;
         private int? _f_createby;
         private string _f_createbyname;
+        private string _f_region;
+        /// <summary>
+        /// 地区
+        /// </summary>
+        public string F_Region
+        {
+            set { _f_region = value; }
+            get { return _f_region; }
+        }
         /// <summary>
         /// 
         /// </summary>