上线提交

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Docking/DockingController.cs

@@ -20,7 +20,7 @@ namespace CallCenterApi.Interface.Controllers.Docking
         /// <returns></returns>
         public ActionResult SendGetCompanylist(string name,int pageno=1,int pagesize=100)
         {
-            string strURL = "http://222.143.48.99:82/api/acase-main/company/page?";
+            string strURL = "http://gxldzc.zzgx.gov.cn/api/acase-main/company/page?";
             strURL += "&current="+ pageno;
             strURL += "&size="+ pagesize;
             if (!string.IsNullOrWhiteSpace(name))
@@ -41,7 +41,7 @@ namespace CallCenterApi.Interface.Controllers.Docking
         /// <returns></returns>
         public ActionResult SendAddCompany(string name)
         {
-            string strURL = "http://222.143.48.99:82/api/acase-main/company/save";
+            string strURL = "http://gxldzc.zzgx.gov.cn/api/acase-main/company/save";
             var m = new {
                 id=0,//"id":"唯一标识",
                 linkman="",//"linkman":"联系人",

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RegRecords/RegRecordsCallOutController.cs

@@ -20,7 +20,7 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             int userid = CurrentUser.UserData.F_UserId;
             if (userid == 0)
                 return Error("用户信息获取失败，请重新登录");
-            string sql = string.Format(" and F_CreateBy =(select F_Mobile from T_Sys_UserAccount where  F_UserId={0})", userid);
+            string sql = string.Format(" and F_CreateBy =(select F_Mobile from T_Sys_UserAccount where  F_UserId={0} and F_RecCode<2)", userid);
             DataTable dt = new DataTable();
             int recordCount = 0;
 
@@ -159,6 +159,8 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
 
         }
 
+
+        //挂断电话
         public ActionResult Update2(string phone)
         {
             if (!Request.IsAuthenticated)
@@ -176,6 +178,9 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
 
 
         }
+
+
+
         public ActionResult Update0(string id)
         {
             if (!Request.IsAuthenticated)
@@ -194,6 +199,11 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
 
         }
 
+
+        /// <summary>
+        /// 此用户是否可以外呼  要有外呼的记录，并且没有正在外呼的记录
+        /// </summary>
+        /// <returns></returns>
         public ActionResult GetFlag()
         {
             if (!Request.IsAuthenticated)

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

@@ -565,7 +565,7 @@ namespace CallCenterApi.Interface.Controllers
                 var user = new BLL.T_Sys_UserAccount().GetModelList("F_UserName='" + input.Username + "' and F_Mobile='" + input.Mobile + "'");
                 if (user.Count >0)
                 {
-                    return Error("已存在该账号!");
+                    return Error("已存在该账号!【手机号用户名】");
                 }
                 if (!string.IsNullOrEmpty(input.Usercode))
                 {

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

@@ -128,10 +128,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                 string sql = "";
                 DataTable dt = new DataTable();
 
-                if (!string.IsNullOrEmpty(userModel.groupcode))
-                {
-                    sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
-                }
+                //if (!string.IsNullOrEmpty(userModel.groupcode))
+                //{
+                //    sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
+                //}
 
                 string keyword = HttpUtility.UrlDecode(RequestString.GetQueryString("keyword"));
                 if (keyword.Trim() != "" && keyword != "undefined")

ivr/IVR_SHJT.xml

@@ -12,7 +12,7 @@
 			recfile:留言的录音文件:%[CallID]_%[CallerID]_%[StartTime].wav
 			插入通话记录示例：exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,1,'' 
 		-->
-		<cell Name="CELL_SQL" Pos="2" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','' " 
+		<cell Name="CELL_SQL" Pos="2" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_GaoxinDistrict1;Data Source=192.168.8.3" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','' " 
 		IsSaved="no" SuccessPos="3" FailPos="3" Note="插入通话记录" />
 		<cell Name="CELL_DEFINEVAR" Pos="3" Next="4" Note="定义变量节点">
 			<DefVar VarType="1" VarName="AgentNo" VarVal="0" />
@@ -25,64 +25,64 @@
 			<DefVar VarType="1" VarName="zbdh" VarVal="0" />
 		</cell>
 		<!--黑名单-->
-		<cell Name="CELL_SQL" Pos="4" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr="exec P_GetBlacklist  '%[CallerID]','%[CallID]' " IsSaved="yes" SuccessPos="5" FailPos="5" Note="读取黑名单" />
+		<cell Name="CELL_SQL" Pos="4" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_GaoxinDistrict1;Data Source=192.168.8.3" SqlStr="exec P_GetBlacklist  '%[CallerID]','%[CallID]' " IsSaved="yes" SuccessPos="5" FailPos="5" Note="读取黑名单" />
 		<cell Name="CELL_RECORDSET" Pos="5" LPos="6" EPos="6" GPos="6" Note="取黑名单结果">
 			<Map Var="BlackListVerify" />
 		</cell>
-		<cell Name="CELL_COMPARE" Pos="6" Data1Type="2" Data2Type="1" Data3Type="1" Data1="BlackListVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="26" FalsePos="8" Note="判断黑名单" />
+		<cell Name="CELL_COMPARE" Pos="6" Data1Type="2" Data2Type="1" Data3Type="1" Data1="BlackListVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="26" FalsePos="12" Note="判断黑名单" />
 		<!--黑名单提示音-->
-		<cell Name="CELL_AUDIODTMF" Pos="26" PlayType="2" ContentType="1" Content="D:\Midware\wav\黑名单提示音.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
+		<cell Name="CELL_AUDIODTMF" Pos="26" PlayType="2" ContentType="1" Content="D:\wav\GXQ\黑名单提示音.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
 		TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="25" FailPos="24" HangupPos="24" Note="黑名单提示音" />
 		<!--黑名单提示音-->
 		<!--黑名单-->
 		
 		<!--欢迎词-->
-		<!-- <cell Name="CELL_AUDIODTMF" Pos="12" PlayType="2" ContentType="1" Content="D:\Midware\wav\欢迎词.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50"  TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="8" FailPos="24" HangupPos="24" Note="放欢迎词" /> -->
+		<cell Name="CELL_AUDIODTMF" Pos="12" PlayType="2" ContentType="1" Content="D:\wav\GXQ\欢迎词.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50"  TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="8" FailPos="24" HangupPos="24" Note="放欢迎词" />
 		<!--欢迎词-->
 		
 		<!--节假日-->
 		<!--判断是否加班或节假日，是放节假日音后挂机，否转坐席-->
-		<cell Name="CELL_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr="exec P_GetHolidays" IsSaved="yes" SuccessPos="9" FailPos="603" Note="节假日查询" />
+		<cell Name="CELL_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_GaoxinDistrict1;Data Source=192.168.8.3" SqlStr="exec P_GetHolidays" IsSaved="yes" SuccessPos="9" FailPos="603" Note="节假日查询" />
 		<cell Name="CELL_RECORDSET" Pos="9" LPos="10" EPos="10" GPos="10" Note="取节假日结果">
 			<Map Var="HolidayVerify" />
 		</cell>
-		<cell Name="CELL_COMPARE" Pos="10" Data1Type="2" Data2Type="1" Data3Type="1" Data1="HolidayVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="603" FalsePos="29" Note="判断节假日" />
-		<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="2" ContentType="1" Content="D:\Midware\wav\假期提示音.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
+		<cell Name="CELL_COMPARE" Pos="10" Data1Type="2" Data2Type="1" Data3Type="1" Data1="HolidayVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="603" FalsePos="11" Note="判断节假日" />
+		<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="2" ContentType="1" Content="D:\wav\GXQ\下班欢迎词.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
 		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="24" FailPos="24" HangupPos="24" Note="放节假日音" />
 		<!--节假日-->
 		
 		
 		<!--排队，转坐席-->
-		<cell Name="CELL_SQL" Pos="603" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr="exec P_GetSeatGroup '%[CallerID]','%[CalleeID]'" 
+		<cell Name="CELL_SQL" Pos="603" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_GaoxinDistrict1;Data Source=192.168.8.3" SqlStr="exec P_GetSeatGroup '%[CallerID]','%[CalleeID]'" 
 		IsSaved="yes" SuccessPos="604" FailPos="24" Note="获取坐席组ID" />
 		<cell Name="CELL_RECORDSET" Pos="604" LPos="501" EPos="501" GPos="501" Note="获取坐席组ID结果">
 			<Map Var="GroupID" />
 		</cell>
 		
-		<cell Name="CELL_SQL" Pos="501" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr=" exec P_OptCallRecords '%[CallerID]','%[CallID]',3,%[KeyGroup],'0','' " IsSaved="no" SuccessPos="13" FailPos="13" Note="更新排队开始时间" />
+		<cell Name="CELL_SQL" Pos="501" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_GaoxinDistrict1;Data Source=192.168.8.3" SqlStr=" exec P_OptCallRecords '%[CallerID]','%[CallID]',3,%[KeyGroup],'0','' " IsSaved="no" SuccessPos="13" FailPos="13" Note="更新排队开始时间" />
 		<!--坐席排队时，没有登录坐席直接转值班电话，无空闲坐席转坐席全忙放音，有空闲坐席继续播报-->
 		<!--Strategy：座席分配策略，1循环接听、2最大空闲接听、3最少接听接听、4指定坐席接听，指定多座席时，坐席工号之间用‘|’分隔，坐席数不要超过4个。-->
 		<cell Name="CELL_QUEUE" Pos="13" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
-		NoAgentPos="14" NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点" />
+		NoAgentPos="14" NoFreePos="14" SuccessPos="18" HangupPos="24" Note="排队节点" />
 		
-		<cell Name="CELL_AUDIODTMF" Pos="14" PlayType="1" ContentType="1" Content="D:\Midware\wav\坐席全忙.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
+		<cell Name="CELL_AUDIODTMF" Pos="14" PlayType="1" ContentType="1" Content="D:\wav\GXQ\坐席全忙.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
 		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="Key" SuccessPos="15" FailPos="24" HangupPos="24" Note="坐席全忙放音" />
 		<cell Name="CELL_BRANCH" Pos="15" Var="Key" DefaultPos="14" Note="分支节点">
 			<Branch Value="1" Pos="16" /><!--1.继续等待-->
 		</cell>		
-		<cell Name="CELL_CONTINUEQUEUE" Pos="16" Agent="AgentNo" Exten="AgentExtNo" Audio="D:\Midware\wav\保持音.wav" Timeout="60" SuccessPos="18" HangupPos="24" TimeoutPos="14" Note="继续排队节点" />
+		<cell Name="CELL_CONTINUEQUEUE" Pos="16" Agent="AgentNo" Exten="AgentExtNo" Audio="D:\wav\GXQ\保持音.wav" Timeout="60" SuccessPos="18" HangupPos="24" TimeoutPos="14" Note="继续排队节点" />
 		<cell Name="CELL_CANCELQUEUE" Pos="17" Reason="等烦了" Next="24" Note="放弃排队节点" />		
-		<cell Name="CELL_AUDIODTMF" Pos="18" PlayType="2" ContentType="1" Content="D:\Midware\wav\通话录音提示音.wav" TTSNumMode="1" 
-		TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="31" FailPos="24" HangupPos="24" Note="转接电话提示录音" />
-		<cell Name="CELL_AUDIODTMF" Pos="31" PlayType="2" ContentType="2" Content=" `vs40 您好, `dig`vs30 %[AgentNo] `vs50 号客服为您服务." TTSNumMode="1" TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="19" FailPos="24" HangupPos="24" Note="播报工号" />
+		<cell Name="CELL_AUDIODTMF" Pos="18" PlayType="2" ContentType="1" Content="D:\wav\GXQ\通话录音提示音.wav" TTSNumMode="1" 
+		TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="19" FailPos="24" HangupPos="24" Note="转接电话提示录音" />
+		<cell Name="CELL_AUDIODTMF" Pos="31" PlayType="2" ContentType="1" Content="" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="19" FailPos="24" HangupPos="24" Note="播报工号" />
 		<cell Name="CELL_TURNAGENT" Pos="19" Exten="AgentExtNo" SuccessPos="25" FailPos="17" HangupPos="24" Note="转座席节点">
 		  <BandData Var="CallID" />
 		</cell>
 		<!--排队，转坐席-->
 				
 		<!--转值班电话-->
-		<cell Name="CELL_AUDIODTMF" Pos="29" PlayType="2" ContentType="1" Content="D:\Midware\wav\转值班电话提示.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="701" FailPos="24" HangupPos="24" Note="转值班电话提示音" />
-		<cell Name="CELL_SQL" Pos="701" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr="EXEC P_GetZBDH " IsSaved="yes" SuccessPos="702" FailPos="24" Note="获取值班电话" />
+		<cell Name="CELL_AUDIODTMF" Pos="29" PlayType="2" ContentType="1" Content="D:\wav\GXQ\转值班电话提示.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="701" FailPos="24" HangupPos="24" Note="转值班电话提示音" />
+		<cell Name="CELL_SQL" Pos="701" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_GaoxinDistrict1;Data Source=192.168.8.3" SqlStr="EXEC P_GetZBDH " IsSaved="yes" SuccessPos="702" FailPos="24" Note="获取值班电话" />
 		<cell Name="CELL_RECORDSET" Pos="702" LPos="30" EPos="30" GPos="30" Note="获取值班电话结果">
 			<Map Var="zbdh" />
 		</cell>
@@ -90,7 +90,7 @@
 		<!--转值班电话-->
 		
 		<!---->
-		<cell Name="CELL_SQL" Pos="24" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr=" exec P_OptCallRecords '%[CallerID]','%[CallID]',2,0,'0','' " IsSaved="no" 
+		<cell Name="CELL_SQL" Pos="24" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_GaoxinDistrict1;Data Source=192.168.8.3" SqlStr=" exec P_OptCallRecords '%[CallerID]','%[CallID]',2,0,'0','' " IsSaved="no" 
 		SuccessPos="204" FailPos="25" Note="更新挂机时间" />
 		<cell Name="CELL_HANGUP" Pos="204" Next="25" Note="挂机节点" />
 		<cell Name="CELL_END" Pos="25" Note="结束节点" />	

ivr/MYD_Normal.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ivr>
-	<flow Name="MYD" Type="normal" MatchedNum="" MatchedLine="" Concurrency="1">
-		<cell Name="CELL_START" Pos="1" Next="2" Note="满意度开始节点" />
-		<cell Name="CELL_DEFINEVAR" Pos="2" Next="3" Note="定义变量节点">
-			<DefVar VarType="1" VarName="Key" VarVal="0" />
-		</cell>
-		<cell Name="CELL_AUDIODTMF" Pos="3" PlayType="1" ContentType="1" Content="D:\Midware\wav\满意度评价开始.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
-		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="Key" SuccessPos="4" FailPos="19" HangupPos="19" Note="满意度调查放音" />
-		<cell Name="CELL_SQL" Pos="4" ConnStr="Provider=SQLOLEDB.1;Password=800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;Data Source=192.168.4.18" SqlStr="exec P_OptCallRecords '','%[CallID]',5,0,'%[Key]','',''" IsSaved="no" SuccessPos="5" FailPos="5" Note="满意度更新通话记录" />
-		<cell Name="CELL_AUDIODTMF" Pos="5" PlayType="2" ContentType="1" Content="D:\Midware\wav\评价结束.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
-		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="0" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="19" FailPos="19" HangupPos="19" Note="满意度放结束音" />
-		<cell Name="CELL_HANGUP" Pos="19" Next="20" Note="满意度挂机节点" />
-		<cell Name="CELL_END" Pos="20" Note="满意度结束节点" />
-  </flow>		
-</ivr>