通话记录表，短信，部门权限，坐席话务表，工单

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -1016,10 +1016,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 e.F_CustomerIndustry from T_Cus_CustomerBase e ");
-            strSql.Append(" where e.F_Telephone=c.CallNumber and e.F_DeleteFlag=0) cusdepname, ");
+            strSql.Append(" (select TOP 1 d.F_Name from T_Cus_Customer d ");
+            strSql.Append(" where d.F_Phone=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.Interface/CallCenterApi.Interface/Configs/system.config

@@ -27,7 +27,7 @@
   <!-- 设置模板名字 -->
   <add key="mbname" value="客户档案模板" />
   <!-- 设置模板列名字 -->
-  <add key="mbkeys" value="大区,办事处,省份,城市,县/区,姓名,电话,备注" />
+  <add key="mbkeys" value="大区,办事处,省份,城市,区/县,姓名,电话,备注" />
   <!-- 设置数据库列名字 -->
   <add key="dbkeys" value="F_Area,F_Province,F_City,F_Name,F_Phone" />
   <!-- ================== 5：Redis配置 ================== -->

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -367,8 +367,17 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
                 if (userModel != null)
                     pId = userModel.F_DeptId;
+                string where = "";
                 DataTable dt = new DataTable();
-                string where = " isnull(F_DeptId,0)='" + pId + "' and F_State=1 ";
+                if (pId==421 || pId == 2)
+                {
+                    where = "(isnull(F_DeptId,0)='" + pId + "'or F_Layer=1 ) and F_State=1";
+                }
+                else
+                {
+                     where = " isnull(F_DeptId,0)='" + pId + "' and F_State=1 ";
+                }
+              
                 //if (!string.IsNullOrEmpty(userModel.groupcode))
                 //{
                 //    where += " and F_GroupCode = '" + userModel.groupcode + "'";

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

@@ -110,13 +110,13 @@ namespace CallCenterApi.Interface.Controllers
                     sModel.F_ZXZCode = input.ZXZCode.Trim();
                 else
                 {
-                    return Error("编号不能为空");
+                    return Error("坐席组编号不能为空");
                 }
                 if (input.ZXZName != null)
                     sModel.F_ZXZName = input.ZXZName.Trim();
                 else
                 {
-                    return Error("名称不能为空");
+                    return Error("坐席组名称不能为空");
                 }
                 if (input.ZXAtt != null)
                     sModel.F_ZXAtt = input.ZXAtt.Trim();

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

@@ -125,7 +125,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 if (isdc > 0)
                 {
                     string dccols = "F_Area,F_Office,F_Province,F_City,F_County,F_Name,F_Phone,F_Remarks";
-                    var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Bus_WorkOrder where 1=1 " + sql).Tables[0];
+                    var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Bus_WorkOrder1 where 1=1 " + sql).Tables[0];
                     string[] dccolnames = new string[] {"大区", "办事处", "省份", "城市", "县/区", "姓名", "电话", "备注" };
                     var msg = new NPOIHelper().ExportToExcel("客户列表", dtdc, dccolnames);
                     if (msg == "")
@@ -464,9 +464,9 @@ namespace CallCenterApi.Interface.Controllers.customer
             var count = new BLL .T_Cus_Customer().GetModelList(sql).Count();
             return count > 0;
         }
-        /// <summary>
-        /// 导入excel
-        /// </summary>
+        ///// <summary>
+        ///// 导入excel
+        ///// </summary>
         public ActionResult ImportExcel()
         {
             string usercode = CurrentUser.UserData.F_UserCode;
@@ -510,34 +510,34 @@ namespace CallCenterApi.Interface.Controllers.customer
                         {
                             #region 数据入库
                             headrow = headrow + 1;
-                                if (!getunphone(dr["电话"].ToString()))
-                                {
-                                        dModel.F_Area  = dr["大区"].ToString();
-                                        dModel.F_Office  = dr["办事处"].ToString();
-                                        dModel.F_Province  = dr["省份"].ToString();
-                                       dModel.F_City  = dr["城市"].ToString();
-                                       dModel.F_County  = dr["县/区"].ToString();
-                                dModel.F_Name  = dr["姓名"].ToString();
-                                dModel.F_Phone  = dr["电话"].ToString();
-                                dModel.F_Remarks  = dr["备注"].ToString();
+                            if (!getunphone(dr["电话"].ToString()))
+                            {
+                                dModel.F_Area = dr["大区"].ToString();
+                                dModel.F_Office = dr["办事处"].ToString();
+                                dModel.F_Province = dr["省份"].ToString();
+                                dModel.F_City = dr["城市"].ToString();
+                                dModel.F_County = dr["县/区"].ToString();
+                                dModel.F_Name = dr["姓名"].ToString();
+                                dModel.F_Phone = dr["电话"].ToString();
+                                dModel.F_Remarks = dr["备注"].ToString();
                                 #endregion
                                 var res = new BLL.T_Cus_Customer().Add(dModel);
-                                        if (res > 0)
-                                        {
-                                        }
-                                        else
-                                        {
-                                            msg = msg + "第" + headrow + "行，导入失败<br>";
-                                        }
-
+                                if (res > 0)
+                                {
                                 }
                                 else
                                 {
-                                    msg = msg + "第" + headrow + "行，客户电话重复，未导入<br>";
+                                    msg = msg + "第" + headrow + "行，导入失败<br>";
                                 }
 
-                          
-                          
+                            }
+                            else
+                            {
+                                msg = msg + "第" + headrow + "行，客户电话重复，未导入<br>";
+                            }
+
+
+
                         }
                         if (string.IsNullOrEmpty(msg))
                             return Success("导入成功 ");
@@ -552,6 +552,130 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <summary>
         /// 导入excel
         /// </summary>
+        //public ActionResult ImportExcel()
+        //{
+        //    string usercode = CurrentUser.UserData.F_UserCode;
+        //    string ip = DTRequest.GetIP();
+        //    if (!string.IsNullOrWhiteSpace(usercode))
+        //    {
+        //        HttpPostedFile _upFile = RequestString.GetFile("upFile");
+        //        if (_upFile != null)
+        //        {
+        //            int headrow = 0;
+        //            #region 上传文件
+        //            string filepath = "";
+        //            string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
+        //            string aLastName = Path.GetExtension(_upFile.FileName);
+        //            string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
+        //            if (aLastName != ".xls" && aLastName != ".xlsx")
+        //            {
+        //                return Error("文件类型错误，请选择Excel文件");
+        //            }
+        //            string newpath = datepath + "_" + _upFile.FileName;
+        //            if (!Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData")))
+        //            {
+        //                Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData"));
+        //            }
+        //            filepath = this.Request.ApplicationPath + "/ExcelData/" + newpath;
+        //            string PhysicalPath = Server.MapPath(filepath);
+        //            _upFile.SaveAs(PhysicalPath);
+        //            #endregion
+        //            NPOIHelper np = new NPOIHelper();
+        //            DataTable dt = np.ExcelToTable(_upFile, headrow);
+        //            string msg = string.Empty;
+        //            if (dt == null || dt.Rows.Count == 0)
+        //                return Error("文件没有数据");
+        //            else
+        //            {
+        //                Model.T_Bus_WorkOrder dModel = new Model.T_Bus_WorkOrder();
+        //                dModel.F_IsDelete = 0;
+        //                dModel.F_CreateUser = usercode;
+        //                dModel.F_CreateTime = DateTime.Now;
+        //                foreach (DataRow dr in dt.Rows)
+        //                {
+        //                    #region 数据入库
+        //                    headrow = headrow + 1;
+        //                    if (headrow == 176)
+        //                    {
+        //                        int a = 0;
+        //                    }
+        //                    if (!string.IsNullOrEmpty(dr["本部"].ToString()))
+        //                    {
+        //                        var daptment = new BLL.T_Sys_Department().GetModel(dr["本部"].ToString());
+        //                        if (daptment != null)
+        //                            dModel.F_Area = daptment.F_DeptId.ToString();
+        //                    }
+
+        //                    if (!string.IsNullOrEmpty(dr["办事处"].ToString()))
+        //                    {
+        //                        var daptment = new BLL.T_Sys_Department().GetModel(dr["办事处"].ToString());
+        //                        if (daptment != null)
+        //                            dModel.F_Office = daptment.F_DeptId.ToString();
+        //                        else
+        //                        {
+        //                            var daptment1 = new BLL.T_Sys_Department().GetModel(dr["办事处"].ToString() + "");
+        //                            if (daptment1 != null)
+        //                                dModel.F_Office = daptment1.F_DeptId.ToString();
+        //                        }
+        //                    }
+        //                    if (!string.IsNullOrEmpty(dr["投诉时间"].ToString()))
+        //                        try
+        //                        {
+        //                            dModel.F_CreateTime = DateTime.Parse("2018年12月" + dr["投诉时间"].ToString());
+        //                            dModel.F_WorkOrderId = DateTime.Parse("2018年12月" + dr["投诉时间"].ToString()).ToString("yyyyMMddHHmmssfff");  //工单编号  
+        //                        }
+        //                        catch
+        //                        {
+        //                            dModel.F_CreateTime = DateTime.Parse("2018年12月26日11时28分" + DateTime.Now.Second + "秒");
+        //                            dModel.F_WorkOrderId = DateTime.Parse("2018年12月26日11时28分" + DateTime.Now.Second + "秒").ToString("yyyyMMddHHmmssfff");
+        //                        }
+        //                    try
+        //                    {
+        //                        dModel.F_SerialNumber = int.Parse(dr["序号"].ToString());
+        //                    }
+        //                    catch
+        //                    {
+
+        //                    }
+
+        //                    dModel.F_CusName = dr["姓名"].ToString();
+        //                    dModel.F_AddRess = dr["地址"].ToString();
+        //                    dModel.F_CusPhone = dr["联系电话"].ToString().Split('、')[0];
+        //                    dModel.F_ProductType = dr["产品代码"].ToString();
+        //                    dModel.F_ProductName = dr["产品名称"].ToString();
+        //                    dModel.F_Specifications = dr["规格"].ToString();
+        //                    dModel.F_ProductDate = dr["生产日期"].ToString();
+        //                    dModel.F_Manufacturer = dr["生产厂家"].ToString();
+        //                    dModel.F_ProblemCode = dr["问题代码"].ToString();
+        //                    dModel.F_QualityProblem = dr["质量问题"].ToString();
+        //                    dModel.F_Notifications = dr["通知人"].ToString();
+        //                    dModel.F_ReceivingPerson = dr["接听人"].ToString();
+        //                    dModel.F_DealResult = dr["落实情况"].ToString();
+        //                    dModel.F_Type = 2;
+        //                    #endregion
+        //                    var res = new BLL.T_Bus_WorkOrder().Add(dModel);
+        //                    if (res > 0)
+        //                    {
+
+        //                    }
+        //                    else
+        //                    {
+        //                        msg = msg + "第" + headrow + "行，导入失败<br>";
+        //                    }
+        //                }
+        //                if (string.IsNullOrEmpty(msg))
+        //                    return Success("导入成功 ");
+        //                else
+        //                    return Error(msg);
+        //            }
+        //        }
+        //        return Error("数据源上传失败");
+        //    }
+        //    return Error("用户登录失败，请重新登录");
+        //}
+        /// <summary>
+        /// 导入excel
+        /// </summary>
         //public ActionResult ExportExcel()
         //{
         //    string usercode = CurrentUser.UserData.F_UserCode;

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

@@ -10,9 +10,77 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers.report
 {
+
   //  [Authority]
     public class BusinessController : BaseController
     {
+        /// <summary>
+        /// 坐席话务量
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        public ActionResult GetAgentTelCount(string stime, string  endtime)
+        {
+            string where = " ";
+            if (stime == "")
+            {
+                where += " and datediff(day,BeginTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')<=0 ";
+            }
+
+            else
+            {
+              
+                where += " and datediff(day,BeginTime,'" + stime + "')<=0 ";
+            }
+            if (endtime == "")
+            {
+               
+                where += " and datediff(day,BeginTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')>=0 ";
+            }
+            else
+            {
+                where += " and datediff(day,BeginTime,'" + endtime + "')>=0 ";
+            }
+          
+
+            DataTable dtTel = DbHelperSQL.Query(" select * from T_Call_CallRecords where 1=1 " + where).Tables[0];
+
+            string sql = "SELECT F_UserCode,F_UserName,F_WorkNumber,F_UserId FROM T_Sys_UserAccount where f_seatFlag=1 and F_DeleteFlag=0";
+            DataTable dtUser = DbHelperSQL.Query(sql).Tables[0];
+
+            string[] users = new string[dtUser.Rows.Count];//坐席工号/姓名
+            int[] incount = new int[dtUser.Rows.Count];//呼入量
+            int[] inconnectcount = new int[dtUser.Rows.Count];//呼入接通量
+            int[] outcount = new int[dtUser.Rows.Count];//呼出量
+            int[] outconnectcount = new int[dtUser.Rows.Count];//呼出接通量
+
+            for (int i = 0; i < dtUser.Rows.Count; i++)
+            {
+                //坐席
+                users[i] = "(" + dtUser.Rows[i]["F_UserCode"].ToString() + ")" + dtUser.Rows[i]["F_UserName"].ToString();
+                //呼入量
+                var inlist = dtTel.Select(" CallType=0 and UserCode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "' ");
+                incount[i] = inlist.Count();
+                //呼入接通量
+                var inconnectlist = dtTel.Select(" CallType=0 and CallState=1 and UserCode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "' ");
+                inconnectcount[i] = inconnectlist.Count();
+                //呼出量
+                var outlist = dtTel.Select(" CallType=1 and UserCode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "' ");
+                outcount[i] = outlist.Count();
+                //呼出接通量
+                var outconnectlist = dtTel.Select(" CallType=1 and CallState=1 and UserCode='" + dtUser.Rows[i]["F_UserCode"].ToString() + "' ");
+                outconnectcount[i] = outconnectlist.Count();
+            }
+            var obj = new
+            {
+                users,
+                incount,
+                inconnectcount,
+                outcount,
+                outconnectcount
+            };
+            return Success("获取坐席话务量", obj);
+        }
         public class Telephone
         {
             public List<Proportion> type;//诉求占比占比
@@ -114,6 +182,7 @@ namespace CallCenterApi.Interface.Controllers.report
             totalDate.traffic = 0;
             foreach (var it in CallRecords)
             {
+                if(it.LongTime!=null )
                 t +=(int ) it.LongTime;
                 if (it.CallState == 1)
                     totalDate.connection++;
@@ -503,7 +572,15 @@ namespace CallCenterApi.Interface.Controllers.report
                 time =DateTime .Parse ( datetime.ToString ());
             }
             Timeslot timeslot = GetTimeslot(time.Month );
-            int days = System.Threading.Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month-1);//获取天数
+            int days = 30;
+            if (time.Month ==1)
+            {
+                days = 31;
+            }
+            else
+            {
+                 days = System.Threading.Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month - 1);//获取天数
+            }
             DateTime lastmonth= time.AddMonths(-1);
             sql += " and F_CreateTime>='" + lastmonth.ToString ("yyyy-MM") +"-28" + " 00:00:00' ";
             sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-27" + " 23:59:59' ";

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

@@ -112,10 +112,10 @@ namespace CallCenterApi.Interface.Controllers.report
                 DataColumn dc1 = new DataColumn("月份", Type.GetType("System.String"));
                 DataColumn dc2 = new DataColumn(beginyear + "年客户呼叫数", Type.GetType("System.String"));
                 DataColumn dc3 = new DataColumn(beginyear + "年坐席接听数", Type.GetType("System.String"));
-                DataColumn dc4 = new DataColumn(beginyear + "年坐席接听率", Type.GetType("System.String"));
+                DataColumn dc4 = new DataColumn(beginyear + "年接听率", Type.GetType("System.String"));
                 DataColumn dc5 = new DataColumn(endyear + "年客户呼叫数", Type.GetType("System.String"));
                 DataColumn dc6 = new DataColumn(endyear + "年坐席接听数", Type.GetType("System.String"));
-                DataColumn dc7 = new DataColumn(endyear + "年坐席接听率", Type.GetType("System.String"));
+                DataColumn dc7 = new DataColumn(endyear + "年接听率", Type.GetType("System.String"));
 
                 dtNew.Columns.Add(dc1);
                 dtNew.Columns.Add(dc2);
@@ -139,10 +139,10 @@ namespace CallCenterApi.Interface.Controllers.report
                     drNew["月份"] = (i + 1).ToString() + "月";
                     drNew[beginyear + "年客户呼叫数"] = bkhcall[i];
                     drNew[beginyear + "年坐席接听数"] = bzxjt[i];
-                    drNew[beginyear + "年坐席接听率"] = bjtl[i];
+                    drNew[beginyear + "年接听率"] = bjtl[i];
                     drNew[endyear + "年客户呼叫数"] = ekhcall[i];
                     drNew[endyear + "年坐席接听数"] = ezxjt[i];
-                    drNew[endyear + "年坐席接听率"] = ejtl[i];
+                    drNew[endyear + "年接听率"] = ejtl[i];
                     dtNew.Rows.Add(drNew);
                 }
             }

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

@@ -74,7 +74,6 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             DataTable dtNew = new DataTable();
             #region
-            DataColumn dc1 = new DataColumn("部门");
             DataColumn dc2 = new DataColumn("坐席");
             DataColumn dc3 = new DataColumn("坐席工号");
             DataColumn dc4 = new DataColumn("呼入电话数");
@@ -99,7 +98,6 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc25 = new DataColumn("置忙平均休息分钟数");
            // DataColumn dc26 = new DataColumn("质检平均成绩");
 
-            dtNew.Columns.Add(dc1);
             dtNew.Columns.Add(dc2);
             dtNew.Columns.Add(dc3);
             dtNew.Columns.Add(dc4);

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

@@ -91,8 +91,8 @@ namespace CallCenterApi.Interface.Controllers.tel
         public ActionResult DelBlack()
         {
             
-            if (Request.IsAuthenticated)
-            {
+            //if (Request.IsAuthenticated)
+            //{
 
                 string tel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
                 Model.T_Call_Blacklist dModel = new BLL.T_Call_Blacklist().GetModelList(" F_TelPhone='" + tel + "' ").FirstOrDefault();
@@ -105,9 +105,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                         return Success("取消成功");
                     }
                 }
+                return Success("找不到此记录");
 
-            }
-            return NoToken("未知错误，请重新登录");
+            //  }
+            //  return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>

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

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                 if (strtelnum != null && strtelnum.Trim() != "")
                 {
-                    sql += " and F_TelPhone= '" + strtelnum.Trim() + "' ";
+                    sql += " and F_TelPhone like '%" + strtelnum.Trim() + "%'";
                 }
                 if (strsettime.Trim() != "" && strsettime != "undefined")
                 {

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

@@ -484,7 +484,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 }
 
                 dt = new BLL.T_Call_CallRecords().GetListExpt(sql).Tables[0];
-
+               
                 NPOIHelper npoi = new NPOIHelper();
                 if (npoi.ExportToExcel("通话记录数据", dt, col()) == "")
                 {
@@ -494,7 +494,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     return Error("导出失败");
                 }
-
+            //    Model.T_Call_CallRecords
             }
             return NoToken("未知错误，请重新登录");
         }
@@ -506,7 +506,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         private string[] col()
         {
             string[] ccc = {
-                   "客户姓名","来电单位","电话号码","录音","呼叫方向","处理方式","部门","呼叫状态","坐席工号","坐席姓名",
+                   "客户姓名","电话号码","录音","呼叫方向","处理方式","部门","呼叫状态","坐席工号","坐席姓名",
                   "开始时间","通话开始时间","通话结束时间","通话时长"
             };
             return ccc;

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

@@ -28,7 +28,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                 if (strtelnum != null && strtelnum.Trim() != "")
                 {
-                    sql += " and (F_MobileNum= '" + strtelnum.Trim() + "' or F_ZipCode like '%" + strtelnum.Trim()
+                    sql += " and (F_MobileNum  like '%" + strtelnum.Trim() + "%' or F_ZipCode like '%" + strtelnum.Trim()
                         + "%' or F_CityDes like '%" + strtelnum.Trim() + "%'or F_CardDes like '%" + strtelnum.Trim() + "%')";
                 }
 

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

@@ -193,6 +193,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 #endregion
                 string str = "";
+                string sql1 = "";
                 if (!string.IsNullOrEmpty(starttime))
                 {
                     str = DateTime.Parse(starttime).ToString("yyyy年MM月dd日") + "至" +
@@ -200,20 +201,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else if (istime == 0)
                 {
-                    sql +=  " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')<=0 ";
-                    sql += " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')>=0   ";
+                    sql1 +=  " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')<=0 ";
+                    sql1 += " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')>=0   ";
                     str = DateTime.Now.ToString("yyyy年MM月dd日") + "消费者重复投诉表";
                 }
                 else if (istime> 0 )
                 {
-                    sql +=  " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM")
+                    sql1 +=  " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM")
                       +  "-01"+ "')<=0 ";
-                    sql += " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')>=0   ";
+                    sql1 += " and datediff(day,F_CreateTime,'" + DateTime.Now.ToString("yyyy-MM-dd") + "')>=0   ";
                         str = DateTime.Now.ToString("yyyy年MM月") + "消费者重复投诉表";
                 }
+
+
+
                 if (isdc ==1)
                 {
-                    var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql);
+                    var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql+ sql1+ "order by F_Id desc");
                     #region 
                     dt.Columns.Add("序号");
                     dt.Columns.Add("姓名");
@@ -266,7 +270,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else  if (isdc == 2)
                 {
-                    var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql);
+                    var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql+ "order by F_Id desc");
                     #region 
                     dt.Columns.Add("工单编号");
                     dt.Columns.Add("大区");
