wenti

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AddressBookController.cs

@@ -268,13 +268,30 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 if (userModel.F_See == "5")
                     return Success("暂无记录");
-                Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
+              
                 DataTable dt = new DataTable();
                 string sql = "F_IsDelete=0 ";
                 if (!string.IsNullOrEmpty(keywords))
                 {
-                    sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
+                    var dept = new BLL.T_Sys_Department().GetModelList("F_DeptName like '%" + keywords + "%'").FirstOrDefault();
+
+                    if (dept != null)
+                    {
+                        if (dptid == 1)
+                            dptid = dept.F_DeptId;
+                        else
+                        {
+                            sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
+                        }
+
+                    }
+                    else
+                    {
+                        sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
+                    }
+                   
                 }
+                Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
                 if (dptid > 0)
                 {
 
@@ -305,13 +322,30 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 if (userModel.F_See == "5")
                     return Success("暂无记录");
-                Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
+             
                 DataTable dt = new DataTable();
                 string sql = "F_IsDelete=0 ";
                 if (!string.IsNullOrEmpty(keywords))
                 {
-                    sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
+                    var dept = new BLL.T_Sys_Department().GetModelList("F_DeptName like '%" + keywords + "%'").FirstOrDefault();
+
+                    if (dept != null)
+                    {
+                        if (dptid == 1)
+                            dptid = dept.F_DeptId;
+                        else
+                        {
+                            sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
+                        }
+
+                    }
+                    else
+                    {
+                        sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
+                    }
+                  
                 }
+                Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
                 if (dptid > 0)
                 {
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ApplicationsVersionController.cs

@@ -123,7 +123,7 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult GetAndroid(int type=0)
         {
             var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
-            var model = new BLL.T_Sys_ApplicationsVersion().GetModelList("F_IsDelete=0 and F_Type=0 order by F_ID DESC ").FirstOrDefault();
+            var model = new BLL.T_Sys_ApplicationsVersion().GetModelList("F_IsDelete=0 and F_Type="+ type + " order by F_ID DESC ").FirstOrDefault();
             if (model != null)
             {
                 ApplicationsVersion app = new ApplicationsVersion();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/CallOutOptController.cs

@@ -59,8 +59,9 @@ namespace CallCenterApi.Interface.Controllers
                     phone = fix + tophone,
                     fix = fix
                 };
-
-                return Success("外呼号码加前缀", obj);
+              
+              
+                return Success("外呼号码加前缀"+ phone, obj);
             }
             return NoToken("未知错误，请重新登录");
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -239,6 +239,31 @@ namespace CallCenterApi.Interface.Controllers
 
                     }
                 }
+                if (!string.IsNullOrWhiteSpace(filter.Key))
+                {
+                    var dept = new BLL.T_Sys_Department().GetModelList("F_DeptName like '%"+ filter.Key + "%'").FirstOrDefault();
+
+                      if (dept!=null )
+                    {
+                        if (filter.dptid == 1)
+                            filter.dptid = dept.F_DeptId;
+                        else
+                        {
+                            sql = "";
+                            string str = string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", filter.Key, filter.Key);
+                            sql += str;
+                        }
+
+                    }
+                        else
+                    {
+                        sql = "";
+                        string str = string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", filter.Key, filter.Key);
+                        sql += str;
+                    }
+                  
+                    
+                }
                 if (filter.dptid > 0)
                 {
                     Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(filter.dptid);
@@ -247,12 +272,7 @@ namespace CallCenterApi.Interface.Controllers
                         sql += " and F_DeptId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '%" + deptModel.F_DeptCode + "%') ";
                     }
                 }
