心连心短信列表知识库修改，坐席满意度，通话记录导出，物料修改

codegit/CallCenterApi/CallCenterApi.BLL/T_SMS_RecvSMS.cs

@@ -106,10 +106,7 @@ namespace CallCenterApi.BLL
                     {
                         model.SMSID = int.Parse(dt.Rows[n]["SMSID"].ToString());
                     }
-                    if (dt.Rows[n]["F_CreateDate"].ToString() != "")
-                    {
-                        model.F_CreateDate = DateTime.Parse(dt.Rows[n]["F_CreateDate"].ToString());
-                    }
+                 
                     model.CallerNum = dt.Rows[n]["CallerNum"].ToString();
                     model.Content = dt.Rows[n]["Content"].ToString();
                     if (dt.Rows[n]["RecvTime"].ToString() != "")

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -994,8 +994,8 @@ namespace CallCenterApi.DAL
             StringBuilder strSql = new StringBuilder();
             strSql.Append(" select ");
             //20180523 通话记录导出增加客户姓名
-            strSql.Append(" (select TOP 1 d.F_CustomerName from T_Cus_CustomerBase d ");
-            strSql.Append(" where d.F_Telephone=c.CallNumber and d.F_DeleteFlag=0) cusname, ");
+            strSql.Append(" (select TOP 1 d.F_Legal from T_Cus_CustomerBaseNew d ");
+            strSql.Append(" where d.F_LegalPhone=c.CallNumber and d.F_IsDelete=0) cusname, ");
             strSql.Append(" callnumber, ");
             strSql.Append("filepath,");
             strSql.Append(" case calltype when 1 then '呼出' else '呼入' end calltypes, ");

codegit/CallCenterApi/CallCenterApi.DAL/T_SMS_RecvSMS.cs

@@ -44,13 +44,13 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_SMS_RecvSMS(");
-            strSql.Append("F_CreateDate,CallerNum,Content,RecvTime,F_UserID,F_CustomerID,F_Name,State");
+            strSql.Append("RecvModemIMEI,CallerNum,Content,RecvTime,F_UserID,F_CustomerID,F_Name,State");
             strSql.Append(") values (");
-            strSql.Append("@F_CreateDate,@CallerNum,@Content,@RecvTime,@F_UserID,@F_CustomerID,@F_Name,@State");
+            strSql.Append("@RecvModemIMEI,@CallerNum,@Content,@RecvTime,@F_UserID,@F_CustomerID,@F_Name,@State");
             strSql.Append(") ");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
-                        new SqlParameter("@F_CreateDate", SqlDbType.DateTime) ,
+                     new SqlParameter("@RecvModemIMEI", SqlDbType.VarChar,20) ,
                         new SqlParameter("@CallerNum", SqlDbType.VarChar,20) ,
                         new SqlParameter("@Content", SqlDbType.NVarChar,100) ,
                         new SqlParameter("@RecvTime", SqlDbType.DateTime) ,
@@ -60,8 +60,7 @@ namespace CallCenterApi.DAL
                         new SqlParameter("@State", SqlDbType.Int,4)
 
             };
-
-            parameters[0].Value = model.F_CreateDate;
+            parameters[0].Value = model.RecvModemIMEI;
             parameters[1].Value = model.CallerNum;
             parameters[2].Value = model.Content;
             parameters[3].Value = model.RecvTime;
@@ -92,8 +91,8 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update T_SMS_RecvSMS set ");
-
-            strSql.Append(" F_CreateDate = @F_CreateDate , ");
+            
+             strSql.Append(" RecvModemIMEI = @RecvModemIMEI , ");
             strSql.Append(" CallerNum = @CallerNum , ");
             strSql.Append(" Content = @Content , ");
             strSql.Append(" RecvTime = @RecvTime , ");
@@ -105,7 +104,7 @@ namespace CallCenterApi.DAL
 
             SqlParameter[] parameters = {
                         new SqlParameter("@SMSID", SqlDbType.Int,4) ,
-                        new SqlParameter("@F_CreateDate", SqlDbType.DateTime) ,
+                         new SqlParameter("@RecvModemIMEI", SqlDbType.VarChar,20) ,
                         new SqlParameter("@CallerNum", SqlDbType.VarChar,20) ,
                         new SqlParameter("@Content", SqlDbType.NVarChar,100) ,
                         new SqlParameter("@RecvTime", SqlDbType.DateTime) ,
@@ -117,7 +116,7 @@ namespace CallCenterApi.DAL
             };
 
             parameters[0].Value = model.SMSID;
-            parameters[1].Value = model.F_CreateDate;
+            parameters[1].Value = model.RecvModemIMEI;
             parameters[2].Value = model.CallerNum;
             parameters[3].Value = model.Content;
             parameters[4].Value = model.RecvTime;
@@ -208,10 +207,6 @@ namespace CallCenterApi.DAL
                 {
                     model.SMSID = int.Parse(ds.Tables[0].Rows[0]["SMSID"].ToString());
                 }
-                if (ds.Tables[0].Rows[0]["F_CreateDate"].ToString() != "")
-                {
-                    model.F_CreateDate = DateTime.Parse(ds.Tables[0].Rows[0]["F_CreateDate"].ToString());
-                }
                 model.CallerNum = ds.Tables[0].Rows[0]["CallerNum"].ToString();
                 model.Content = ds.Tables[0].Rows[0]["Content"].ToString();
                 if (ds.Tables[0].Rows[0]["RecvTime"].ToString() != "")
@@ -231,7 +226,8 @@ namespace CallCenterApi.DAL
                 {
                     model.State = int.Parse(ds.Tables[0].Rows[0]["State"].ToString());
                 }
-
+                model.RecvModemIMEI = ds.Tables[0].Rows[0]["RecvModemIMEI"].ToString();
+                
                 return model;
             }
             else

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

@@ -6,6 +6,9 @@ using System.Web.Mvc;
 using qcloudsms_csharp;
 using qcloudsms_csharp.json;
 using qcloudsms_csharp.httpclient;
