问题修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ConversationController.cs

@@ -56,7 +56,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 if (strtel.Trim() != "" && strtel != "undefined")
                 {
-                    sql += " and F_Telephone=" + strtel;
+                    sql += " and F_Telephone like'%" + strtel+"%'";
                 }
                 if (department > 0)
                 {
@@ -180,7 +180,7 @@ namespace CallCenterApi.Interface.Controllers
             if (string.IsNullOrEmpty(input.F_Telephone))
                 return Error("电话不能为空！");
             if (getunphone(0, input.F_Telephone))
-                return Error("已存在该客户请勿重复添加");
+                return Error("电话重复请勿重复添加");
             if (input.F_Type<=0)
                 return Error("请选择电话类别");
             #endregion
@@ -218,10 +218,13 @@ namespace CallCenterApi.Interface.Controllers
                 return Error("参数错误！");
             if (string.IsNullOrEmpty(input.F_Telephone))
                 return Error("电话不能为空！");
+           
             if (input.F_Type <= 0)
                 return Error("请选择电话类别");
             #endregion
             var model = bll.GetModel(input.ID);
+            if (getunphone(0, input.F_Telephone) && input.F_Telephone != model.F_Telephone)
+                return Error("电话重复请勿重复添加");
             model.F_Type = input.F_Type;    //1内线2外线
             model.F_Department = model_Dep != null ? model_Dep.F_ParentId : input.F_Department;    //部门id
             model.F_Section = input.F_Section;    // 科室id

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -460,110 +460,30 @@ namespace CallCenterApi.Interface.Controllers
                     if (ua != null)
                     {
                         #region 权限限制    
-                        string sql = " and IsDel=0 ";
-                        ////部门信息
-                        //var modelDep = new BLL.T_Sys_Department().GetModel(deptid);
-                        //int depType = 0, depRegion = 0;
-                        //if (modelDep != null)
-                        //{
-                        //    depType = modelDep.F_Type ?? 0;  //部门操作权限：1接待部，2办理人员，3区域客服，4监管
-                        //    depRegion = modelDep.F_Header ?? 0; //部门权限范围：9全部，1区域，2项目，3期
-                        //}
-                        //if (ua.F_RoleId != 17)
-                        //{
-                        //    if (depType == 2)
-                        //    {
-                        //        if (depRegion == 1)
-                        //        {
-                        //            // 查看该区域工单
-                        //            //sql += $" and IsUserSend = (SELECT TOP 1 F_ParentId FROM dbo.T_Cus_RegionCategory WHERE F_RegionId = {userRegionId}) ";
-                        //            sql += $" and IsUserSend = {userRegionId} ";
-                        //        }
-                        //        else if (depRegion == 2)
-                        //        {
-                        //            // 查看该项目工单
-                        //            sql += $" and IsAdminSend = {userRegionId} ";
-                        //        }
-                        //    }
-                        //    else if (depType == 3)
-                        //    {
-                        //        if (depRegion == 1)
-                        //        {
-                        //            // 查看该区域工单
-                        //            //sql += $" and IsUserSend = (SELECT TOP 1 F_ParentId FROM dbo.T_Cus_RegionCategory WHERE F_RegionId = {userRegionId}) ";
-                        //            sql += $" and IsUserSend = {userRegionId} ";
-                        //        }
-                        //    }
-                        //    else if (depType == 4)
-                        //    {
-                        //        if (depRegion == 2)
-                        //        {
-                        //            // 查看该项目工单
-                        //            sql += $" and IsAdminSend = {userRegionId} ";
-                        //        }
-                        //        else if (depRegion == 9)
-                        //        {
-                        //            // 查看该部门工单（包括一级，二级）
-                        //            string deptCodeNew = String.Empty;
-                        //            int deptCodeIndex = 0;                                  //变量声明
-                        //            string deptCodeN = deptCode.TrimEnd('|');      //去掉最后一个|
-                        //            deptCodeIndex = deptCodeN.LastIndexOf("|");             //获得|的索引
-                        //            deptCodeNew = deptCodeN.Substring(0, deptCodeIndex + 1);    //获得目标字符串（//去掉最后一个|后面的字符串）
-                        //            //============== 部门权限条件 - 部门 ================
-                        //            string arrUser = " select F_UserCode from T_Sys_UserAccount where F_DeptCode LIKE '" + deptCodeNew + "%' ";
-                        //            sql += $" and WorkOrderID in (SELECT DISTINCT WorkOrderID FROM dbo.T_Wo_WorkOrderItem WHERE ToUser IN ({arrUser})) ";
-                        //        }
-                        //    }
-                        //}
+                        string sql = "  IsDelete=0 ";
+                      
                         #endregion
                         #region 工单各状态下数量
-                        BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
-                        WorkOrderController woController = new WorkOrderController();
+                        BLL.T_Wo_WorkOrderNew bll = new BLL.T_Wo_WorkOrderNew();
+                       
                         string uwhere = " 1=1  ";
-                        //1、待指派的
-                        if (ua.F_RoleId != 17)
+                        var modellist = bll.GetModelList(sql);
+                        int dcl=0, ycl = 0, zhcx = 0;
+                        foreach (var it in modellist)
                         {
-                            uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
-                            uwhere += " and State =" + (int)EnumWorkOrderState.neworder + " ";
-                            //uwhere += " and State =0 ";
+                            zhcx++;
+                            if (it.F_State == 10)
+                                ycl++;
+                            else
+                                dcl++;
                         }
-                        //2、待接单的
-                        string djdwhere = $" 1=1 and State =" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.ID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";//" 1=1 and State =1 and WorkOrderID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";
-                        //3、待完成（处理）的
-                        string dclwhere = $" 1=1 and State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and T_Wo_WorkOrder.ID in ( " + woController.GetDWCWorkOrderID(ua.F_UserCode) + ") ";//" 1=1 and State =1 and WorkOrderID in ( " + woController.GetDWCWorkOrderID(ua.F_UserCode) + ") ";
-                        //4、已处理的
-                        string yclwhere = $" 1=1 and State =" + (int)EnumWorkOrderState.finish + " and LastDealUser = '" + ua.F_UserCode + "' ";//" 1=1 and State =2 and LastDealUser = '" + ua.F_UserCode + "' ";
-                        //5、我参与的
-                        string wcywhere = $" 1=1 and (CreateUser= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.ID in ( " + woController.GetCYWorkOrderID(ua.F_UserCode) + ")) ";//" 1=1 and  (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( " + woController.GetCYWorkOrderID(ua.F_UserCode) + ")) ";
-                        //5、超期工单
-                        string cqwhere = $" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < " + (int)EnumWorkOrderState.finish + " ";//$" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < 2  ";
-                        //5、未审核微信工单
-                        string wxwhere = $" 1=1 ";  // ANd Type = (SELECT F_DictionaryValueId FROM dbo.T_Sys_DictionaryValue (NOLOCK) WHERE F_DictionaryFlag = 'GDLY' AND F_Name = '微信')
-                        #endregion
-
-                        #region 未处理开票数量
-                        var billcount = new BLL.T_Wo_Bill().GetRecordCount("F_IsDel=0 and F_DealBy='" + ua.F_UserCode+ "' and F_IsDeal="+ (int)EnumBillState.Received);
                         #endregion
 
                         var obj = new
                         {
-                            dpd = bll.GetList(uwhere + sql + " and State=" + (int)EnumWorkOrderState.neworder + " and IsAudit = 1 ").Tables[0].Rows.Count,                    //待指派的统计
-                            djd = bll.GetList(djdwhere + sql + " and State =" + (int)EnumWorkOrderState.assign + " and IsAudit = 1 ").Tables[0].Rows.Count,    //待接单的统计
-                            dcl = bll.GetList(dclwhere + sql + " and State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and IsAudit = 1 ").Tables[0].Rows.Count,    //待处理的统计
-                            ycl = bll.GetList(yclwhere + sql + " and State =" + (int)EnumWorkOrderState.finish + " and IsAudit = 1 ").Tables[0].Rows.Count,    //已处理的统计
-                            wyc = bll.GetList(wcywhere + sql + " and IsAudit = 1 ").Tables[0].Rows.Count,    //我参与的的统计
-                            cq = bll.GetList(cqwhere + sql + " AND State < " + (int)EnumWorkOrderState.finish + " and IsAudit = 1 ").Tables[0].Rows.Count,    //超期工单的统计
-                            wx = bll.GetList(wxwhere + sql + " and IsAudit = 0 ").Tables[0].Rows.Count,    //微信工单的统计
-                            billcount = billcount,//开票管理未处理数量
-                            //dpd = bll.GetList(uwhere + sql+ " and State=0 and IsAudit = 1 ").Tables[0].Rows.Count,                    //待指派的统计
-                            //djd = bll.GetList(djdwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待接单的统计
-                            //dcl = bll.GetList(dclwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待处理的统计
-                            //ycl = bll.GetList(yclwhere + sql + " and State =2 and IsAudit = 1 ").Tables[0].Rows.Count,    //已处理的统计
-                            //wyc = bll.GetList(wcywhere + sql + " and IsAudit = 1 ").Tables[0].Rows.Count,    //我参与的的统计
-                            //cq = bll.GetList(cqwhere + sql + " AND State < 2 and IsAudit = 1 ").Tables[0].Rows.Count,    //超期工单的统计
-                            //wx = bll.GetList(wxwhere + sql + " and IsAudit = 0 ").Tables[0].Rows.Count,    //微信工单的统计
-                            //djd = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and (state='0' and ','+ToUser+',' like '%," + ua.F_UserCode + ",%')  ").Select(p => p.WorkOrderID).Distinct().Count(),
-                            //dcl = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and (state='1' and SureUser='" + ua.F_UserCode + "')  ").Select(p => p.WorkOrderID).Distinct().Count()
+                            dcl,
+                            ycl,
+                            zhcx
                         };
                         res = Success("成功", obj);
                     }

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

@@ -315,22 +315,38 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取短信模板列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetTemplateList(string name, string keywords)
+        public ActionResult GetTemplateList(string name, string keywords,int page=1,int pagesize=5)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                string sql = $"  IsEnable=0";
+                DataTable dt = new DataTable();
+                string sql = $" and IsEnable=0";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and ( Detail like '%" + keywords.Trim() + "%'or Name like '%" + keywords.Trim() + "%' or MName like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(name))//
                     sql += $" and Name like '%" + name.Trim() + "%'";
-                var modellist = new BLL.T_SMS_Template().GetModelList(sql);
+                // var modellist = new BLL.T_SMS_Template().GetModelList(sql);
+               
+                int recordCount = 0;
+                dt = BLL.PagerBLL.GetListPager(
+                        "T_SMS_Template",
+                        "T_SMS_Template.ID",
+                        "*",
+                        sql,
+                       "ORDER BY T_SMS_Template.ID desc",
+                        pagesize,
+                        page,
+                        true,
+                        out recordCount);
+                List<Model.T_SMS_Template> modlelist = new BLL.T_SMS_Template().DataTableToList(dt);
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
-                    rows = modellist,
+                    rows = modlelist,
+                    total = recordCount
+
                 };
 
                 return Content(obj.ToJson());