@@ -322,7 +326,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["办事处"]  = "";
                             }
                         }
-                        drNew["投诉时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("dd日hh时mm分");//
+                        drNew["投诉时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("dd日HH时mm分");//
                         drNew["序号"] = it.F_SerialNumber;//
                         drNew["姓名"] = it.F_CusName;//姓名
                         drNew["地址"] = it.F_AddRess;//地址
@@ -336,7 +340,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         drNew["问题代码"] = it.F_ProblemCode;
                         drNew["质量问题"] = it.F_QualityProblem;
                         drNew["通知人"] = it.F_Notifications;
+                        if (!string .IsNullOrEmpty (it.F_Notifications))
+                        {
+                            var user = new BLL.T_Sys_UserAccount().GetModel(it.F_Notifications);
+                            if (user!=null )
+                            {
+                                drNew["通知人"] = user.F_UserName ;
+                            }
+                           
+                        }
                         drNew["接听人"] = it.F_ReceivingPerson;
+                        if (!string.IsNullOrEmpty(it.F_ReceivingPerson))
+                        {
+                            var user = new BLL.T_Sys_UserAccount().GetModel(it.F_ReceivingPerson);
+                            if (user != null)
+                            {
+                                drNew["接听人"] = user.F_UserName;
+                            }
+                        }
                         drNew["落实情况"] = it.F_DealResult;
                         if (it.F_State == 0)
                             drNew["处理进度"] = "待提交";
@@ -508,7 +529,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.F_OfficName = it.F_Office;
                     }
                 }