+using System.Data;
+using System.Collections.Generic;
+using CallCenter.Utility;
 
 namespace CallCenterApi.Interface.Controllers
 {
@@ -17,65 +20,196 @@ namespace CallCenterApi.Interface.Controllers
         // 短信应用SDK AppKey
         string appkey = "2b2094bcaf2c841fdb50bcaebabf6f54";
         // 需要发送短信的手机号码
-        int templateId = 392016; // NOTE: 这里的模板ID`7839`只是一个示例，真实的模板ID需要在短信控制台中申请
+        // int templateId = 392016; // NOTE: 这里的模板ID`7839`只是一个示例，真实的模板ID需要在短信控制台中申请
         // 签名
-        string smsSign = "河南心连心客服"; // NOTE: 这里的签名只是示例，请使用真实的已申请的签名, 签名参数使用的是`签名内容`，而不是`签名ID`
+        string smsSign = "心连心客服中心"; // NOTE: 这里的签名只是示例，请使用真实的已申请的签名, 签名参数使用的是`签名内容`，而不是`签名ID`
+        BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
         #endregion
-        public ActionResult SMSSend(string name,string phone,string cusphone)
+        public ActionResult SMSSend(string name, string phone, string cusphone)
         {
-            if (string .IsNullOrEmpty (name))
-                return Error("请输入联系人姓名");
-            if (string.IsNullOrEmpty(phone))
-                return Error("请输入联系人电话");
-            if (string.IsNullOrEmpty(cusphone))
-                return Error("请输入发送号码");
-            SmsSingleSenderResult result = SMSSingleshot(cusphone, "您好，感谢你的致电反馈，稍后会安排业务经理和你联系，请你保持电话畅通。业务经理姓名："+ name+"，电话："+ phone+"。");
-            
-            if (result != null)
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId > 0)
             {
-               
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (string.IsNullOrEmpty(name))
+                    return Error("请输入联系人姓名");
+                if (string.IsNullOrEmpty(phone))
+                    return Error("请输入联系人电话");
+                if (string.IsNullOrEmpty(cusphone))
+                    return Error("请输入发送号码");
+                string msg = "您好，感谢您来电反馈，后续详细咨询也可直接拨打市场经理电话：" + phone + "，姓名：" + name + "，祝您生活愉快！";
+                string[] mag = { name, phone };
+                SmsSingleSenderResult result = SMSSingleshot(429907, mag, cusphone);
+
+                if (result != null)
+                {
+                    AddSmS(cusphone, msg, userId);
+                    return Success("发送短信", result);
+                }
+                else
+                {
+                    return Error("发送失败，请检查客户电话");
+                }
+            }
+            else
+            {
+                return Error("无操作权限");
+            }
+
+        }
+        public ActionResult GetSmSList(string starttime, string endtime, int pageindex = 1, int pagesize = 10)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId > 0)
+            {
+                string sql = "";
+                DataTable dt = new DataTable();
+                if (!string.IsNullOrEmpty(starttime))
+                    sql += " and datediff(day,RecvTime,'" + starttime + "')<=0 ";
+                if (!string.IsNullOrEmpty(endtime))
+                    sql += " and datediff(day,RecvTime,'" + endtime + "')>=0   ";
+
+                int recordCount = 0;
+                dt = BLL.PagerBLL.GetListPager(
+                        "T_SMS_RecvSMS",
+                        "SMSID",
+                        "*",
+                        sql,
+                        "ORDER BY T_SMS_RecvSMS.SMSID desc",
+                        pagesize,
+                        pageindex,
+                        true,
+                        out recordCount);
+
+                List<Model.T_SMS_RecvSMS> modlelist = new BLL.T_SMS_RecvSMS().DataTableToList(dt);
+                if (modlelist.Count > 0)
+                {
+                    List<RecvSMS> Input = modeltooip(modlelist);
+                    var obj = new
+                    {
+                        state = "success",
+                        message = "成功",
+                        rows = Input,
+                        total = recordCount
+                    };
+
+                    return Content(obj.ToJson()); ;
+                }
+                else
+                {
+
+                    return Success("暂无短信"); ;
+                }
 
-                return Success("发送短信", result);
             }
             else
             {
-                return Error ("发送失败，请检查客户电话");
+                return Error("无操作权限");
             }
         }
-        public ActionResult SMSSendSalesman(string name, string phone, string cusphone)
+        public List<RecvSMS> modeltooip(List<Model.T_SMS_RecvSMS> model)
         {
-            if (string.IsNullOrEmpty(name))
-                return Error("请输入联系人姓名");
-            if (string.IsNullOrEmpty(phone))
-                return Error("请输入联系人电话");
-            if (string.IsNullOrEmpty(cusphone))
-                return Error("请输入发送号码");
-            SmsSingleSenderResult result = SMSSingleshot(cusphone, "您好，刚有客户反馈有关市场业务/产品/农化问题，请你及时联系提供服务。姓名："+ name + "，电话："+ phone + "。");
+            List<RecvSMS> SMS = new List<RecvSMS>();
 
-            if (result != null)
+            foreach (var it in model)
+            {
+                RecvSMS Recv = new RecvSMS();
+                Recv.SMSID = it.SMSID;
+                Recv.CallerNum = it.CallerNum;
+                Recv.Content = it.Content;
+                if (it.F_UserID > 0)
+                {
+                    Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(int.Parse(it.F_UserID.ToString()));
+                    if (ua != null)
+                    {
+                        Recv.F_UserID = ua.F_UserCode + "(" + ua.F_UserName + ")";
+                    }
+                }
+                else
+                {
+                    Recv.F_UserID = "";
+                }
+                Recv.RecvTime = it.RecvTime.ToString();
+                SMS.Add(Recv);
+            }
+            return SMS;
+        }
+        public class RecvSMS
+        {
+            public int SMSID;
+            public string CallerNum;
+            public string Content;
+            public string F_UserID;
+            public string RecvTime;
+
+        }
+        public bool AddSmS(string tel, string cont, int F_UserID)
+        {
+            Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
+            dModel.CallerNum = tel.Trim();
+            dModel.Content = cont.Trim();
+            dModel.F_UserID = F_UserID;
+            dModel.RecvTime = DateTime.Now;
+            dModel.RecvModemIMEI = "";
+            int b = new BLL.T_SMS_RecvSMS().Add(dModel);
+            if (b > 0)
             {
-                return Success("发送短信", result);
+                return true;
             }
             else
             {
-                return Error("发送失败，请检查电话");
+                return false;
             }
         }