@@ -537,7 +553,7 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult ExitTypelist(string name, string phone, string creatname, int SendWay=-1, int IsSend=-1)
         {
             DataTable dt = new DataTable();
-            string sql = $"  F_IsDelete=0";
+            string sql = $"   F_IsDelete=0";
             if (!string.IsNullOrEmpty(name))
             {
                 var model = new BLL.T_SMS_Template().GetModelList($"Name like '%" + name.Trim() + "%'").FirstOrDefault();
@@ -651,7 +667,7 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取短信记录列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetSMSList(string name, string phone, string creatname ,int SendWay=-1, int IsSend=-1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetSMSList(string name, string phone, string creatname ,int SendWay=-1, int IsSend=-1, int page = 1, int pagesize = 10)
         {
             DataTable dt = new DataTable();
             int userId = CurrentUser.UserData.F_UserId;
@@ -668,7 +684,7 @@ namespace CallCenterApi.Interface.Controllers
                     }
                 }
                 if (!string.IsNullOrEmpty(phone))
-                    sql += " and Telephone=" + phone;
+                    sql += " and Telephone like'%" + phone+"%'";
                 if (SendWay >= 0)
                     sql += " and SendWay=" + SendWay;
                 if (IsSend >= 0)
@@ -686,7 +702,7 @@ namespace CallCenterApi.Interface.Controllers
                         sql,
                         "ORDER BY T_SMS_List.ID desc",
                         pagesize,
-                        pageindex,
+                        page,
                         true,
                         out recordCount);
                 }