-                model.F_CreateTime = DateTime .Parse (it.F_CreateTime.ToString ()).ToString ("dd日hh时mm分")  ;//投诉时间
+                model.F_CreateTime = DateTime .Parse (it.F_CreateTime.ToString ()).ToString ("dd日HH时mm分")  ;//投诉时间
                 model.F_DealTimely = it.F_DealTimely;//重要级别
                 model.F_Reason = it.F_Reason;//重要级别原因
                 model.F_SerialNumber = it.F_SerialNumber;//序号
@@ -523,9 +544,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_Manufacturer = it.F_Manufacturer;//生产厂家
                 model.F_ProblemCode = it.F_ProblemCode;//问题代码
                 model.F_QualityProblem = it.F_QualityProblem;//质量问题
+
                 model.F_Notifications = it.F_Notifications;//通知人
+                if (!string .IsNullOrEmpty (it.F_Notifications))
+                {
+                    var user = new BLL.T_Sys_UserAccount().GetModel(it.F_Notifications);
+                    if (user !=null )
+                    {
+                        model.F_Notifications = user.F_UserName;
+                    }
+                }
                 model.F_ReceivingPerson = it.F_ReceivingPerson;//接听人
-          //      model.F_ImplementationSituation = it.F_ImplementationSituation;//落实情况
+                if (!string.IsNullOrEmpty(it.F_ReceivingPerson))
+                {
+                    var user = new BLL.T_Sys_UserAccount().GetModel(it.F_ReceivingPerson);
+                    if (user != null)
+                    {
+                        model.F_ReceivingPerson = user.F_UserName;
+                    }
+                }
+                //      model.F_ImplementationSituation = it.F_ImplementationSituation;//落实情况
                 model.F_State = it.F_State;//处理进度0待提交、1待查收、2待分派、3待接收、4处理中、10已完成
                 model.F_Duplicate = it.F_Duplicate;//重复工单0未重复1重复
                 model.F_Content = it.F_Content;//备注