+        public ActionResult SMSSendSalesman(string name, string phone, string cusphone)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId > 0)
+            {
+                if (string.IsNullOrEmpty(name))
+                    return Error("请输入联系人姓名");
+                if (string.IsNullOrEmpty(phone))
+                    return Error("请输入联系人电话");
+                if (string.IsNullOrEmpty(cusphone))
+                    return Error("请输入发送号码");
+                string msg = "您好，刚有客户意向购买、咨询产品政策问题，客服已做简单解答，但该区域市场详细的产品价格政策及业务情况，还请您及时与客户联系提供具体服务。客户姓名：" + name + "，电话：" + phone + "。祝您工作顺利!";
+                string[] mag = { name, phone };
+                SmsSingleSenderResult result = SMSSingleshot(433866, mag, cusphone);
+
+                if (result != null)
+                {
+
+                    AddSmS(cusphone, msg, userId);
+                    return Success("发送短信", result);
 
+                }
+                else
+                {
+                    return Error("发送失败，请检查电话");
+                }
+            }
+            else
+            {
+                return Error("无操作权限");
+            }
+        }
         /// <summary>
         /// 单发短信
         /// </summary>
         /// <param name="phone"></param>
         /// <param name="cont"></param>
-        public SmsSingleSenderResult SMSSingleshot(string phone, string cont)
+        public SmsSingleSenderResult SMSSingleshot(string  phone,string  cont)
         {
             try
             {
-                SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
-                var result = ssender.send(0, "86", phone,
-                 cont, "", "");
-                Console.WriteLine(result);
+             
+
+               SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
+                  var result = ssender.send(0, "86", phone,
+                cont, "", "");
+                   Console.WriteLine(result);
                 return result;
+
             }
             catch (JSONException e)
             {
@@ -94,6 +228,42 @@ namespace CallCenterApi.Interface.Controllers
             }
         }
         /// <summary>
+        /// 单发短信
+        /// </summary>
+        /// <param name="phone"></param>
+        /// <param name="cont"></param>
+        public SmsSingleSenderResult SMSSingleshot(int templateId, string [] msg,string cusphone)
+        {
+                try
+                {
+                SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
+                var result = ssender.sendWithParam("86", cusphone,
+                    templateId, msg, smsSign, "", "");
+              
+             //   SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
+               //     var result = ssender.send(0, "86", phone,
+                 //    cont, "", "");
+              //      Console.WriteLine(result);
+                    return result;
+               
+            }
+                catch (JSONException e)
+                {
+                    Console.WriteLine(e);
+                    return null;
+                }
+                catch (HTTPException e)
+                {
+                    Console.WriteLine(e);
+                    return null;
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                    return null;
+                }
+        }
+        /// <summary>
         /// 群发短信
         /// </summary>
         /// <param name="phone"></param>
@@ -211,8 +381,10 @@ namespace CallCenterApi.Interface.Controllers
                                     {
                                         model.F_SMSReply = int.Parse(replyResult.replys[i].text);
                                         workOrder.Update(model);
-                                        SMSSingleshot(replyResult.replys[i].mobile , "心连心感谢您的评价，祝你生活愉快！");
-
+                                        string msg = "【心连心客服中心】心连心感谢您的评价，祝你生活愉快！";
+                                        SMSSingleshot(replyResult.replys[i].mobile, msg);
+                                        string mag = "心连心感谢您的评价，祝你生活愉快！";
+                                        AddSmS(replyResult.replys[i].mobile, mag, 0);
                                     }
                                     catch
                                     {
@@ -247,8 +419,34 @@ namespace CallCenterApi.Interface.Controllers
                 return null;
             }
         }
-       
 
+        //    /// <summary>
+        //    /// 新增接收短信
+        //    /// </summary>
+        //    /// <returns></returns>
+        //    public ActionResult AddRecv(string tel,string cont)
+        //    {
+        //        ActionResult res = NoToken("未知错误，请重新登录");
+
+        //            Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
+
+        //            dModel.CallerNum = tel.Trim();
+        //            dModel.Content = cont.Trim();
+        //            dModel.State = 0;
+        //            dModel.RecvTime = DateTime.Now;
+        //            dModel.F_CreateDate = DateTime.Now;
+        //            int b = new BLL.T_SMS_RecvSMS().Add(dModel);
+        //            if (b > 0)
+        //            {
+        //                res = Success("添加成功");
+        //            }
+        //            else
+        //            {
+        //                res = Success("添加失败");
+        //            }
+
+        //        return res;
+        //    }
         #region 
 
         ////    /// <summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -481,7 +481,16 @@ namespace CallCenterApi.Interface.Controllers.customer
 
                     if (!string.IsNullOrEmpty(model[i].F_AreaID))
                     {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(model[i].F_AreaID));
+                        Model.T_Sys_Department pdModel = new T_Sys_Department();
+                        try
+                        {
+                            pdModel = departmentBLL.GetModel(int.Parse(model[i].F_AreaID));
+                        }
+                        catch
+                        {
+                             pdModel = departmentBLL.GetModel(model[i].F_AreaID);
+                        }
+                           
                             if (pdModel != null)
                             {
                                 Input1.F_AreaName = pdModel.F_DeptName.ToString();
@@ -489,7 +498,15 @@ namespace CallCenterApi.Interface.Controllers.customer
                     }
                     if (!string.IsNullOrEmpty(model[i].F_BranchID))
                     {
-                           Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(model[i].F_BranchID));
+                        Model.T_Sys_Department pdModel1 = new T_Sys_Department();
+                        try
+                        {
+                            pdModel1 = departmentBLL.GetModel(int.Parse(model[i].F_BranchID));
+                        }
+                        catch
+                        {
+                            pdModel1 = departmentBLL.GetModel(model[i].F_BranchID);
+                        }
                             if (pdModel1 != null)
                             {
                                 Input1.F_BranchName = pdModel1.F_DeptName.ToString();
@@ -577,7 +594,6 @@ namespace CallCenterApi.Interface.Controllers.customer
                     }
                 }
             }
-           
             model.F_Gender = input.F_Gender;//分公司ID
             model.F_Salesman = input.F_Salesman;//业务员
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -35,7 +35,10 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 string sql = " and F_DeleteFlag=0";
                 if (pid.Trim() != "")
                 {
-                    sql += " and F_CategoryId=" + pid.Trim();
+                DataTable dr = new DataTable();
+                dr = new BLL.T_RepositoryCategory().GetList(" 1=1 " + "and F_CategoryId="+ pid).Tables[0];
+                string modelList = BindTree(dr, pid);
+                sql += " and F_CategoryId in(" + modelList.Trim()+")";
                 }
                 if (keywords.Trim() != "")
                 {
@@ -62,17 +65,17 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     pageindex,
                     true,
                     out recordCount);