@@ -697,6 +713,7 @@ namespace CallCenterApi.Interface.Controllers
                     state = "success",
                     message = "成功",
                     rows = ModeltoSMSList( modlelist),
+                    total= recordCount
                 };
 
                 return Content(obj.ToJson());

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

@@ -67,7 +67,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 }
                 if (strtel.Trim() != "" && strtel != "undefined")
                 {
-                    sql += "and  F_LegalTel=" + strtel;
+                    sql += "and  F_LegalTel like'%" + strtel+"%'";
                 }
                 if (strpageindex.Trim() != "")
                 {

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/CallleaveController.cs

@@ -13,7 +13,7 @@ namespace CallCenterApi.Interface.Controllers.tel
     public class CallleaveController : BaseController
     {
         //获取留言列表
-        public ActionResult GetList(string strtelnum)
+        public ActionResult GetList(string strtelnum,string  tel)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
@@ -30,10 +30,13 @@ namespace CallCenterApi.Interface.Controllers.tel
                     int pageindex = 1;
                     string strpagesize = RequestString.GetQueryString("pagesize");
                     int pagesize = 10;
-
-                    if (strtelnum != null && strtelnum.Trim() != "")
+                if (tel != null && tel.Trim() != "")
+                {
+                    sql += " and F_Phone like '%" + tel.Trim() + "%' ";
+                }
+                if (strtelnum != null && strtelnum.Trim() != "")
                     {
-                        sql += " and F_Phone= '" + strtelnum.Trim() + "' ";
+                        sql += " and F_Phone like '%" + strtelnum.Trim() + "%' ";
                     }
                     if (strsettime.Trim() != "" && strsettime != "undefined")
                     {

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

@@ -37,6 +37,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     string workOrderID = RequestString.GetQueryString("workOrderID");
                     //客户电话
                     string customerTel = RequestString.GetQueryString("customerTel");
+
+                    //开始时间
+                    string starttime = RequestString.GetQueryString("starttime");
+                    //结束时间
+                    string endtime = RequestString.GetQueryString("endtime");
                     //关键字
                     string keyword = RequestString.GetQueryString("keyword");
                     string strpageindex = RequestString.GetQueryString("pageindex");
@@ -63,8 +68,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     if (customerTel.Trim() != "" && customerTel != "undefined")
                     {
-                        sql += "and  CustomerTel=" + customerTel;
+                        sql += "and  CustomerTel like'%" + customerTel+"%'";
                     }
+                    if (!string.IsNullOrEmpty(starttime))
+                        sql += " and datediff(day,CreateTime,'" + starttime + "')<=0 ";
+                    if (!string.IsNullOrEmpty(endtime))
+                        sql += " and datediff(day,CreateTime,'" + endtime + "')>=0   ";
                     if (strpageindex.Trim() != "")
                     {
                         pageindex = Convert.ToInt32(strpageindex);
@@ -330,13 +339,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             var opt = "处理";
-            model.F_State = (int)EnumWorkOrderState.finish;
+            model.F_State = 0;
+            model.IsOver = 0;
             if (isover == 1)
             {
                 opt = "处理";
                 model.DealBy = nowUser.F_UserCode;
                 model.DealTime = DateTime.Now;
-                model.F_State = 0;
+                model.IsOver = 1;
+                model.F_State = 10;
             }
             #region 读取当前登录人部门
             string deptname = "";
@@ -360,6 +371,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrEmpty(cont))
                     model.DealContents += cont + "；";
                 model.DealTime = DateTime.Now;
+               
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息
@@ -477,6 +489,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     model.Remarks = it.Remarks;
                     model.Problem = it.Problem;
+                    if (it.IsOver!=null )
+                    model.IsOver  = (int )it.IsOver;
                     model.DealContents = it.DealContents;
                     model.DealBy = it.DealBy;
                     model.DealTime = it.DealTime.ToString();