@@ -538,6 +576,86 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             return Input;
         }
+        /// <summary>
+        /// 注解
+        /// </summary>
+        /// <param name="orderid"></param>
+        /// <param name="cont"></param>
+        /// <returns></returns>
+        public ActionResult Annotation(int orderid, string cont)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = userBLL .GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Bus_WorkOrder  model = workorderBLL .GetModel(orderid);
+                    //验证信息 
+                    if (model != null)
+                    {
+                        if (string.IsNullOrEmpty(model.F_Content))
+                        {
+                            model.F_Content = cont;
+                        }
+                        else
+                        {
+                            model.F_Content = model.F_Content + "。" + cont;
+                        }
+                        var res = workorderBLL.Update(model);
+                        if (res)
+                            return Success("备注成功");
+                        else
+                            return Error("备注失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
+        /// <summary>
+        /// 注解
+        /// </summary>
+        /// <param name="orderid"></param>
+        /// <param name="cont"></param>
+        /// <returns></returns>
+        public ActionResult Repeat(int orderid, int  isbj=0)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Bus_WorkOrder model = workorderBLL.GetModel(orderid);
+                  string   deptname = "";
+                    var dement = new BLL.T_Sys_Department().GetModel(ua.F_DeptId);
+                    if (dement!=null )
+                    {
+                        deptname = dement.F_DeptName;
+                    }
+                    //验证信息 
+                    if (model != null)
+                    {
+                        if (isbj==1)
+                        {
+                            model.F_Duplicate = 1;
+                        }
+                        var res = workorderBLL.Update(model);
+                        if (res)
+                        {
+                            AddLog(model.F_Id, (int)model.F_State , deptname + ua.F_UserName + "标记重复工单", 0, 0, "",0 ,ua,1);
+                            return Success("标记重复成功");
+                        }
+                          
+                        else
+                            return Error("标记重复失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
         private string RetuSql(Model.T_Sys_RoleInfo ro, int see, Model.T_Sys_UserAccount ua)
         {
             string sql = "";

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

@@ -554,7 +554,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.F_OfficName = it.F_Office;
                     }
                 }
-                model.F_CreateTime = model.F_CreateTime = DateTime.Parse(it.F_CreateTime.ToString()).ToString("dd日hh时mm分");//投诉时间
+                model.F_CreateTime = model.F_CreateTime = DateTime.Parse(it.F_CreateTime.ToString()).ToString("dd日HH时mm分");//投诉时间
                 model.F_DealTimely = it.F_DealTimely;//重要级别
                 model .F_Reason = it.F_Reason;//重要级别原因
                 model.F_SerialNumber = it.F_SerialNumber;//序号

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

@@ -66,7 +66,7 @@ namespace CallCenterApi.Interface
                 }
             }
         }
-        private void SendSMS(Model .T_Wo_WorkOrderItem_New modellast)
+        private bool  SendSMS(Model .T_Wo_WorkOrderItem_New modellast)
         {
             if (!string.IsNullOrEmpty(modellast.F_NextUser))
             {
@@ -77,13 +77,16 @@ namespace CallCenterApi.Interface
                     {
                         string msg = "你有新的工单，请及时处理";
                         Dictionary<string, string> paras = new Dictionary<string, string>();
-                        paras.Add("@tel", usercount.F_Mobile);
-                        paras.Add("@content", msg);
-                        paras.Add("@sort", "0");
+                        paras.Add("@JSHM", usercount.F_Mobile);
+                        paras.Add("@DXNR", msg);
+                        paras.Add("@Return", "0");
                         var par = RunProcedure("sp_SmsSend", paras, "sp_SmsSend");
+                        if (par != null)
+                            return true;
                     }
                 }
             }
+            return false;
         }
         public static string connectionString = ConfigurationManager.ConnectionStrings["connectionSMS"].ConnectionString;
         /// <summary>