+          //  List<Model.TreeModel> modelList = BindTree(dt, "0");
+            //System.Collections.Generic.List<Model.T_RepositoryInformation> modelList = new BLL.T_RepositoryInformation().DataTableToList(dt);
 
-                //System.Collections.Generic.List<Model.T_RepositoryInformation> modelList = new BLL.T_RepositoryInformation().DataTableToList(dt);
-
-                //if (modelList.Count > 0)
-                //{
-                //    res = Success("加载成功", modelList);
-                //}
-                //else
-                //    res = Error("加载失败");
+            //if (modelList.Count > 0)
+            //{
+            //    res = Success("加载成功", modelList);
+            //}
+            //else
+            //    res = Error("加载失败");
 
-                var obj = new
+            var obj = new
                 {
                     rows = dt,
                     total = recordCount
@@ -82,7 +85,53 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
             return res;
         }
+       
+        private string  BindTree(DataTable tab, string parentid)
+        {
 
+            DataTable tab2 = new DataTable();
+            string modelList = parentid;
+            var iv = new BLL.T_RepositoryCategory().GetModelList("F_ParentId=" + parentid + " and F_DeleteFlag=0 and F_CategoryType is null order by F_Sort");
+           if (iv != null )
+            {
+                foreach (var it in  iv)
+                {
+                    modelList += "," + it.F_CategoryId;
+                }
+            }
+            return modelList;
+        }
+        //private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
+        //{
+        //    DataTable tab2 = new DataTable();
+
+        //    if (tab != null && tab.Rows.Count > 0)
+        //    {
+        //        List<Model.T_RepositoryInformation> categorylist = new BLL.T_RepositoryInformation().DataTableToList(tab);
+        //        List<Model.TreeModel> modelList = new List<Model.TreeModel>(categorylist.Count);
+        //        for (int i = 0; i < categorylist.Count; i++)
+        //        {
+        //            Model.TreeModel model = new Model.TreeModel();
+        //            string currentID = categorylist[i].F_CategoryId.ToString();//当前功能ID
+        //            model.id = currentID;
+        //            model.IconCls = "";//图标
+        //            model.text = categorylist[i].F_CategoryName;
+        //            tab2 = new BLL.T_RepositoryInformation().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 and F_CategoryType is null order by F_Sort").Tables[0];
+        //            if (tab2 != null && tab2.Rows.Count > 0)
+        //            {
+        //                model.children = BindTree(tab2, currentID);
+        //            }
+        //            modelList.Add(model);
+        //        }
+        //        return modelList;
+
+        //    }
+        //    else
+        //    {
+        //        return null;
+        //    }
+
+        //}
         //获取知识库
         public ActionResult GetInfo(string infoid)
         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -2262,23 +2262,18 @@ namespace CallCenterApi.Interface.Controllers.report
                         break;
                    
                 }
-                if (i>0 )
+                if (i > 0)
                 {
-                    sqltype = $"and F_SalesBase = '"+ template.name + "'" ;
+                    sqltype = $"and F_SalesBase = '" + template.name + "'";
                 }
                 else
                 {
-                    sqltype = $"and F_SalesBase in ('新乡','新疆','九江','东北')";
-                }
-                if (!string.IsNullOrEmpty(salesBase))
-                {
-                    model.salesBase.Add(ReturenTemplate(template, sql, time, lastmouth, lastyear));
-                }
-                else
-                {
-                    model.salesBase.Add(ReturenTemplate(template, sql + sqltype, time, lastmouth, lastyear));
+                    if (string.IsNullOrEmpty(salesBase))
+                    {
+                        sqltype = $"and F_SalesBase in('新乡','新疆', '九江','东北')";
+                    }
                 }
-              
+                model.salesBase.Add(ReturenTemplate(template, sql+ sqltype, time, lastmouth, lastyear));
             }
             #endregion
             #region 产品
@@ -2301,7 +2296,15 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 Template template = new Template();
                 template.name = "合计";
-                model.product.Add(ReturenTemplate(template, sql  + $"and F_TS_Category in (" + msf + ")" , time, lastmouth, lastyear));
+                if (string.IsNullOrEmpty(product))
+                {
+                    model.product.Add(ReturenTemplate(template, sql + $"and F_TS_Category in (" + msf + ")", time, lastmouth, lastyear));
+                }
+                else
+                {
+                    model.product.Add(ReturenTemplate(template, sql , time, lastmouth, lastyear));
+                }
+             
                 foreach (var it in dicval)
                 {
                     Template templates = new Template();
@@ -2357,11 +2360,11 @@ namespace CallCenterApi.Interface.Controllers.report
                         break;
                     case 3:
                         template.name = "待回访";
-                        sqlchannel = " and F_State in (10)";
+                        sqlchannel = " and F_State in (10) and F_IsVisit=1";
                         break;
                     case 4:
                         template.name = "已回访";
-                        sqlchannel = " and F_State in (11)";
+                        sqlchannel = " and F_State in (11) and F_IsVisit=1 and F_DealType!='当即办理'  and F_VisitBy !=''";
                         break;
                    
                 }
@@ -2380,6 +2383,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     case 0:
                         template.name += "合计";
+                        sqlsatisfaction += " and F_VisitResult in ('非常满意','满意','一般','不满意')";
                         break;
                     case 1:
                         template.name = "非常满意";
@@ -2897,12 +2901,14 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             public string F_WorkOrderCode;//工单编号
             public string F_State;//工单状态
-            public string overtime;//超期时间
+            public string   overtime;//超期时间
+            public double  time;
             public string F_Description;//问题描述
             public string F_Responsibility;//责任科室
             public string F_SalesBase;//销售基地
+            public string F_Type;//反馈类型
         }
-       
+    
         /// <summary>
         ///月份投诉处理周期表
         /// </summary>
