首页数据修改，报表，坐席工作报表，appp管理，

IVR_Auto.xml

@@ -13,13 +13,13 @@
 			groupcode:坐席组编号
 			插入通话记录示例：exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,1,'','KFZ' 
 		-->
-		<cell Name="CELL_BRANCH" Pos="2" Var="CalleeID" DefaultPos="2" Note="首次分支分支节点">
-			<Branch Value="8001" Pos="201" /><!--客服组正常流程：黑名单-节假日-坐席排队-->
-			<Branch Value="6800" Pos="202" /><!--市场组直接转坐席-->
+		<!--<cell Name="CELL_BRANCH" Pos="2" Var="CalleeID" DefaultPos="2" Note="首次分支分支节点"> -->
+			<!--<Branch Value="8001" Pos="201" />--><!--客服组正常流程：黑名单-节假日-坐席排队-->
+			<!--<Branch Value="6800" Pos="202" />--><!--市场组直接转坐席-->
 		</cell>
-		<cell Name="CELL_SQL" Pos="201" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','KFZ' " 
+		<cell Name="CELL_SQL" Pos="201" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','KFZ' " 
 		IsSaved="no" SuccessPos="3" FailPos="3" Note="插入通话记录-客服组" />
-		<cell Name="CELL_SQL" Pos="202" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','SCZ' " 
+		<cell Name="CELL_SQL" Pos="202" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','SCZ' " 
 		IsSaved="no" SuccessPos="3" FailPos="3" Note="插入通话记录-市场组" />
 		<cell Name="CELL_DEFINEVAR" Pos="3" Next="4" Note="定义变量节点">
 			<DefVar VarType="1" VarName="AgentNo" VarVal="0" />
@@ -31,12 +31,9 @@
 			<DefVar VarType="1" VarName="HolidayVerify" VarVal="0" />
 			<DefVar VarType="1" VarName="zbdh" VarVal="0" />
 		</cell>
-		<cell Name="CELL_BRANCH" Pos="4" Var="CalleeID" DefaultPos="1010" Note="流程不同分支节点">
-			<Branch Value="8001" Pos="104" /><!--客服组正常流程：黑名单-节假日-坐席排队-->
-			<Branch Value="6800" Pos="603" /><!--市场组直接转坐席--> 
-		</cell>
+		
 		<!--黑名单-->
-		<cell Name="CELL_SQL" Pos="104" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_GetBlacklist  '%[CallerID]','%[CallID]' " IsSaved="yes" SuccessPos="5" FailPos="5" Note="读取黑名单" />
+		<cell Name="CELL_SQL" Pos="4" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" 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>
@@ -48,28 +45,28 @@
 		<!--黑名单-->
 		
 		<!--欢迎词-->
-		<!-- <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="E:\VS2019_Bin\Middle_shanghui\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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_GetHolidays" IsSaved="yes" SuccessPos="9" FailPos="603" Note="节假日查询" />
+		<cell Name="CELL_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" 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_COMPARE" Pos="10" Data1Type="2" Data2Type="1" Data3Type="1" Data1="HolidayVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="603"  Note="判断节假日" />
 		<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="2" ContentType="1" Content="D:\Midware\wav\假期提示音.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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_GetSeatGroup '%[CallerID]','%[CalleeID]'" 
+		<cell Name="CELL_SQL" Pos="603" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" 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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" 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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" 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_BRANCH" Pos="13" Var="CalleeID" DefaultPos="1013" Note="排队分支节点">
@@ -78,9 +75,9 @@
 		</cell>
 		
 		<cell Name="CELL_QUEUE" Pos="1013" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
-		NoAgentPos="29" NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点" />
+		 NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点" />
 		<cell Name="CELL_QUEUE" Pos="1014" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
-		NoAgentPos="29" NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点-sc" />
+		 NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点-sc" />
 		<cell Name="CELL_AUDIODTMF" Pos="1015" PlayType="2" ContentType="1" Content="D:\Midware\wav\嘟嘟无人接听.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="24" FailPos="24" HangupPos="24" Note="放节假日音-sc" />
 		
 		<cell Name="CELL_AUDIODTMF" Pos="14" PlayType="1" ContentType="1" Content="D:\Midware\wav\坐席全忙.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
@@ -97,23 +94,10 @@
 		  <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_BRANCH" Pos="701" Var="CalleeID" DefaultPos="1013" Note="排队分支节点">
-			<Branch Value="8001" Pos="7011" /><!--客服组-->
-			<Branch Value="6800" Pos="7012" /><!--市场组-->
-		</cell>
-		<cell Name="CELL_SQL" Pos="7011" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="EXEC P_GetZBDH '%[CallID]',0 " IsSaved="yes" SuccessPos="702" FailPos="24" Note="获取值班电话-客服组" />
-		<cell Name="CELL_SQL" Pos="7012" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="EXEC P_GetZBDH '%[CallID]',1 " IsSaved="yes" SuccessPos="702" FailPos="24" Note="获取值班电话-市场组" />
-		<cell Name="CELL_RECORDSET" Pos="702" LPos="30" EPos="30" GPos="30" Note="获取值班电话结果">
-			<Map Var="zbdh" />
-		</cell>
-		<cell Name="CELL_TRANSFEROUT" Pos="30" CalleeNumType="2" CalleeNum="zbdh" Timeout="60" SuccessPos="25" FailPos="24" Note="转值班电话" />
-		<!--转值班电话-->
+		
 		
 		<!---->
-		<cell Name="CELL_SQL" Pos="24" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr=" exec P_OptCallRecords '%[CallerID]','%[CallID]',2,0,'0','','' " IsSaved="no" 
+		<cell Name="CELL_SQL" Pos="24" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" 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_Auto.xml.bak

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ivr>
+	<flow Name="IVR_Auto" Type="normal" MatchedNum="." MatchedLine="|-1|" Concurrency="1">
+		<cell Name="CELL_START" Pos="1" Next="2" Note="开始节点" />
+		<!--
+			exec P_OptCallRecords 'tel','callid',type,bustype,mydkey,'recfile'
+			tel:来电号码%[CallerID]
+			callid:中间件定义%[CallID]
+			typD:执行类型：1.插入通话记录；2.更新挂机时间；3.更新排队开始时间；4.插入留言；5.更新满意度
+			bustypD:业务选择，用于需要有按键选择业务按键值
+			mydkey:满意度按键值，1满意，2一般，3不满意
+			recfilD:留言的录音文件:%[CallID]_%[CallerID]_%[StartTime].wav
+			groupcode:坐席组编号
+			插入通话记录示例：exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,1,'','KFZ' 
+		-->
+		<!--<cell Name="CELL_BRANCH" Pos="2" Var="CalleeID" DefaultPos="2" Note="首次分支分支节点"> -->
+			<!--<Branch Value="8001" Pos="201" />--><!--客服组正常流程：黑名单-节假日-坐席排队-->
+			<!--<Branch Value="6800" Pos="202" />--><!--市场组直接转坐席-->
+		</cell>
+		<cell Name="CELL_SQL" Pos="201" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','KFZ' " 
+		IsSaved="no" SuccessPos="3" FailPos="3" Note="插入通话记录-客服组" />
+		<cell Name="CELL_SQL" Pos="202" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','SCZ' " 
+		IsSaved="no" SuccessPos="3" FailPos="3" Note="插入通话记录-市场组" />
+		<cell Name="CELL_DEFINEVAR" Pos="3" Next="4" Note="定义变量节点">
+			<DefVar VarType="1" VarName="AgentNo" VarVal="0" />
+			<DefVar VarType="1" VarName="AgentExtNo" VarVal="0" />
+			<DefVar VarType="1" VarName="KeyGroup" VarVal="0" /><!--坐席组按键值-->
+			<DefVar VarType="1" VarName="GroupID" VarVal="0" /><!--通过坐席组按键值 获取相应的坐席组ID-->
+			<DefVar VarType="1" VarName="Key" VarVal="0" />
+			<DefVar VarType="1" VarName="BlackListVerify" VarVal="0" />
+			<DefVar VarType="1" VarName="HolidayVerify" VarVal="0" />
+			<DefVar VarType="1" VarName="zbdh" VarVal="0" />
+		</cell>
+		
+		<!--黑名单-->
+		<cell Name="CELL_SQL" Pos="4" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" 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_AUDIODTMF" Pos="26" PlayType="2" ContentType="1" Content="D:\Midware\wav\黑名单提示音.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_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" 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"  Note="判断节假日" />
+		<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="2" ContentType="1" Content="D:\Midware\wav\假期提示音.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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" 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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" 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_BRANCH" Pos="13" Var="CalleeID" DefaultPos="1013" Note="排队分支节点">
+			<Branch Value="8001" Pos="1013" /><!--客服组-->
+			<Branch Value="6800" Pos="1014" /><!--市场组-->
+		</cell>
+		
+		<cell Name="CELL_QUEUE" Pos="1013" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
+		 NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点" />
+		<cell Name="CELL_QUEUE" Pos="1014" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
+		 NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点-sc" />
+		<cell Name="CELL_AUDIODTMF" Pos="1015" PlayType="2" ContentType="1" Content="D:\Midware\wav\嘟嘟无人接听.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="24" FailPos="24" HangupPos="24" Note="放节假日音-sc" />
+		
+		<cell Name="CELL_AUDIODTMF" Pos="14" 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="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_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_TURNAGENT" Pos="19" Exten="AgentExtNo" SuccessPos="25" FailPos="17" HangupPos="24" Note="转座席节点">
+		  <BandData Var="CallID" />
+		</cell>
+		<!--排队，转坐席-->
+		
+		
+		<!---->
+		<cell Name="CELL_SQL" Pos="24" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" 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="结束节点" />	
+		<!---->
+	</flow>		
+</ivr>