-                if (!string.IsNullOrWhiteSpace(filter.Key))
-                {
-                    sql = "";
-                    string str = string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", filter.Key, filter.Key);
-                    sql += str;
-                }
+               
                 if (filter.type == 1)
                 {
                     sql += "and F_RoleId=52";
@@ -344,7 +364,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (userModel != null)
                 {
                     if (userModel.F_RoleId == 1 || userModel.F_RoleId == 4 || userModel.F_RoleId == 17
-                          || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49 || userModel.F_RoleId == 66)
+                          || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49 || userModel.F_RoleId == 66 || userModel.F_RoleId == 65)
                     {
                             if (filter.dptid == 0)
                             {

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

@@ -27,9 +27,13 @@ namespace CallCenterApi.Interface.Controllers.report
                 DataTable dtNew = new DataTable();
                 int userId = CurrentUser.UserData.F_UserId;
                 if (string.IsNullOrEmpty(stime))
-                    stime = DateTime.Now.ToString("yyyy-MM-dd");
+                    stime = DateTime.Now.ToString("yyyy-MM-dd")+ " 00:00:00";
+                else
+                    stime += " 00:00:00";
                 if (string.IsNullOrEmpty(endtime))
-                    endtime = DateTime.Now.ToString("yyyy-MM-dd");
+                    endtime = DateTime.Now.ToString("yyyy-MM-dd")+ " 23:59:59";
+                else
+                    endtime+= " 23:59:59";
 
                 //  int callConnectCount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallState=1").Length;
                 //   int callLossCount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallState=0 and dealtype=5").Length;
@@ -49,6 +53,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     sql += " and F_SeartGroupID = '" + userModel.F_SeartGroupID + "' ";
                 }
+
                 var CallState = new BLL.T_Call_CallRecords().GetModelList("begintime >= '" + stime + "' and begintime < '" + endtime + "' and CallState = 1");
                 var dealtype = new BLL.T_Call_CallRecords().GetModelList("begintime >= '" + stime + "' and begintime < '" + endtime + "' and CallState=0 and dealtype=5");
                 List<Model.T_Sys_UserAccount> userSeartList = new BLL.T_Sys_UserAccount().GetModelList(sql + " order by f_userid desc ");
@@ -86,8 +91,8 @@ namespace CallCenterApi.Interface.Controllers.report
                         int a = Connect[i] + Callloss[i];
                         if  (a>0)
                         {
-                            drNew["接通率"] = string.Format("{0}", Connect[i] / a);
-                            drNew["呼损率"] = string.Format("{0}", Callloss[i] / a);
+                            drNew["接通率"] = string.Format("{0:f2}%",(float ) Connect[i] / a*100);
+                            drNew["呼损率"] = string.Format("{0:f2}%", (float)Callloss[i] / a*100);
                         }
                         else
                         {

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

@@ -1518,33 +1518,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("工单已处理");
                             else  
                             {
-                                if (!string.IsNullOrEmpty(model.F_DealUser))
+                                var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID='" + model.F_Id + "'and F_IsUsed =0 order by F_Id desc").FirstOrDefault();
+                                if(modellist !=null )
                                 {
-                                    var user = new BLL.T_Sys_UserAccount().GetModel(model.F_DealUser);
-                                    string deptname = "";
-                                    var dement = new BLL.T_Sys_Department().GetModel(ua.F_DeptId);
-                                    if (dement != null)
+                                    if (!string.IsNullOrEmpty(modellist.F_NextUser ))
                                     {
-                                        deptname = dement.F_DeptName;
-                                    }
-                                    if (user != null)
-                                    {
-                                        if (!string .IsNullOrEmpty (user.F_Mobile))
+                                        var user = new BLL.T_Sys_UserAccount().GetModel(modellist.F_NextUser);
+                                        string deptname = "";
+                                        var dement = new BLL.T_Sys_Department().GetModel(ua.F_DeptId);
+                                        if (dement != null)
+                                        {
+                                            deptname = dement.F_DeptName;
+                                        }
+                                        if (user != null)
                                         {
-                                            bool n = new WorkTypeController().SendReminderSMS("工单催单提醒:",user.F_Mobile, cont);
-                                          //  string msg = new PushMessageController().Push(Title, count, user.F_UserCode);
-                                            if (n )
+                                            if (!string.IsNullOrEmpty(user.F_Mobile))
                                             {
-                                                AddLog(model.F_Id, (int)model.F_State, deptname + ua.F_UserName + "催单:" + cont, 12, 12, "", 0, ua, 1);
-                                                return Success ("催单成功");
+                                                bool n = new WorkTypeController().SendReminderSMS("工单催单提醒:", user.F_Mobile, cont);
+                                                //  string msg = new PushMessageController().Push(Title, count, user.F_UserCode);
+                                                if (n)
+                                                {
+                                                    model.F_DealType = 1;
+                                                    workorderBLL.Update(model);
+                                                    AddLog(model.F_Id, (int)model.F_State, deptname + ua.F_UserName + "催单:" + cont, 12, 12, "", 0, ua, 1);
+                                                    return Success("催单成功");
+                                                }
+                                                else
+                                                    return Error("短信发送失败");
                                             }
-                                            else
-                                                return Error("短信发送失败");
-                                        }
-                                        return Error("该处理人暂无手机号码");
+                                            return Error("该处理人暂无手机号码");
 
+                                        }
                                     }
                                 }
+                             
                                 else
                                     return Error("暂无处理人");
                             }

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

@@ -335,7 +335,7 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
-        public DateTime? F_ltemlastTime
+        public string  F_ltemlastTime
         {
             get; set;
         }

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -428,7 +428,7 @@ namespace CallCenterApi.Model
             get { return _f_remark; }
         }
         /// <summary>
-        /// 处理类型
+        /// 处理类型1催单
         /// </summary>
         public int? F_DealType
         {