@@ -2977,15 +2983,18 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 for (int i=0;i < categorylist.Count; i++)
               {
-                 Complainthandling model = new Complainthandling();
+                    List<float> timehource = new List<float>();
+                    Complainthandling model = new Complainthandling();
                     model.name = categorylist[i].F_QuestionName;
                     model.number = 0;
-                  int efficiency = 0;
+                    int Overdue = 0;
+                    int efficiency = 0;
                     model.worker = new List<worker>();
                     foreach (var it in modellist)
                     {
                         try
                         {
+                            
                             if (int .Parse (it.F_QuestionType) == categorylist[i].F_Id )
                             {
                                 model.number ++;
@@ -2994,39 +3003,8 @@ namespace CallCenterApi.Interface.Controllers.report
                                     efficiency++;
                                     System.TimeSpan id = DateTime.Parse(it.F_DealTime.ToString()) - DateTime.Parse(it.F_CreateOn.ToString());
                                     double t = id.TotalHours;
-                                    List<float> timehource = new List<float>();
                                     timehource.Add((float)t);
-
-                                    if (timehource.Count > 0)
-                                    {
-                                        timehource.Sort((a, b) => b.CompareTo(a));
-                                        model.ongesttime = string.Format("{0:f2}h", timehource[0]);
-                                        model.minimumtime = string.Format("{0:f2}h", timehource[timehource.Count - 1]);
-                                        int n = timehource.Count / 2;
-                                        model.median = string.Format("{0:f2}h", timehource[n]);
-                                        float y = 0;
-                                        foreach (var iu in timehource)
-                                        {
-                                            y += iu;
-                                        }
-                                        model.averageTime = string.Format("{0:f2}h", y / timehource.Count);
-                                    }
-                                    else
-                                    {
-                                        model.ongesttime = "0h";
-                                        model.minimumtime = "0h";
-                                        model.median = "0h";
-                                        model.averageTime = "0h";
-                                    }
                                 }
-                                else
-                                {
-                                    model.ongesttime = "0h";
-                                    model.minimumtime = "0h";
-                                    model.median = "0h";
-                                    model.averageTime = "0h";
-                                }
-                                int Overdue = 0;
                               
                                 if (it .F_IsOver ==1&& it.F_State !=11)
                                 {
@@ -3044,6 +3022,22 @@ namespace CallCenterApi.Interface.Controllers.report
                                         worker.F_State = "异常退回";
                                    else 
                                         worker.F_State = "已处理";
+                                    if (it .F_Type == "1")
+                                    {
+                                        worker.F_Type = "咨询";
+                                    }
+                                    else if (it.F_Type == "2")
+                                    {
+                                        worker.F_Type = "投诉";
+                                    }
+                                    else if (it.F_Type == "3")
+                                    {
+                                        worker.F_Type = "抽检";
+                                    }
+                                    else
+                                    {
+                                        worker.F_Type = "建议及其他";
+                                    }
                                     worker.F_SalesBase = it.F_SalesBase;
                                     worker.F_Description = it.F_Description;
                                     string timeover = "", timeover2 = ""; int x = 0, y = 0;
@@ -3078,6 +3072,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                                             System.TimeSpan id = DateTime.Parse(timeover2) - DateTime.Parse(timeover);
                                                             double a = id.TotalHours;
                                                             worker.overtime = string .Format ("{0:f2}h", a - limit);
+                                                            worker.time = a - limit;
                                                             if (itemlasts[x].F_NextDept > 0)
                                                             {
                                                                 var deptment = departmentBLL.GetModel(int.Parse(itemlasts[x].F_NextDept.ToString()));
@@ -3093,6 +3088,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                                             System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
                                                             double a = id.TotalHours;
                                                             worker.overtime = string.Format("{0:f2}h", a - limit);
+                                                            worker.time = a - limit;
                                                             if (itemlasts[y].F_NextDept > 0)
                                                             {
                                                                 var deptment = departmentBLL.GetModel(int.Parse(itemlasts[y].F_NextDept.ToString()));
@@ -3112,6 +3108,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                                     System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
                                                     double a = id.TotalHours;
                                                     worker.overtime = string.Format("{0:f2}h", a - limit);
+                                                    worker.time = a - limit;
                                                     if (itemlasts[x].F_NextDept > 0)
                                                     {
                                                         var deptment = departmentBLL.GetModel(int.Parse(itemlasts[x].F_NextDept.ToString()));
@@ -3124,6 +3121,7 @@ namespace CallCenterApi.Interface.Controllers.report
 
 
                                             }
+                                           
                                         }
                                         }
                                     Overdue++;
@@ -3158,11 +3156,37 @@ namespace CallCenterApi.Interface.Controllers.report
                            
                         }
                     }
+                    if (timehource.Count > 0)
+                    {
+                        timehource.Sort((a, b) => b.CompareTo(a));
+                        model.ongesttime = string.Format("{0:f2}h", timehource[0]);
+                        model.minimumtime = string.Format("{0:f2}h", timehource[timehource.Count - 1]);
+                        int n = timehource.Count / 2;
+                        model.median = string.Format("{0:f2}h", timehource[n]);
+                        float y = 0;
+                        foreach (var iu in timehource)
+                        {
+                            y += iu;
+                        }
+                        model.averageTime = string.Format("{0:f2}h", y / timehource.Count);
+                    }
+                    else
+                    {
+                        model.ongesttime = "0h";
+                        model.minimumtime = "0h";
+                        model.median = "0h";
+                        model.averageTime = "0h";
+                    }
+                    model.worker .Sort((a, b) => b.time  .CompareTo(a.time));
                     if (questionName != "")
                         modeNamelList.Add(model);
                     else if (model.number > 0)
+                    {
+                        
                         modeNamelList.Add(model);
+                    }
                 }
+                       
             }
             modeNamelList.Sort((a, b) => b .number .CompareTo(a .number ));
             var obj = new

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/ZuoXiManYiDuController.cs

@@ -96,16 +96,16 @@ namespace CallCenterApi.Interface.Controllers.report
             //存储数据
             Dictionary<string, List<List<string>>> body = new Dictionary<string, List<List<string>>>();
             //坐席