codegit/CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -83,6 +83,7 @@
     <Compile Include="T_SMS_SentSMS.cs" />
     <Compile Include="T_SMS_Template.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
+    <Compile Include="T_Sys_ApplicationsVersion.cs" />
     <Compile Include="T_Sys_Area.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_ApplicationsVersion.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_Sys_ApplicationsVersion
+    /// </summary>
+    public partial class T_Sys_ApplicationsVersion
+    {
+        private readonly DAL.T_Sys_ApplicationsVersion dal = new DAL.T_Sys_ApplicationsVersion();
+        public T_Sys_ApplicationsVersion()
+        { }
+        #region  BasicMethod
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(Model.T_Sys_ApplicationsVersion model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(Model.T_Sys_ApplicationsVersion model)
+        {
+            return dal.Update(model);
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_ID)
+        {
+
+            return dal.Delete(F_ID);
+        }
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool DeleteList(string F_IDlist)
+        {
+            return dal.DeleteList(F_IDlist);
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_ApplicationsVersion GetModel(int F_ID)
+        {
+
+            return dal.GetModel(F_ID);
+        }
+
+  
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            return dal.GetList(strWhere);
+        }
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            return dal.GetList(Top, strWhere, filedOrder);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<Model.T_Sys_ApplicationsVersion> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<Model.T_Sys_ApplicationsVersion> DataTableToList(DataTable dt)
+        {
+            List<Model.T_Sys_ApplicationsVersion> modelList = new List<Model.T_Sys_ApplicationsVersion>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                Model.T_Sys_ApplicationsVersion model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = dal.DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetAllList()
+        {
+            return GetList("");
+        }
+
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            return dal.GetRecordCount(strWhere);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        //public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+        //{
+        //return dal.GetList(PageSize,PageIndex,strWhere);
+        //}
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}
+

codegit/CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -83,6 +83,7 @@
     <Compile Include="T_SMS_SentSMS.cs" />
     <Compile Include="T_SMS_Template.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
+    <Compile Include="T_Sys_ApplicationsVersion.cs" />
     <Compile Include="T_Sys_Area.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_ApplicationsVersion.cs

@@ -0,0 +1,383 @@
+using System;
+using System.Data;
+using System.Text;
+using System.Data.SqlClient;
+using CallCenterApi.DB;
+namespace CallCenterApi.DAL
+{
+    /// <summary>
+    /// 数据访问类:T_Sys_ApplicationsVersion
+    /// </summary>
+    public partial class T_Sys_ApplicationsVersion
+    {
+        public T_Sys_ApplicationsVersion()
+        { }
+        #region  BasicMethod
+
+
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(Model.T_Sys_ApplicationsVersion model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_Sys_ApplicationsVersion(");
+            strSql.Append("F_Type,F_VersionName,F_VersionCode,F_Files,F_Url,F_CreateUser,F_CreateTime,F_UpdateUser,F_UpdateTime,F_IsDelete,F_DeleteTime,F_Sort,F_Remarks)");
+            strSql.Append(" values (");
+            strSql.Append("@F_Type,@F_VersionName,@F_VersionCode,@F_Files,@F_Url,@F_CreateUser,@F_CreateTime,@F_UpdateUser,@F_UpdateTime,@F_IsDelete,@F_DeleteTime,@F_Sort,@F_Remarks)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Type", SqlDbType.BigInt,8),
+                    new SqlParameter("@F_VersionName", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_VersionCode", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Files", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Url", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_CreateUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_UpdateUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                    new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Sort", SqlDbType.Int,4),
+                    new SqlParameter("@F_Remarks", SqlDbType.NVarChar,50)};
+            parameters[0].Value = model.F_Type;
+            parameters[1].Value = model.F_VersionName;
+            parameters[2].Value = model.F_VersionCode;
+            parameters[3].Value = model.F_Files;
+            parameters[4].Value = model.F_Url;
+            parameters[5].Value = model.F_CreateUser;
+            parameters[6].Value = model.F_CreateTime;
+            parameters[7].Value = model.F_UpdateUser;
+            parameters[8].Value = model.F_UpdateTime;
+            parameters[9].Value = model.F_IsDelete;
+            parameters[10].Value = model.F_DeleteTime;
+            parameters[11].Value = model.F_Sort;
+            parameters[12].Value = model.F_Remarks;
+
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(Model.T_Sys_ApplicationsVersion model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Sys_ApplicationsVersion set ");
+            strSql.Append("F_Type=@F_Type,");
+            strSql.Append("F_VersionName=@F_VersionName,");
+            strSql.Append("F_VersionCode=@F_VersionCode,");
+            strSql.Append("F_Files=@F_Files,");
+            strSql.Append("F_Url=@F_Url,");
+            strSql.Append("F_CreateUser=@F_CreateUser,");
+            strSql.Append("F_CreateTime=@F_CreateTime,");
+            strSql.Append("F_UpdateUser=@F_UpdateUser,");
+            strSql.Append("F_UpdateTime=@F_UpdateTime,");
+            strSql.Append("F_IsDelete=@F_IsDelete,");
+            strSql.Append("F_DeleteTime=@F_DeleteTime,");
+            strSql.Append("F_Sort=@F_Sort,");
+            strSql.Append("F_Remarks=@F_Remarks");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Type", SqlDbType.BigInt,8),
+                    new SqlParameter("@F_VersionName", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_VersionCode", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Files", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_Url", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_CreateUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_UpdateUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                    new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Sort", SqlDbType.Int,4),
+                    new SqlParameter("@F_Remarks", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_Type;
+            parameters[1].Value = model.F_VersionName;
+            parameters[2].Value = model.F_VersionCode;
+            parameters[3].Value = model.F_Files;
+            parameters[4].Value = model.F_Url;
+            parameters[5].Value = model.F_CreateUser;
+            parameters[6].Value = model.F_CreateTime;
+            parameters[7].Value = model.F_UpdateUser;
+            parameters[8].Value = model.F_UpdateTime;
+            parameters[9].Value = model.F_IsDelete;
+            parameters[10].Value = model.F_DeleteTime;
+            parameters[11].Value = model.F_Sort;
+            parameters[12].Value = model.F_Remarks;
+            parameters[13].Value = model.F_ID;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_ID)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Sys_ApplicationsVersion ");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_ID;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// 批量删除数据
+        /// </summary>
+        public bool DeleteList(string F_IDlist)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("UPDATE  T_Sys_ApplicationsVersion  set F_IsDelete=1");
+            strSql.Append(" where F_ID in (" + F_IDlist + ")  ");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_ApplicationsVersion GetModel(int F_ID)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_ID,F_Type,F_VersionName,F_VersionCode,F_Files,F_Url,F_CreateUser,F_CreateTime,F_UpdateUser,F_UpdateTime,F_IsDelete,F_DeleteTime,F_Sort,F_Remarks from T_Sys_ApplicationsVersion ");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_ID;
+
+            Model.T_Sys_ApplicationsVersion model = new Model.T_Sys_ApplicationsVersion();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_ApplicationsVersion DataRowToModel(DataRow row)
+        {
+            Model.T_Sys_ApplicationsVersion model = new Model.T_Sys_ApplicationsVersion();
+            if (row != null)
+            {
+                if (row["F_ID"] != null && row["F_ID"].ToString() != "")
+                {
+                    model.F_ID = int.Parse(row["F_ID"].ToString());
+                }
+                if (row["F_Type"] != null && row["F_Type"].ToString() != "")
+                {
+                    model.F_Type = long.Parse(row["F_Type"].ToString());
+                }
+                if (row["F_VersionName"] != null)
+                {
+                    model.F_VersionName = row["F_VersionName"].ToString();
+                }
+                if (row["F_VersionCode"] != null)
+                {
+                    model.F_VersionCode = row["F_VersionCode"].ToString();
+                }
+                if (row["F_Files"] != null)
+                {
+                    model.F_Files = row["F_Files"].ToString();
+                }
+                if (row["F_Url"] != null)
+                {
+                    model.F_Url = row["F_Url"].ToString();
+                }
+                if (row["F_CreateUser"] != null)
+                {
+                    model.F_CreateUser = row["F_CreateUser"].ToString();
+                }
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
+                {
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
+                }
+                if (row["F_UpdateUser"] != null)
+                {
+                    model.F_UpdateUser = row["F_UpdateUser"].ToString();
+                }
+                if (row["F_UpdateTime"] != null && row["F_UpdateTime"].ToString() != "")
+                {
+                    model.F_UpdateTime = DateTime.Parse(row["F_UpdateTime"].ToString());
+                }
+                if (row["F_IsDelete"] != null && row["F_IsDelete"].ToString() != "")
+                {
+                    model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
+                }
+                if (row["F_DeleteTime"] != null && row["F_DeleteTime"].ToString() != "")
+                {
+                    model.F_DeleteTime = DateTime.Parse(row["F_DeleteTime"].ToString());
+                }
+                if (row["F_Sort"] != null && row["F_Sort"].ToString() != "")
+                {
+                    model.F_Sort = int.Parse(row["F_Sort"].ToString());
+                }
+                if (row["F_Remarks"] != null)
+                {
+                    model.F_Remarks = row["F_Remarks"].ToString();
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_ID,F_Type,F_VersionName,F_VersionCode,F_Files,F_Url,F_CreateUser,F_CreateTime,F_UpdateUser,F_UpdateTime,F_IsDelete,F_DeleteTime,F_Sort,F_Remarks ");
+            strSql.Append(" FROM T_Sys_ApplicationsVersion ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select ");
+            if (Top > 0)
+            {
+                strSql.Append(" top " + Top.ToString());
+            }
+            strSql.Append(" F_ID,F_Type,F_VersionName,F_VersionCode,F_Files,F_Url,F_CreateUser,F_CreateTime,F_UpdateUser,F_UpdateTime,F_IsDelete,F_DeleteTime,F_Sort,F_Remarks ");
+            strSql.Append(" FROM T_Sys_ApplicationsVersion ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            strSql.Append(" order by " + filedOrder);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获取记录总数
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) FROM T_Sys_ApplicationsVersion ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            object obj = DbHelperSQL.GetSingle(strSql.ToString());
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("SELECT * FROM ( ");
+            strSql.Append(" SELECT ROW_NUMBER() OVER (");
+            if (!string.IsNullOrEmpty(orderby.Trim()))
+            {
+                strSql.Append("order by T." + orderby);
+            }
+            else
+            {
+                strSql.Append("order by T.F_ID desc");
+            }
+            strSql.Append(")AS Row, T.*  from T_Sys_ApplicationsVersion T ");
+            if (!string.IsNullOrEmpty(strWhere.Trim()))
+            {
+                strSql.Append(" WHERE " + strWhere);
+            }
+            strSql.Append(" ) TT");
+            strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /*
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		{
+			SqlParameter[] parameters = {
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
+					new SqlParameter("@PageSize", SqlDbType.Int),
+					new SqlParameter("@PageIndex", SqlDbType.Int),
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
+					new SqlParameter("@OrderType", SqlDbType.Bit),
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
+					};
+			parameters[0].Value = "T_Sys_ApplicationsVersion";
+			parameters[1].Value = "F_ID";
+			parameters[2].Value = PageSize;
+			parameters[3].Value = PageIndex;
+			parameters[4].Value = 0;
+			parameters[5].Value = 0;
+			parameters[6].Value = strWhere;	
+			return DbHelperSQL.RunProcedure("UP_GetRecordByPage",parameters,"ds");
+		}*/
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}
+

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -171,6 +171,7 @@
     <Compile Include="App_Start\ErrorAttribute.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="Controllers\AddressBookController.cs" />
+    <Compile Include="Controllers\ApplicationsVersionController.cs" />
     <Compile Include="Controllers\AreaController.cs" />
     <Compile Include="Controllers\Base\BaseController.cs" />
     <Compile Include="Controllers\CallOutOptController.cs" />
@@ -311,6 +312,7 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Views\AddressBook\" />
+    <Folder Include="Views\ApplicationsVersion\" />
     <Folder Include="Views\Area\" />
     <Folder Include="Views\Base\" />
     <Folder Include="Views\Business\" />

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

@@ -0,0 +1,261 @@
+using CallCenter.Utility;
+using CallCenterApi.DB;
+using CallCenterApi.Interface.Controllers.Base;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers
+{
+    public class ApplicationsVersionController : BaseController
+    {
+        private BLL.T_Sys_ApplicationsVersion ApplicationsBLL = new BLL.T_Sys_ApplicationsVersion();
+
+        public class ApplicationsVersion
+        {
+            public int F_ID { get; set; }
+            public int  F_Type { get; set; }//应用分类（0android 1ios）
+            public string  F_VersionName  { get; set; }//版本名称
+            public string F_VersionCode { get; set; }//版本号
+            public string F_Files { get; set; }//android地址
+            public string F_Url { get; set; }//ios链接地址
+            public int  F_Sort { get; set; }//F_Sort
+            public string F_Remarks { get; set; }//F_Remarks
+            public DataTable FileUrl { get; set; }//android链接地址
+
+        }
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult Add(ApplicationsVersion input)
+        {
+            if (Request.IsAuthenticated)
+            {
+               
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                Model.T_Sys_ApplicationsVersion dModel = new Model.T_Sys_ApplicationsVersion();
+                dModel.F_Type = input.F_Type;
+                dModel.F_VersionName = input.F_VersionName;
+                dModel.F_VersionCode = input.F_VersionCode;
+                dModel.F_Files = input.F_Files;
+                dModel.F_Url = input.F_Url;
+                dModel.F_Remarks = input.F_Remarks;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_CreateTime = DateTime.Now;
+                if (userModel != null)
+                    dModel.F_CreateUser = userModel.F_UserCode;
+                dModel.F_IsDelete = 0;
+                if (input.F_ID > 0)
+                {
+                    dModel.F_ID = input.F_ID;
+                    bool  id = ApplicationsBLL.Update (dModel);
+                    if (id )
+                    {
+                        return Success("修改成功");
+                    }
+                    else
+                        return Success("修改失败");
+                }
+                else
+                {
+                    int id = ApplicationsBLL.Add(dModel);
+                    if (id > 0)
+                    {
+                        return Success("添加成功");
+                    }
+                    else
+                        return Success("添加失败");
+                }
+               
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public ActionResult DelEquipment(string[] ids)
+        {
+            if (Request.IsAuthenticated)
+            {
+                if (ids == null || ids.Length <= 0)
+                    return Error("请选择要删除的设备");
+
+                var idStr = string.Join(",", ids);
+                if (string.IsNullOrEmpty(idStr.Trim()))
+                    return Error("请选择要删除的设备");
+                if (ApplicationsBLL.DeleteList(idStr))
+                    return Success("删除成功");
+                return Error("删除失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetList(string keywords, int pageindex = 1, int pagesize = 10)
+        {
+            DataTable dt = new DataTable();
+            string sql = "and F_IsDelete=0";
+            if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
+                sql += $"  and ( F_VersionName like '%" + keywords.Trim() + "%'or F_Type like '%" + keywords.Trim() + "%'or F_VersionCode like '%" + keywords.Trim() + "%' ) ";
+            int recordCount = 0;
+            if (!string.IsNullOrWhiteSpace(sql))
+            {
+
+                dt = BLL.PagerBLL.GetListPager(
+                    "T_Sys_ApplicationsVersion",
+                    "F_ID",
+                    "*",
+                    sql,
+                    "ORDER BY T_Sys_ApplicationsVersion.F_ID desc,F_Sort asc",
+                    pagesize,
+                    pageindex,
+                    true,
+                    out recordCount);
+            }
+         
+            List<Model.T_Sys_ApplicationsVersion> modlelist = new BLL.T_Sys_ApplicationsVersion().DataTableToList(dt);
+            if (modlelist.Count > 0)
+            {
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = modlelist,
+                    total = recordCount
+                };
+
+                return Content(obj.ToJson()); ;
+            }
+            else
+            {
+
+                return Success("暂无数据"); ;
+            }
+        }
+        public DataTable GetFileData(string ids, string prefix)
+        {
+            DataTable dt = new DataTable();
+            if (!string.IsNullOrEmpty(ids))
+            {
+                dt = DbHelperSQL.Query("select * from T_Sys_Accessories where F_FileId in (" + ids + ")").Tables[0];
+                foreach (DataRow dr in dt.Rows)
+                {
+                    dr["F_FileUrl"] = prefix + dr["F_FileUrl"].ToString();
+                }
+            }
+            return dt;
+        }
+        private List <ApplicationsVersion> modeltoip(List<Model.T_Sys_ApplicationsVersion >t_Sys_ApplicationsVersion )
+        {
+            var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+            List<ApplicationsVersion> model = new List<ApplicationsVersion>();
+
+            if (t_Sys_ApplicationsVersion!=null )
+            {
+                foreach (var it in t_Sys_ApplicationsVersion)
+                {
+                    ApplicationsVersion app = new ApplicationsVersion();
+                    app.F_ID = it.F_ID;
+                    app.F_Type =(int ) it.F_Type;
+                    app.F_VersionName = it.F_VersionName;
+                    app.F_VersionCode = it.F_VersionCode;
+                    app.F_Files = it.F_Files;
+                    app.F_Url = it.F_Url;
+                    app.F_Sort = (int )it.F_Sort;
+                    app.F_Remarks = it.F_Remarks;
+                    app.FileUrl = GetFileData(it.F_Files, configfj.F_ParamValue);
+                }
+            }
+            return model;
+        }
+        /// <summary>
+        /// 查询设备详情
+        /// </summary>
+        public ActionResult GetDetails(int id)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                DataTable FileUrl = new DataTable();
+                Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+
+                if (id <= 0)
+                {
+                    return Error("请输入正确的id");
+                }
+                var model = ApplicationsBLL.GetModel(id);
+                if (model == null)
+                    return Error("该应用不存在");
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = model,
+                };
+                return Content(obj.ToJson());
+            }
+            else
+            {
+                return Error("无操作权限！");
+            }
+        }
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult UploadFile()
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+
+            #region 多个上传
+            HttpFileCollection files = RequestString.GetFiles();
+            if (files.Count > 0)
+            {
+                List<Model.T_Sys_Accessories> acs = new List<Model.T_Sys_Accessories>();
+                string path = "/Upload/Files/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
+                for (int i = 0; i < files.Count; i++)
+                {
+                    HttpPostedFile file = files[i];
+                    FileUp fu = new FileUp();
+
+                    string name = fu.Upload(file, path);
+
+                    Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                    model_T_Sys_Accessories.F_CreateTime = DateTime.Now;//上传时间
+                    model_T_Sys_Accessories.F_Name = file.FileName;//附件名称
+                    model_T_Sys_Accessories.F_Type = System.IO.Path.GetExtension(file.FileName);//附件类型
+                    model_T_Sys_Accessories.F_Url = path + name;//附件地址
+                    model_T_Sys_Accessories.F_Size = file.ContentLength;
+                    model_T_Sys_Accessories.F_CreateUser = userModel.F_UserCode;//上传人  
+                    int id = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                    model_T_Sys_Accessories.F_Id = id;
+                    acs.Add(model_T_Sys_Accessories);
+                }
+
+                return Success("成功", acs);
+            }
+            else
+            {
+                return Error("请选择要上传的文件");
+            }
+            #endregion
+
+        }
+    }
+
+}

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

@@ -10,6 +10,7 @@ namespace CallCenterApi.Interface.Controllers
 {
     public class CallOutOptController : BaseController
     {
+    
         //外呼判断本地外地以及加前缀返回
         public ActionResult GetCallOutprefix(string phone)
         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/EquipmentNumberController.cs

@@ -160,7 +160,7 @@ namespace CallCenterApi.Interface.Controllers
             else
             {
 
-                return Success("暂无工单"); ;
+                return Success("暂无数据"); ;
             }
         }
         /// <summary>

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

@@ -156,87 +156,139 @@ namespace CallCenterApi.Interface.Controllers
             }
             return NoToken("未知错误，请重新登录");
         }
-
         /// <summary>
         /// 通话记录数量
         /// </summary>
         /// <returns></returns>
         public ActionResult GetTelRecordsTotal()
         {
-            
+            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 int userId = CurrentUser.UserData.F_UserId;
-                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                string usercode = CurrentUser.UserData.F_UserCode;
+                int roleid = CurrentUser.UserData.F_RoleId;
                 if (userId != 0)
                 {
                     var date = DateTime.Now;
                     string strDate = date.ToString("yyyy-MM-dd");
                     string strMonth = date.ToString("yyyy-MM");
 
-                    string uwhere = " 1=1  and ISNULL(groupcode,'') != '' AND CONVERT(char(7),BeginTime,20) = '" + strMonth + "' ";;
-                    if (userModel.rolecode != "XTGLY")
+                    string uwhere = " 1=1 ";
+                    if (roleid != 17)
                     {
-                        uwhere += " and UserCode='" + userModel.F_UserCode + "' ";
-                    }
-                   
-                    if (!string.IsNullOrEmpty(userModel.groupcode))
-                    {
-                        uwhere += " and groupcode = '" + userModel.groupcode + "' ";
+                        uwhere += " and UserCode='" + usercode + "' ";
                     }
 
                     BLL.T_Call_CallRecords bll = new BLL.T_Call_CallRecords();
-                    DataTable dtConnect = DbHelperSQL.Query("select CONVERT(varchar(10),BeginTime, 23) AS yearmonthdays,CONVERT(char(7),BeginTime,20) AS yearmonths,CallType,BeginTime,groupcode,UserCode,ISNULL(TalkLongTime,0) AS TalkLongTime FROM T_Call_CallRecords WITH(NOLOCK) where " + uwhere + "").Tables[0];
-
-                    // 今日来电
-                    var dayinlist = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'").Count();
-                    var dayinlist_totaltimesum_0 = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'");
-                    var dayinlist_totaltimesum = (from DataRow dr in dayinlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
-                    //今日去电    
-                    var dayoutlist = dtConnect.Select("CallType='1' and yearmonthdays = '" + strDate + "'").Count();
-                    var dayoutlist_totaltimesum_0 = dtConnect.Select("CallType='1' and yearmonthdays = '" + strDate + "'");
-                    var dayoutlist_totaltimesum = (from DataRow dr in dayoutlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
-                    //本月来电    
-                    var moninlist = dtConnect.Select("CallType='0' and yearmonths = '" + strMonth + "'").Count();
-                    var moninlist_totaltimesum_0 = dtConnect.Select("CallType='0' and yearmonths = '" + strMonth + "'");
-                    var moninlist_totaltimesum = (from DataRow dr in moninlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
-                    //本月去电    
-                    var monoutlist = dtConnect.Select("CallType='1' and yearmonths = '" + strMonth + "'").Count();
-                    var monoutlist_totaltimesum_0 = dtConnect.Select("CallType='1' and yearmonths = '" + strMonth + "'");
-                    var monoutlist_totaltimesum = (from DataRow dr in monoutlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
-                    //未接来电    
-                    var daynocon = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'").Count();
+                    //var dayinlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
+                    //var dayoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
+                    //var moninlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' and CallState='1' ");
+                    //var monoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' and CallState='1' ");
+                    //int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(100),BeginTime, 23)='" + strDate + "' and CallState='0' ").Tables[0].Rows.Count;
+
+                    //2018-05-03 lihai 首页统计问题
+                    var dayinlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' ");
+                    var dayoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' ");
+                    var moninlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' ");
+                    var monoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' ");
+
+                    int daynocon = bll.GetList("CallType='0' and CallState='0' and datediff(day,BeginTime, '" + strDate + "')=0 ").Tables[0].Rows.Count;
+                    //int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(100),BeginTime, 23)='" + strDate + "' ").Tables[0].Rows.Count;
 
                     var obj = new
                     {
-                        //// 今日来电
-                        //dayin = new { count = dayinlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayinlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
-                        ////今日去电    
-                        //dayout = new { count = dayoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayoutlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
-                        ////本月来电    
-                        //monin = new { count = moninlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(moninlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
-                        ////本月去电    
-                        //monout = new { count = monoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(monoutlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
-                        ////未接来电    
-                        //daynocon = daynocon
-
-                        // 今日来电
-                        dayin = new { count = dayinlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayinlist_totaltimesum.ToString()), 0) },
-                        //今日去电    
-                        dayout = new { count = dayoutlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayoutlist_totaltimesum.ToString()), 0) },
-                        //本月来电    
-                        monin = new { count = moninlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(moninlist_totaltimesum.ToString()), 0) },
-                        //本月去电    
-                        monout = new { count = monoutlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(monoutlist_totaltimesum.ToString()), 0) },
-                        //未接来电    
+                        dayin = new { count = dayinlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayinlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
+                        dayout = new { count = dayoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayoutlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
+                        monin = new { count = moninlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(moninlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
+                        monout = new { count = monoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(monoutlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
                         daynocon = daynocon
                     };
-                    return Success("成功", obj);
-                
-            }
+                    res = Success("成功", obj);
+                }
             }
-            return NoToken("未知错误，请重新登录");
+            return res;
         }
+        ///// <summary>
+        ///// 通话记录数量
+        ///// </summary>
+        ///// <returns></returns>
+        //public ActionResult GetTelRecordsTotal()
+        //{
+            
+        //    if (Request.IsAuthenticated)
+        //    {
+        //        int userId = CurrentUser.UserData.F_UserId;
+        //        Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+        //        if (userId != 0)
+        //        {
+        //            var date = DateTime.Now;
+        //            string strDate = date.ToString("yyyy-MM-dd");
+        //            string strMonth = date.ToString("yyyy-MM");
+
+        //            string uwhere = " 1=1  and ISNULL(groupcode,'') != '' AND CONVERT(char(7),BeginTime,20) = '" + strMonth + "' ";;
+        //            if (userModel.rolecode != "XTGLY")
+        //            {
+        //                uwhere += " and UserCode='" + userModel.F_UserCode + "' ";
+        //            }
+                   
+        //            if (!string.IsNullOrEmpty(userModel.groupcode))
+        //            {
+        //                uwhere += " and groupcode = '" + userModel.groupcode + "' ";
+        //            }
+
+        //            BLL.T_Call_CallRecords bll = new BLL.T_Call_CallRecords();
+        //            DataTable dtConnect = DbHelperSQL.Query("select CONVERT(varchar(10),BeginTime, 23) AS yearmonthdays,CONVERT(char(7),BeginTime,20) AS yearmonths,CallType,BeginTime,groupcode,UserCode,ISNULL(TalkLongTime,0) AS TalkLongTime FROM T_Call_CallRecords WITH(NOLOCK) where " + uwhere + "").Tables[0];
+
+        //            // 今日来电
+        //            var dayinlist = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'").Count();
+        //            var dayinlist_totaltimesum_0 = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'");
+        //            var dayinlist_totaltimesum = (from DataRow dr in dayinlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
+        //            //今日去电    
+        //            var dayoutlist = dtConnect.Select("CallType='1' and yearmonthdays = '" + strDate + "'").Count();
+        //            var dayoutlist_totaltimesum_0 = dtConnect.Select("CallType='1' and yearmonthdays = '" + strDate + "'");
+        //            var dayoutlist_totaltimesum = (from DataRow dr in dayoutlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
+        //            //本月来电    
+        //            var moninlist = dtConnect.Select("CallType='0' and yearmonths = '" + strMonth + "'").Count();
+        //            var moninlist_totaltimesum_0 = dtConnect.Select("CallType='0' and yearmonths = '" + strMonth + "'");
+        //            var moninlist_totaltimesum = (from DataRow dr in moninlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
+        //            //本月去电    
+        //            var monoutlist = dtConnect.Select("CallType='1' and yearmonths = '" + strMonth + "'").Count();
+        //            var monoutlist_totaltimesum_0 = dtConnect.Select("CallType='1' and yearmonths = '" + strMonth + "'");
+        //            var monoutlist_totaltimesum = (from DataRow dr in monoutlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
+        //            //未接来电    
+        //            var daynocon = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'").Count();
+
+        //            var obj = new
+        //            {
+        //                //// 今日来电
+        //                //dayin = new { count = dayinlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayinlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
+        //                ////今日去电    
+        //                //dayout = new { count = dayoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayoutlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
+        //                ////本月来电    
+        //                //monin = new { count = moninlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(moninlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
+        //                ////本月去电    
+        //                //monout = new { count = monoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(monoutlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
+        //                ////未接来电    
+        //                //daynocon = daynocon
+
+        //                // 今日来电
+        //                dayin = new { count = dayinlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayinlist_totaltimesum.ToString()), 0) },
+        //                //今日去电    
+        //                dayout = new { count = dayoutlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayoutlist_totaltimesum.ToString()), 0) },
+        //                //本月来电    
+        //                monin = new { count = moninlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(moninlist_totaltimesum.ToString()), 0) },
+        //                //本月去电    
+        //                monout = new { count = monoutlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(monoutlist_totaltimesum.ToString()), 0) },
+        //                //未接来电    
+        //                daynocon = daynocon
+        //            };
+        //            return Success("成功", obj);
+                
+        //    }
+        //    }
+        //    return NoToken("未知错误，请重新登录");
+        //}
 
         /// <summary>
         /// 获取当月/当天的工单量(已完成，未完成)
@@ -263,35 +315,30 @@ namespace CallCenterApi.Interface.Controllers
                         //var list3 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
                         //var list4 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
 
-                        string uwhere = " 1=1 AND CONVERT(char(7),CreateTime,20) = '" + strMonth + "'"; ;
+                        string uwhere = " 1=1 AND CONVERT(char(7),F_CreateTime,20) = '" + strMonth + "'"; ;
                         if (userModel.rolecode != "XTGLY")
                         {
-                            uwhere += " and CreateUser='" + userModel.F_UserCode + "' ";
+                            uwhere += " and F_CreateUser='" + userModel.F_UserCode + "' ";
                         }
 
-                        BLL.T_Bus_WorkOrder bll = new BLL.T_Bus_WorkOrder();
+                     
                         //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];
                         //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State in (0,1) and IsDel=0 ").Tables[0];
                         //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =2 and IsDel=0 ").Tables[0];
                         //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State in (0,1) and IsDel=0 ").Tables[0];
 
-                        DataTable dtConnect = DbHelperSQL.Query("select CONVERT(varchar(10),CreateTime, 23) AS yearmonthdays,CONVERT(char(7),CreateTime,20) AS yearmonths,State,IsDel,CreateTime,CreateUser FROM T_Wo_WorkOrder WITH(NOLOCK) where " + uwhere + "").Tables[0];
-
-                        //日已完成
-                        int list1_count = dtConnect.Select(" yearmonthdays = '" + strDate + "' and State = 1 and IsDel = 0").Count();
-                        //日未完成
-                        int list2_count = dtConnect.Select(" yearmonthdays = '" + strDate + "' and State=0 and IsDel=0 ").Count();
-                        //月已完成
-                        var list3_count = dtConnect.Select(" yearmonths = '" + strMonth + "' and State =1 and IsDel=0 ").Count();
-                        //月未完成
-                        var list4_count = dtConnect.Select(" yearmonths = '" + strMonth + "' and State=0 and IsDel=0").Count();
+                        BLL.T_Bus_WorkOrder bll = new BLL.T_Bus_WorkOrder();
+                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State in(10) and F_IsDelete=0 ").Tables[0];
+                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State in (1,3,4,5,6) and F_IsDelete=0 ").Tables[0];
+                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State in(10) and F_IsDelete=0 ").Tables[0];
+                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State in (1,3,4,5,6) and F_IsDelete=0 ").Tables[0];
 
                         var obj = new
                         {
-                            daywc = list1_count,
-                            daywwc = list2_count,
-                            monwc = list3_count,
-                            monwwc = list4_count
+                            daywc = list1.Rows.Count,
+                            daywwc = list2.Rows.Count,
+                            monwc = list3.Rows.Count,
+                            monwwc = list4.Rows.Count
                         };
                         return Success("成功", obj);
                     }

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

@@ -181,7 +181,8 @@ namespace CallCenterApi.Interface.Controllers.report
                     date.total++;
                     if (!string.IsNullOrEmpty(modelList[j].F_ProductDate))
                     {
-                        var pronos = DateTime.ParseExact(modelList[j].F_ProductDate, "yyyyMMdd", null).Month;
+                        string result = modelList[j].F_ProductDate.Replace(".", "");
+                        var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).Month;
                         if (timeslot.stime > timeslot.etime)
                         {
                             int t = 12 - timeslot.stime;
@@ -276,7 +277,8 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 if (!string.IsNullOrEmpty(modelList[j].F_ProductDate))
                 {
-                    var pronos = DateTime.ParseExact(modelList[j].F_ProductDate, "yyyyMMdd", null).Month ;
+                    string result = modelList[j].F_ProductDate.Replace(".", "");
+                    var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).Month ;
                     if (timeslot.stime > timeslot.etime)
                     {
                         int t = 12 - timeslot.stime;

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

@@ -85,11 +85,9 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc9 = new DataColumn("平均排队时间");
             DataColumn dc10 = new DataColumn("接听通话次数");
             DataColumn dc11 = new DataColumn("通话分钟数");
-            DataColumn dc12 = new DataColumn("通话秒数");
-            DataColumn dc13 = new DataColumn("平均接听通话秒数");
+            DataColumn dc13 = new DataColumn("平均接听通话分钟数");
             DataColumn dc14 = new DataColumn("平均振铃秒数");
             DataColumn dc15 = new DataColumn("呼入占有率");
-            DataColumn dc16 = new DataColumn("用户评价");
             DataColumn dc17 = new DataColumn("坐席登录次数");
             DataColumn dc18 = new DataColumn("登录时长分钟数");
             DataColumn dc19 = new DataColumn("工作时长分钟数");
@@ -99,7 +97,7 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc23 = new DataColumn("休息时长分钟数");
             DataColumn dc24 = new DataColumn("平均每天休息时长");
             DataColumn dc25 = new DataColumn("置忙平均休息分钟数");
-            DataColumn dc26 = new DataColumn("质检平均成绩");
+           // DataColumn dc26 = new DataColumn("质检平均成绩");
 
             dtNew.Columns.Add(dc1);
             dtNew.Columns.Add(dc2);
@@ -112,11 +110,10 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc9);
             dtNew.Columns.Add(dc10);
             dtNew.Columns.Add(dc11);
-            dtNew.Columns.Add(dc12);
             dtNew.Columns.Add(dc13);
             dtNew.Columns.Add(dc14);
             dtNew.Columns.Add(dc15);
-            dtNew.Columns.Add(dc16);
+          
             dtNew.Columns.Add(dc17);
             dtNew.Columns.Add(dc18);
             dtNew.Columns.Add(dc19);
@@ -126,7 +123,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc23);
             dtNew.Columns.Add(dc24);
             dtNew.Columns.Add(dc25);
-            dtNew.Columns.Add(dc26);
+         //   dtNew.Columns.Add(dc26);
             #endregion
             int days = 30;
             string sqltimeCallRecords = "";
@@ -284,7 +281,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["接听通话次数"] = ijtcs.ToString();
                         //drNew["通话分钟数"] = (ithms / 60).ToString();
                         drNew["通话分钟数"] = CallCenter.Utility.DateTimeConvert.parseTimeSeconds(ithms, 0);
-                        drNew["通话秒数"] = ithms.ToString();
+                       
 
                         if (ijtcs != 0)
                         {
@@ -296,8 +293,9 @@ namespace CallCenterApi.Interface.Controllers.report
                             ipjjtms = 0;//平均接通秒数
                             ipjzlms = 0;//平均振铃秒数
                         }
-                        drNew["平均接听通话秒数"] = ipjjtms.ToString();
-                        drNew["平均振铃秒数"] = ipjzlms.ToString();
+                   
+                    drNew["平均接听通话分钟数"] = CallCenter.Utility.DateTimeConvert.parseTimeSeconds(ipjjtms, 0);
+                    drNew["平均振铃秒数"] = ipjzlms.ToString();
 
                         //坐席登录次数
                         DataTable dtAgent = DbHelperSQL.Query("select COUNT(*) as dl,SUM(LoginTimes) as dlsc,SUM(reposenum) as zm,SUM(ReposeTimes) as xx from rep_agent_detail where AgentId=" + dt.Rows[i]["F_WorkNumber"] + " " + sqltimeCallRecords.Replace("TimeAlerting", "TimeLogin")).Tables[0];
@@ -367,16 +365,14 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["呼入占有率"] = (ihrzyl * 100).ToString("0.00") + "%";
                         //用户评价
                         //未评价为0
-                        object obj = DbHelperSQL.GetSingle("select count(*) from T_Call_CallRecords  WITH(NOLOCK) where MYD is not null and myd<>0 and CallState=1 and userid=" + dt.Rows[i]["F_UserId"] + strsqlcall);
-                        string myd = "";
-                        if (obj != null)
-                        {
-                            myd = obj.ToString();
-                        }
-                        drNew["用户评价"] = myd;
+                       
                         drNew["坐席登录次数"] = izxdlcs.ToString();
-                        drNew["登录时长分钟数"] = (idlsc / 60).ToString();
-                        drNew["工作时长分钟数"] = (iWorktime / 60).ToString();
+                        float a = idlsc / 360;
+                        float  b=idlsc % 360/60;
+                    drNew["登录时长分钟数"] = string .Format ("{0}小时{1}分钟",a ,b );
+                    float c = idlsc / 360;
+                    float d = idlsc % 360 / 60;
+                    drNew["工作时长分钟数"] = drNew["工作时长分钟数"] = string.Format("{0}小时{1}分钟", c, d); ;
                         drNew["平均每天工作时长"] = Math.Round((double.Parse(iWorktime.ToString()) / 60 / 60 / days), 2).ToString();
                         drNew["平均操作分钟数"] = (ipjczsc / 60).ToString();
                         drNew["置忙次数"] = izmcs.ToString();
@@ -384,17 +380,17 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["平均每天休息时长"] = Math.Round((double.Parse(ixxsc.ToString()) / 60 / 60 / days), 2).ToString();
                         drNew["置忙平均休息分钟数"] = (ipjzmxxsc / 60).ToString();
 
-                        DataSet dszj = DbHelperSQL.Query("select convert(int,SUM(f_qcscore)) as fs,COUNT(*) as fsct from T_Call_CallRecords  WITH(NOLOCK) where F_QCState=1 and UserId=" + dt.Rows[i]["F_UserId"] + strsqlcall);
-                        int zfs = 0;
-                        if (dszj != null && dszj.Tables.Count > 0)
-                        {
-                            DataTable dtzj = dszj.Tables[0];
-                            if (dtzj.Rows.Count > 0 && dtzj.Rows[0]["fs"].ToString() != "" && dtzj.Rows[0]["fsct"].ToString() != "")
-                            {
-                                zfs = Convert.ToInt32(dtzj.Rows[0]["fs"].ToString()) / int.Parse(dtzj.Rows[0]["fsct"].ToString());
-                            }
-                        }
-                        drNew["质检平均成绩"] = zfs.ToString();
+                      //  DataSet dszj = DbHelperSQL.Query("select convert(int,SUM(f_qcscore)) as fs,COUNT(*) as fsct from T_Call_CallRecords  WITH(NOLOCK) where F_QCState=1 and UserId=" + dt.Rows[i]["F_UserId"] + strsqlcall);
+                        //int zfs = 0;
+                        //if (dszj != null && dszj.Tables.Count > 0)
+                        //{
+                        //    DataTable dtzj = dszj.Tables[0];
+                        //    if (dtzj.Rows.Count > 0 && dtzj.Rows[0]["fs"].ToString() != "" && dtzj.Rows[0]["fsct"].ToString() != "")
+                        //    {
+                        //        zfs = Convert.ToInt32(dtzj.Rows[0]["fs"].ToString()) / int.Parse(dtzj.Rows[0]["fsct"].ToString());
+                        //    }
+                        //}
+                        //drNew["质检平均成绩"] = zfs.ToString();
 
                         dtNew.Rows.Add(drNew);
                     }

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

@@ -36,10 +36,10 @@ namespace CallCenterApi.Interface.Controllers.tel
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
           
-            if (!string.IsNullOrEmpty(userModel.groupcode))
-            {
-                sql += " and groupcode = '" + userModel.groupcode + "' ";
-            }
+            //if (!string.IsNullOrEmpty(userModel.groupcode))
+            //{
+            //    sql += " and groupcode = '" + userModel.groupcode + "' ";
+            //}
 
             if (usercode != null && usercode.Trim() != "")
             {

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

@@ -23,7 +23,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         //   private BLL.T_Sys_UserAccount userBLL = new BLL.T_Sys_UserAccount();
         //  private BLL.T_Bus_WorkOrder workorderBLL = new BLL.T_Bus_WorkOrder();
         //   private BLL.T_Sys_SystemConfig configBll = new BLL.T_Sys_SystemConfig();
-
+      
         /// <summary>
         /// 上传附件
         /// </summary>
@@ -198,20 +198,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     str = DateTime.Parse(starttime).ToString("yyyy年MM月dd日") + "至" +
                         DateTime.Parse(endtime).ToString("yyyy年MM月dd日") + "消费者重复投诉表";
                 }
-                else if (istime == 0&&isdc >0)
+                else if (istime == 0&&isdc ==1)
                 {
                     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   ";
                     str = DateTime.Now.ToString("yyyy年MM月dd日") + "消费者重复投诉表";
                 }
-                else if (istime> 0 && isdc > 0)
+                else if (istime> 0 && isdc == 1)
                 {
                     sql +=  " 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   ";
                     str = DateTime.Now.ToString("yyyy年MM月") + "消费者重复投诉表";
                 }
-                if (isdc > 0)
+                if (isdc ==1)
                 {
                     var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql);
                     #region 
@@ -264,6 +264,116 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                     }
                 }
+                else  if (isdc == 2)
+                {
+                    var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql);
+                    #region 
+                    dt.Columns.Add("工单编号");
+                    dt.Columns.Add("大区");
+                    dt.Columns.Add("办事处");
+                    dt.Columns.Add("投诉时间");
+                    dt.Columns.Add("序号");
+                    dt.Columns.Add("姓名");
+                    dt.Columns.Add("地址");
+                    dt.Columns.Add("联系电话");
+                    dt.Columns.Add("产品代码");
+                    dt.Columns.Add("产品名称");
+                    dt.Columns.Add("规格");
+                    dt.Columns.Add("生产日期");
+                    dt.Columns.Add("产品编码");
+                    dt.Columns.Add("生产厂家");
+                    dt.Columns.Add("问题代码");
+                    dt.Columns.Add("质量问题");
+                    dt.Columns.Add("通知人");
+                    dt.Columns.Add("接听人");
+                    dt.Columns.Add("落实情况");
+                    dt.Columns.Add("处理进度");
+                    dt.Columns.Add("工单类别");
+                    dt.Columns.Add("重复工单");
+                    #endregion
+                    foreach (var it in depts)
+                    {
+                        DataRow drNew = dt.NewRow();
+                        #region 基本字段
+                        drNew["工单编号"] = it.F_WorkOrderId;//
+                        if (!string.IsNullOrEmpty(it.F_Area))
+                        {
+                            try
+                            {
+                                var dept = new BLL.T_Sys_Department().GetModel(int.Parse(it.F_Area));
+                                if (dept != null)
+                                    drNew["大区"]  = dept.F_DeptName;
+                            }
+                            catch
+                            {
+                                drNew["大区"] = "";
+                            }
+                        }
+                        if (!string.IsNullOrEmpty(it.F_Office))
+                        {
+                            try
+                            {
+                                var dept = new BLL.T_Sys_Department().GetModel(int.Parse(it.F_Office));
+                                if (dept != null)
+                                    drNew["办事处"]  = dept.F_DeptName;
+                            }
+                            catch
+                            {
+                                drNew["办事处"]  = "";
+                            }
+                        }
+                        drNew["投诉时间"] = it.F_CreateTime ;//
+                        drNew["序号"] = it.F_SerialNumber;//
+                        drNew["姓名"] = it.F_CusName;//姓名
+                        drNew["地址"] = it.F_AddRess;//地址
+                        drNew["联系电话"] = it.F_CusPhone;
+                        drNew["产品代码"] = it.F_ProductType;
+                        drNew["产品名称"] = it.F_ProductName;
+                        drNew["规格"] = it.F_Specifications;
+                        drNew["生产日期"] = it.F_ProductDate;
+                        drNew["产品编码"] = it.F_BatchNumber;
+                        drNew["生产厂家"] = it.F_Manufacturer;
+                        drNew["问题代码"] = it.F_ProblemCode;
+                        drNew["质量问题"] = it.F_QualityProblem;
+                        drNew["通知人"] = it.F_Notifications;
+                        drNew["接听人"] = it.F_ReceivingPerson;
+                        drNew["落实情况"] = it.F_DealResult;
+                        if (it.F_State == 0)
+                            drNew["处理进度"] = "待提交";
+                        else if (it.F_State == 1)
+                            drNew["处理进度"] = "待指派";
+                        else if (it.F_State == 3)
+                            drNew["处理进度"] = "待处理";
+                        else if (it.F_State == 4)
+                            drNew["处理进度"] = "处理中";
+                        else if (it.F_State == 5)
+                            drNew["处理进度"] = "退回待指派";
+                        else if (it.F_State == 6)
+                            drNew["处理进度"] = "退回待提交";
+                        else if (it.F_State == 10)
+                            drNew["处理进度"] = "已完结";
+                        if (it .F_Type==1)
+                        drNew["工单类别"] = "咨询";
+                        else
+                            drNew["工单类别"] = "投诉";
+                        if (it .F_Duplicate==0)
+                        drNew["重复工单"] = "未重复";
+                        else
+                            drNew["重复工单"] = "重复";
+                        dt.Rows.Add(drNew);
+                        #endregion
+                    }
+                    NPOIHelper npoi = new NPOIHelper();
+                    if (npoi.ExportToExcel("工单列表", dt) == "")
+                    {
+                        return Success("导出成功");
+                    }
+                    else
+                    {
+                        return Error("导出失败");
+
+                    }
+                }
                 else
                 {
                     sql = "and" + sql;
@@ -398,7 +508,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.F_OfficName = it.F_Office;
                     }
                 }
-                model.F_CreateTime = it.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;//序号
@@ -519,7 +629,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     try
                     {
-                        var pronos = DateTime.ParseExact(input.F_ProductDate, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                        string result = input.F_ProductDate.Replace(".", "");
+                        var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
                         var protime = Convert.ToDateTime(pronos);
                         if (DateTime.Parse(pronos) > DateTime.Now)
                         {
@@ -583,7 +694,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     try
                     {
-                        var pronos = DateTime.ParseExact(input.F_ProductDate, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                        string result = input.F_ProductDate.Replace(".", "");
+                        var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
                         var protime = Convert.ToDateTime(pronos);
                         if (DateTime.Parse(pronos) > DateTime.Now)
                         {

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

@@ -67,7 +67,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 投诉时间
         /// </summary>
-        public DateTime? F_CreateTime
+        public string  F_CreateTime
         {
             get; set;
         }

codegit/CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -88,6 +88,7 @@
     <Compile Include="T_SMS_SentSMS.cs" />
     <Compile Include="T_SMS_Template.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
+    <Compile Include="T_Sys_ApplicationsVersion.cs" />
     <Compile Include="T_Sys_Area.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_ApplicationsVersion.cs

@@ -0,0 +1,144 @@
+using System;
+
+namespace CallCenterApi.Model
+{
+    /// <summary>
+    /// T_Sys_ApplicationsVersion:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
+    public partial class T_Sys_ApplicationsVersion
+    {
+        public T_Sys_ApplicationsVersion()
+        { }
+        #region Model
+        private int _f_id;
+        private long _f_type;
+        private string _f_versionname;
+        private string _f_versioncode;
+        private string _f_files;
+        private string _f_url;
+        private string _f_createuser;
+        private DateTime? _f_createtime;
+        private string _f_updateuser;
+        private DateTime? _f_updatetime;
+        private int _f_isdelete;
+        private DateTime? _f_deletetime;
+        private int? _f_sort;
+        private string _f_remarks;
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 应用分类（0android 1ios）
+        /// </summary>
+        public long F_Type
+        {
+            set { _f_type = value; }
+            get { return _f_type; }
+        }
+        /// <summary>
+        /// 版本名称
+        /// </summary>
+        public string F_VersionName
+        {
+            set { _f_versionname = value; }
+            get { return _f_versionname; }
+        }
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        public string F_VersionCode
+        {
+            set { _f_versioncode = value; }
+            get { return _f_versioncode; }
+        }
+        /// <summary>
+        /// android地址
+        /// </summary>
+        public string F_Files
+        {
+            set { _f_files = value; }
+            get { return _f_files; }
+        }
+        /// <summary>
+        /// ios链接地址
+        /// </summary>
+        public string F_Url
+        {
+            set { _f_url = value; }
+            get { return _f_url; }
+        }
+        /// <summary>
+        /// 添加人
+        /// </summary>
+        public string F_CreateUser
+        {
+            set { _f_createuser = value; }
+            get { return _f_createuser; }
+        }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        public DateTime? F_CreateTime
+        {
+            set { _f_createtime = value; }
+            get { return _f_createtime; }
+        }
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string F_UpdateUser
+        {
+            set { _f_updateuser = value; }
+            get { return _f_updateuser; }
+        }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? F_UpdateTime
+        {
+            set { _f_updatetime = value; }
+            get { return _f_updatetime; }
+        }
+        /// <summary>
+        /// 是否删除
+        /// </summary>
+        public int F_IsDelete
+        {
+            set { _f_isdelete = value; }
+            get { return _f_isdelete; }
+        }
+        /// <summary>
+        /// 删除时间
+        /// </summary>
+        public DateTime? F_DeleteTime
+        {
+            set { _f_deletetime = value; }
+            get { return _f_deletetime; }
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int? F_Sort
+        {
+            set { _f_sort = value; }
+            get { return _f_sort; }
+        }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string F_Remarks
+        {
+            set { _f_remarks = value; }
+            get { return _f_remarks; }
+        }
+        #endregion Model
+
+    }
+}
+

codegit/CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -966,7 +966,6 @@ namespace CallCenter.Utility
                 IRow irow5 = sheet.CreateRow(t+1);
                 ICell cell7 = irow5.CreateCell(0);
                 cell7.SetCellValue("工\n厂\n投\n诉\n占\n比\n");
-        
                 cell7.CellStyle = cellStylebt;
                 cell7.CellStyle.WrapText=true ;
                 sheet.AddMergedRegion(new CellRangeAddress(t+1, t+ count, 0, 0));

ivr/IVR_Auto.xml

@@ -13,13 +13,13 @@
 			groupcode:坐席组编号
 			插入通话记录示例：exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,1,'','KFZ' 
 		-->
-		<cell Name="CELL_BRANCH" Pos="2" Var="CalleeID" DefaultPos="2" Note="首次分支分支节点">
-			<Branch Value="8001" Pos="201" /><!--客服组正常流程：黑名单-节假日-坐席排队-->
-			<Branch Value="6800" Pos="202" /><!--市场组直接转坐席-->
+		<!--<cell Name="CELL_BRANCH" Pos="2" Var="CalleeID" DefaultPos="2" Note="首次分支分支节点"> -->
+			<!--<Branch Value="8001" Pos="201" />--><!--客服组正常流程：黑名单-节假日-坐席排队-->
+			<!--<Branch Value="6800" Pos="202" />--><!--市场组直接转坐席-->
 		</cell>
-		<cell Name="CELL_SQL" Pos="201" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','KFZ' " 
+		<cell Name="CELL_SQL" Pos="201" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','KFZ' " 
 		IsSaved="no" SuccessPos="3" FailPos="3" Note="插入通话记录-客服组" />
-		<cell Name="CELL_SQL" Pos="202" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','SCZ' " 
+		<cell Name="CELL_SQL" Pos="202" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=121.196.219.217" SqlStr="exec P_OptCallRecords '%[CallerID]','%[CallID]',1,0,'0','','SCZ' " 
 		IsSaved="no" SuccessPos="3" FailPos="3" Note="插入通话记录-市场组" />
 		<cell Name="CELL_DEFINEVAR" Pos="3" Next="4" Note="定义变量节点">
 			<DefVar VarType="1" VarName="AgentNo" VarVal="0" />
@@ -31,12 +31,9 @@
 			<DefVar VarType="1" VarName="HolidayVerify" VarVal="0" />
 			<DefVar VarType="1" VarName="zbdh" VarVal="0" />
 		</cell>
-		<cell Name="CELL_BRANCH" Pos="4" Var="CalleeID" DefaultPos="1010" Note="流程不同分支节点">
-			<Branch Value="8001" Pos="104" /><!--客服组正常流程：黑名单-节假日-坐席排队-->
-			<Branch Value="6800" Pos="603" /><!--市场组直接转坐席--> 
-		</cell>
+		
 		<!--黑名单-->
-		<cell Name="CELL_SQL" Pos="104" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_GetBlacklist  '%[CallerID]','%[CallID]' " IsSaved="yes" SuccessPos="5" FailPos="5" Note="读取黑名单" />
+		<cell Name="CELL_SQL" Pos="4" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=." 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>
@@ -48,28 +45,28 @@
 		<!--黑名单-->
 		
 		<!--欢迎词-->
-		<!-- <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:\双汇ShuangHui\Middle_shuanghui\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_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_GetHolidays" IsSaved="yes" SuccessPos="9" FailPos="603" Note="节假日查询" />
+		<cell Name="CELL_SQL" Pos="8" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=." 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_COMPARE" Pos="10" Data1Type="2" Data2Type="1" Data3Type="1" Data1="HolidayVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="603"  Note="判断节假日" />
 		<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="2" ContentType="1" Content="D:\Midware\wav\假期提示音.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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="exec P_GetSeatGroup '%[CallerID]','%[CalleeID]'" 
+		<cell Name="CELL_SQL" Pos="603" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=." 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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" 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=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=." 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_BRANCH" Pos="13" Var="CalleeID" DefaultPos="1013" Note="排队分支节点">
@@ -78,9 +75,9 @@
 		</cell>
 		
 		<cell Name="CELL_QUEUE" Pos="1013" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
-		NoAgentPos="29" NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点" />
+		 NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点" />
 		<cell Name="CELL_QUEUE" Pos="1014" Strategy="1" VipLevelType="1" VipLevel="0" GroupType="2" Group="GroupID" AgentVar="AgentNo" ExtenVar="AgentExtNo" 
-		NoAgentPos="29" NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点-sc" />
+		 NoFreePos="14" SuccessPos="31" HangupPos="24" Note="排队节点-sc" />
 		<cell Name="CELL_AUDIODTMF" Pos="1015" PlayType="2" ContentType="1" Content="D:\Midware\wav\嘟嘟无人接听.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="24" FailPos="24" HangupPos="24" Note="放节假日音-sc" />
 		
 		<cell Name="CELL_AUDIODTMF" Pos="14" PlayType="1" ContentType="1" Content="D:\Midware\wav\坐席全忙.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
@@ -97,23 +94,10 @@
 		  <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_BRANCH" Pos="701" Var="CalleeID" DefaultPos="1013" Note="排队分支节点">
-			<Branch Value="8001" Pos="7011" /><!--客服组-->
-			<Branch Value="6800" Pos="7012" /><!--市场组-->
-		</cell>
-		<cell Name="CELL_SQL" Pos="7011" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="EXEC P_GetZBDH '%[CallID]',0 " IsSaved="yes" SuccessPos="702" FailPos="24" Note="获取值班电话-客服组" />
-		<cell Name="CELL_SQL" Pos="7012" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr="EXEC P_GetZBDH '%[CallID]',1 " IsSaved="yes" SuccessPos="702" FailPos="24" Note="获取值班电话-市场组" />
-		<cell Name="CELL_RECORDSET" Pos="702" LPos="30" EPos="30" GPos="30" Note="获取值班电话结果">
-			<Map Var="zbdh" />
-		</cell>
-		<cell Name="CELL_TRANSFEROUT" Pos="30" CalleeNumType="2" CalleeNum="zbdh" Timeout="60" SuccessPos="25" FailPos="24" Note="转值班电话" />
-		<!--转值班电话-->
+		
 		
 		<!---->
-		<cell Name="CELL_SQL" Pos="24" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_Anto;Data Source=192.168.209.5" SqlStr=" exec P_OptCallRecords '%[CallerID]','%[CallID]',2,0,'0','','' " IsSaved="no" 
+		<cell Name="CELL_SQL" Pos="24" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_ShuangHui;;Data Source=." 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="结束节点" />