-            //DataTable dtable = new BLL.T_Sys_UserAccount().GetList("F_RoleId in (1,4,28,29) and F_DeleteFlag=0").Tables[0];//客服坐席、班长坐席、售前坐席、投诉坐席
-            DataTable dtable = new BLL.T_Sys_UserAccount().GetList("F_DeleteFlag=0").Tables[0];
+            //  DataTable dtable = new BLL.T_Sys_UserAccount().GetList("F_RoleId in (1,4,28,29) and F_DeleteFlag=0").Tables[0];//客服坐席、班长坐席、售前坐席、投诉坐席
+            DataTable dtable = new BLL.T_Sys_UserAccount().GetList("F_DeleteFlag=0 and F_SeatFlag=1  ").Tables[0];
             int allcount = dtable.Rows.Count;
             for (int i = 0; i < allcount; i++)
             {
                 int userid = Convert.ToInt32(dtable.Rows[i]["F_UserId"].ToString());
                 List<string> bodyitem = new List<string>();
                 string[] UNDN = getRoleNameAndUserName(userid);
-                bodyitem.Add(UNDN[2]);
-                DataTable dt = new BLL.T_Call_CallRecords().GetList("UserId='" + userid + "'" + time).Tables[0];
+                bodyitem.Add(UNDN[2]+"("+ UNDN[1]+")");
+                DataTable dt = new BLL.T_Call_CallRecords().GetList("UserId='" + userid + "'" + time + "and CallType=0 and CallState=1").Tables[0];
                 //1非常满意、2基本满意、3不满意、4未评价
                 for (int j = 1; j <= 4; j++)
                 {

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

@@ -171,7 +171,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 out recordCount);
 
             dt.Columns.Add("CusName");
-
+           
             var config = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
             var users = new BLL.T_Sys_UserAccount().GetModelList("");
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -2990,20 +2990,21 @@ namespace CallCenterApi.Interface.Controllers.weixin
             string smscont = "";
             if (model.F_Type == "1")
             {
-                smscont = "您有一条新的咨询工单,请及时处理";
+                smscont = "咨询";
             }
             else if (model.F_Type == "2")
             {
-                smscont = "您有一条新的投诉工单,请及时处理";
+                smscont = "投诉";
             }
             else if (model.F_Type == "3")
             {
-                smscont = "您有一条新的抽检工单,请及时处理";
+                smscont = "抽检";
             }
             else
             {
-                smscont = "您有一条新的建议工单,请及时处理";
+                smscont = "建议";
             }
+            string[] msg = { smscont };
             string touser = ""; string tousername = "";
             #region 获取接收人
             int deptid = 0;
@@ -3021,7 +3022,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (!string.IsNullOrEmpty(clus.F_Mobile))
                     {
-                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(clus.F_Mobile, smscont);
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191,msg,clus.F_Mobile);
+                      bool n  = new SMSController().AddSmS(clus.F_Mobile, smscont, nowUser.F_UserId );
                     }
 
                 }
@@ -3047,8 +3049,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                   {
                     if (!string.IsNullOrEmpty(l.F_Mobile))
                     {
-                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(l.F_Mobile, smscont);
-                    }
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191, msg,l.F_Mobile);
+                            bool n = new SMSController().AddSmS(l.F_Mobile, smscont, nowUser.F_UserId);
+                        }
 
                 }
                 }

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

@@ -113,37 +113,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("获取参数失败");
             }
         }
-        private string GetIntCode()
-        {
-            string time = DateTime.Now.ToString("hhmmss");
-            Random ran = new Random();
-            int RandKey = ran.Next(1000, 9999);
-            string timecode = 3 + "" + RandKey + "" + time;
-            return timecode;
-        }
+  
         //[Authority]
         //添加物料
         public ActionResult AddModel(WoMaterialManageInput input)
         {
             Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
             #region 验证物料编码为11位纯数字
-           
+            if (string.IsNullOrEmpty(input.F_MaterialCode))
+            {
+                return Error("请输入物料编码");
+            }
             if (!string.IsNullOrWhiteSpace(input.F_MaterialCode))
             {
                 if (!valcode(input.F_MaterialCode))
                     return Error("物料编号必须是11位数字");
             }
-            if (string.IsNullOrEmpty(input.F_MaterialCode))
-            {
-                while (true)
-                {
-                    if (!getunique(0, GetIntCode()))
-                    {
-                        input.F_MaterialCode = GetIntCode();
-                        break;
-                    }
-                }
-            }
             #endregion
             #region
             dModel.F_MaterialCode = input.F_MaterialCode;//物料编号

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

@@ -37,8 +37,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string code, string cusname, string cusphone,string createby, string starttime, string endtime, string keywords, string companyname, string province, string city,
-            string country,string telephone, string township, string touser,string strvisit,string endvisit, int source=0,int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
+        public ActionResult GetList(string code, string cusname, string cusphone, string createby, string starttime, string endtime, string keywords, string companyname, string province, string city,
+            string country, string telephone, string township, string touser, string strvisit, string endvisit, int source = 0, int type = 0, int status = 0, int state=-1, int pageindex = 1,int pagesize = 10)
         {
            
               int userId = CurrentUser.UserData.F_UserId;
@@ -195,18 +195,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += " and F_State =" + (int)EnumWorkOrderState.finish + " and F_DealBy = '" + ua.F_UserCode + "' ";
                         break;
                     case 3://我参与的
+                        if (status>0)
+                        {
+                            sql += $" and F_State ="+ status;
+                        }
+                        else
+                        {
+                            sql += $" and F_State in(1,2,3,4)";
+                        }
                         if (ro.F_RoleCode == "XTGLY")
                         {
                             if (GetParticipateID() != "")
                             {
                                 sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID() + ") ";
-                                sql += " and F_State =" + (int)EnumWorkOrderState.assign;
                             }
                         }
                         else
                         {
                             if (GetParticipateID(ua.F_UserCode) != "")
                             {
+                                
                                 sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
                             }
                             else
@@ -214,6 +222,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("暂无工单");
                             }
                         }
+                      
                         break;
                     case 4://待回访
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
@@ -663,12 +672,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 3://客服已分配
                             sql = "";
                             sql += $"  F_IsDelete=0";
+                            sql += $" and F_State in(1,2,3,4)";
                             if (ro.F_RoleCode == "XTGLY")
                             {
                                 if (GetParticipateID() != "")
                                 {
                                     sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID() + ") ";
-                                    sql += " and F_State =" + (int)EnumWorkOrderState.assign;
+                                   
                                 }
                                 else
                                 {
@@ -848,7 +858,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += $"  F_IsDelete=0";
                             if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                             {
-                                sql += $" and F_ID in(" + GetDelay() + ")";
+                              
                             }
                             else
                             {
@@ -931,7 +941,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql = "";
                             sql += $"  F_IsDelete=0";
                             sql += $" and F_IsOver=" + 1;
-                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
+                            sql += $" and F_State !=" + 11;
+                            if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
                             {
                                 sql += $" and F_DealBy like '%" + ua.F_UserCode.Trim() + "%'";
                             }
@@ -984,10 +995,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     break; ;
                                 }
                             }
-                            else if (ro.F_RoleCode == "JDYBZZX")
-                            {
-                                sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
-                            }
+                           
                             else if (ro.F_RoleCode == "QTJS")
                             {
                                 CQGD = 0;
@@ -998,6 +1006,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 18://催办
                             sql = "";
                             sql += $"  F_IsDelete=0";
+                            sql += $" and F_State !=" + 10;
+                            sql += $" and F_State !=" + 11;
                             var list = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.urge);
                             string str = "";
                            foreach (var it in list)
@@ -2147,11 +2157,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string GetParticipateID(string user)
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ") and F_OptType in( 1,7)";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ") and F_OptType in( 1)";
 
             ;
             return str;
         }
+    
         /// <summary>
         /// 获取部门待接单的工单编号
         /// </summary>
@@ -2475,6 +2486,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         sql += $" and F_State in (11)";
                         sql += $" and F_IsVisit=" + 1; ;
+                        sql += $"and F_DealType != '当即办理'  and F_VisitBy != ''";
                     }
                     else if (state == 10)
                     {
@@ -2485,10 +2497,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += $" and F_State=" + state;
                     }
                 }
-                  
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
-
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
                 {
                     string F_WorkNumber = "";
@@ -2666,7 +2676,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 查询超时工单列表
         /// </summary>
         public ActionResult GetOvertime(string code,string keywords, string cusname, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int source = 0, int type = 0,int pageindex = 1, int pagesize = 10)
+         string starttime, string salesBase, string endtime,  string country, string township, string touser, string product,int source = 0,int state=0, int type = 0,int pageindex = 1, int pagesize = 10)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -2688,6 +2698,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and ( F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
+                if (!string.IsNullOrEmpty(starttime))
+                    sql += " and datediff(day,F_CreateOn,'" + starttime + "')<=0 ";
+                if (!string.IsNullOrEmpty(endtime))
+                    sql += " and datediff(day,F_CreateOn,'" + endtime + "')>=0   ";
+                if (!string.IsNullOrWhiteSpace(salesBase))//销售基地
+                    sql += $" and F_SalesBase like '%" + salesBase.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -2702,11 +2718,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(province))//乡
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
-              
+                if (!string.IsNullOrEmpty(product))
+                {
+                    sql += $" and F_TS_Category='" + product.Trim() + "'";
+                }
+                if (state>0)
+                {
+                    sql += $" and F_State =" + state;
+                }
                 sql += $" and F_IsOver=" + 1;
+                sql += $" and F_State !=" + 11;
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
+                if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
                 {
                     sql += $" and F_DealBy like '%" + ua.F_UserCode.Trim() + "%'";
                 }
@@ -2757,10 +2781,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("加载失败");
                     }
                 }
-                else if (ro.F_RoleCode == "JDYBZZX")
-                {
-                    sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
-                }
                 else if (ro.F_RoleCode == "QTJS")
                 {
                     return Error("无操作权限！");
@@ -3357,6 +3377,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(province))//乡
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
+                sql += $" and F_State !=" + 10;
+                sql += $" and F_State !=" + 11;
                 #endregion
                 int recordCount = 0;
                 var list = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.urge);
@@ -4036,7 +4058,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (!string.IsNullOrEmpty(cuModel.F_AreaID))
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
+                            Model.T_Sys_Department pdModel = new T_Sys_Department();
+                            try
+                            {
+                               pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
+                            }
+                            catch
+                            {
+                               pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                            }
+                         
                             if (pdModel != null)
                             {
                                 model.F_AreaName = pdModel.F_DeptName;
@@ -4044,7 +4075,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         if (!string.IsNullOrEmpty(cuModel.F_BranchID))
                         {
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
+                            Model.T_Sys_Department pdModel1 = new T_Sys_Department();
+                            try
+                            {
+                                pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));//通过公司id获取部门
+                            }
+                            catch
+                            {
+                                pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);//通过公司id获取部门
+                            }
                             if (pdModel1 != null)
                             {
                                 model.F_BranchName = pdModel1.F_DeptName;
@@ -4175,7 +4214,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else if (model1[i].F_State == 11)
                     {
-                        model.F_StateName = "已评价";
+                        model.F_StateName = "已回访";
                     }
                     else if (model1[i].F_State == 12)
                     {
@@ -4593,39 +4632,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return true;
         }
-        private bool IsMaterial(WorkOrderNewInput input)
-        {
-            bool n= false;
-            if (!string .IsNullOrEmpty (input.F_MaterialID)|| !string.IsNullOrEmpty(input.F_MaterialName)
-               || !string.IsNullOrEmpty(input.F_Model) || !string.IsNullOrEmpty(input.F_Specs)
-                || !string.IsNullOrEmpty(input.F_Level1) || !string.IsNullOrEmpty(input.F_Level2)
-              || !string.IsNullOrEmpty(input.F_Level3) || !string.IsNullOrEmpty(input.F_Brand)
-              || !string.IsNullOrEmpty(input.F_MaterialEffect) || !string.IsNullOrEmpty(input.F_Craft)
-              || !string.IsNullOrEmpty(input.F_Pipeline))
-            {
-                n = true;
-            }
-            return n;
-        }
-        private void AddMait(WorkOrderNewInput input,string usercode)
-        {
-            Model.T_Wo_MaterialManage dModel = new Model.T_Wo_MaterialManage();
-            dModel.F_MaterialCode = input.F_MaterialID.ToString();//物料编号
-            dModel.F_MaterialName = input.F_MaterialName;//物料名称
-            dModel.F_Model = input.F_Model;//型号
-            dModel.F_Specs = input.F_Specs;//规格
-            dModel.F_Level1 = input.F_Level1;//一级分类
-            dModel.F_Level2 = input.F_Level2;//二级分类
-            dModel.F_Level3 = input.F_Level3;//三级分类
-            dModel.F_Brand = input.F_Brand;//品牌
-            dModel.F_MaterialEffect = input.F_MaterialEffect;//复合肥肥效
-            dModel.F_Craft = input.F_Craft;//工艺
-            dModel.F_Pipeline = input.F_Pipeline;//产品线
-            dModel.F_IsDelete = 0;
-            dModel.F_CreateOn = DateTime.Now;
-            dModel.F_CreateBy = usercode;
-            int f = mmBLL.Add(dModel);
-        }
+      
+
       
         /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
@@ -4655,8 +4663,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_Source = model.F_Source.ToString();//工单来源
             }
                 #region 基本字段
-            
-
                 if (input.F_Type == 2 || input.F_Type == 3)
                 {
                     if (string.IsNullOrEmpty(input.F_CustomerID))
@@ -4670,15 +4676,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 Customer.F_Salesman = input.F_Salesman;
                             if (!string.IsNullOrEmpty(input.F_SalesPhone))
                                 Customer.F_SalesPhone = input.F_SalesPhone;
-                            if (!string.IsNullOrEmpty(input.F_Brands))
-                                Customer.F_Brands = input.F_Brands;
-                            if (!string.IsNullOrEmpty(input.F_AreaName))
-                                Customer.F_AreaID = input.F_AreaName.Trim();
+                       
+                       
+                        if (!string.IsNullOrEmpty(input.F_Brands))
+                            Customer.F_SalesPhone = input.F_Brands;
+                        if (!string.IsNullOrEmpty(input.F_AreaName))
+                        {
+                            Model.T_Sys_Department pdModel = new T_Sys_Department();
+                            try
+                            {
+                                pdModel = departmentBLL.GetModel(int.Parse(input.F_AreaName));
+                            }
+                            catch
+                            {
+                                pdModel = departmentBLL.GetModel(input.F_AreaName);
+                            }
+                            Customer.F_AreaID = pdModel.F_DeptId.ToString();
+                        }
+                              
                             if (!string.IsNullOrEmpty(input.F_BranchName))
-                                Customer.F_BranchID = input.F_BranchName.Trim();
+                        {
+                            Model.T_Sys_Department pdModel = new T_Sys_Department();
+                            try
+                            {
+                                pdModel = departmentBLL.GetModel(int.Parse(input.F_BranchName));
+                            }
+                            catch
+                            {
+                                pdModel = departmentBLL.GetModel(input.F_BranchName);
+                            }
+                            Customer.F_BranchID = pdModel.F_DeptId.ToString();
+                        }
+                               
                             cusbll.Update(Customer);
                         }
-                       
 
                     }
                     else
@@ -4691,39 +4722,41 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (!string.IsNullOrEmpty(input.F_SalesPhone))
                                 Customer.F_SalesPhone = input.F_SalesPhone;
                             if (!string.IsNullOrEmpty(input.F_Brands))
-                                Customer.F_Brands = input.F_Brands;
-                            if (!string.IsNullOrEmpty(input.F_AreaName))
-                                Customer.F_AreaID = input.F_AreaName.Trim();
-                            if (!string.IsNullOrEmpty(input.F_BranchName))
-                                Customer.F_BranchID = input.F_BranchName.Trim();
-                            cusbll.Update(Customer);
-                        }
-                     
-                    }
-                    if ( IsMaterial(input))
-                    {
-                        if (string.IsNullOrEmpty(input.F_MaterialID))
+                               Customer.F_Brands = input.F_Brands;
+                        if (!string.IsNullOrEmpty(input.F_AreaName))
                         {
-                            while (true)
+                            Model.T_Sys_Department pdModel = new T_Sys_Department();
+                            try
                             {
-                                if (!gematerque(0, GetIntCode()))
-                                {
-                                    input.F_MaterialID = GetIntCode();
-                                    AddMait(input, usercode);
-                                    break;
-                                }
+                                pdModel = departmentBLL.GetModel(int.Parse(input.F_AreaName));
+                            }
+                            catch
+                            {
+                                pdModel = departmentBLL.GetModel(input.F_AreaName);
                             }
+                            Customer.F_AreaID = pdModel.F_DeptId.ToString();
                         }
-                        else
+                               
+                            if (!string.IsNullOrEmpty(input.F_BranchName))
                         {
-                            if (!gematerque(0, input.F_MaterialID))
                             {
-                                AddMait(input, usercode);
+                                Model.T_Sys_Department pdModel = new T_Sys_Department();
+                                try
+                                {
+                                    pdModel = departmentBLL.GetModel(int.Parse(input.F_BranchName));
+                                }
+                                catch
+                                {
+                                    pdModel = departmentBLL.GetModel(input.F_BranchName);
+                                }
+                                Customer.F_BranchID = pdModel.F_DeptId.ToString();
                             }
                         }
+                              
+                            cusbll.Update(Customer);
+                        }
                     }
                 }
-           
             #endregion
             model.F_Canal = input.F_Canal;//生产批次号
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
@@ -5865,7 +5898,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (!string.IsNullOrEmpty(model.F_CusPhone.Trim () ))
                     {
-                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(model.F_CusPhone.Trim(), smscont);
+                        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 )
                         {
                             sid = result.sid.Trim ();
@@ -6230,21 +6265,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string smscont = "";
             if (model.F_Type == "1")
             {
-                smscont = "您有一条新的咨询工单,请及时处理";
+                smscont = "咨询";
             }
             else if (model.F_Type == "2")
             {
-                smscont = "您有一条新的投诉工单,请及时处理";
+                smscont = "投诉";
             }
             else if (model.F_Type == "3")
             {
-                smscont = "您有一条新的抽检工单,请及时处理";
+                smscont = "抽检";
             }
             else
             {
-                smscont = "您有一条新的建议工单,请及时处理";
+                smscont = "建议";
             }
-
+            string[] mag = { smscont };
             string touser = ""; string tousername = "";
 
             int deptid = 0;
@@ -6262,7 +6297,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (!string .IsNullOrEmpty (clus.F_Mobile.Trim ()))
                         {
-                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(clus.F_Mobile.Trim(), smscont);
+                          
+                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191, mag, clus.F_Mobile.Trim());
+                            bool n = new SMSController().AddSmS(clus.F_Mobile.Trim(), smscont, nowUser.F_UserId);
                         }
                         
                     }
@@ -6290,7 +6327,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (!string.IsNullOrEmpty(l.F_Mobile.Trim ()))
                         {
-                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(l.F_Mobile.Trim(), smscont);
+                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(395191, mag,l.F_Mobile.Trim());
+                            bool n = new SMSController().AddSmS(l.F_Mobile.Trim(), smscont, nowUser.F_UserId);
                         }
 
                     }

codegit/CallCenterApi/CallCenterApi.Model/T_SMS_RecvSMS.cs

@@ -95,5 +95,11 @@ namespace CallCenterApi.Model
             get { return _f_createdate; }
             set { _f_createdate = value; }
         }
+        private string _recvmodemimei;
+        public string RecvModemIMEI
+        {
+            get { return _recvmodemimei; }
+            set { _recvmodemimei = value; }
+        }
     }
 }