提交高新区代码

codegit/CallCenterApi/CallCenterApi.BLL/T_Rec_RegRecordsCallOut.cs

@@ -51,9 +51,9 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 更新数据状态
         /// </summary>
-        public bool Update(string id)
+        public bool Update(string id,string callid)
         {
-            return dal.Update(id);
+            return dal.Update(id, callid);
         }
 
         /// <summary>
@@ -71,10 +71,18 @@ namespace CallCenterApi.BLL
             return dal.Update2(userid, phone);
         }
 
-            /// <summary>
-            /// 删除一条数据
-            /// </summary>
-            public bool Delete(int F_ID)
+
+        /// <summary>
+        /// 挂断电话 可继续拨打电话
+        /// </summary>
+        public bool Update3(int id)
+        {
+            return dal.Update3(id);
+        }
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_ID)
         {
 
             return dal.Delete(F_ID);

codegit/CallCenterApi/CallCenterApi.DAL/T_Rec_RegRecordsCallOut.cs

@@ -299,10 +299,10 @@ parameters[22].Value = model.F_UnitOffice;
         /// <summary>
         /// 开始电话
         /// </summary>
-        public bool Update(string id)
+        public bool Update(string id,string F_CallId)
         {    
 
-            int rows = DbHelperSQL.ExecuteSql("update T_Rec_RegRecordsCallOut set F_RecCode='1' where F_RecCode='0' AND F_Id=" + id);
+            int rows = DbHelperSQL.ExecuteSql(string.Format("update T_Rec_RegRecordsCallOut set F_RecCode='1',F_CallId='{0}' where F_RecCode='0' AND F_Id={1}", F_CallId, id));
 
             if (rows > 0)
             {
@@ -332,6 +332,24 @@ parameters[22].Value = model.F_UnitOffice;
         }
 
         /// <summary>
+        /// 挂断电话 可继续拨打电话
+        /// </summary>
+        public bool Update3(int id)
+        {
+            int rows = DbHelperSQL.ExecuteSql(string.Format("update T_Rec_RegRecordsCallOut set F_RecCode='2' where   F_Id={0} ", id));
+
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+        /// <summary>
         /// 删除一条数据
         /// </summary>
         public bool Delete(int F_ID)

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

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

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

@@ -20,7 +20,7 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             int userid = CurrentUser.UserData.F_UserId;
             if (userid == 0)
                 return Error("用户信息获取失败，请重新登录");
-            string sql = string.Format(" and F_CreateBy =(select F_Mobile from T_Sys_UserAccount where  F_UserId={0} and F_RecCode<2)", userid);
+            string sql = string.Format(" and F_CreateBy =(select F_Mobile from T_Sys_UserAccount where  F_UserId={0} and F_RecCode=0)", userid);
             DataTable dt = new DataTable();
             int recordCount = 0;
 
@@ -139,13 +139,13 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
 
         }
 
-        public ActionResult Update(string id)
+        public ActionResult Update(string id,string callid="")
         {
             if (!Request.IsAuthenticated)
                 return NoToken("未知错误，请重新登录");
             if (id != null && id.Length > 0)
             {
-                if (new BLL.T_Rec_RegRecordsCallOut().Update(id))
+                if (new BLL.T_Rec_RegRecordsCallOut().Update(id, callid))
                 {
                     return Success("成功");
                 }
@@ -180,6 +180,26 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
         }
 
 
+        //挂断电话
+        public ActionResult Update3(int id)
+        {
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            int userid = CurrentUser.UserData.F_UserId;
+            if (userid == 0)
+                return Error("用户信息获取失败，请重新登录");
+
+            if (new BLL.T_Rec_RegRecordsCallOut().Update3(id))
+            {
+                return Success("成功");
+            }
+            else
+                return Success("失败");
+
+
+        }
+
+
 
         public ActionResult Update0(string id)
         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/api/SetController.cs

@@ -51,14 +51,14 @@ namespace CallCenterApi.Interface.Controllers.api
 
 
 
-            #region  验证1分钟内是否重复添加
+            #region  验证0.1分钟内是否重复添加
 
-            int n=dBLL.GetRecordCount(string.Format(" F_userPhone ='{0}' and datediff(ss,getdate(),F_CreateOn) <= 60", dModel.F_userPhone));
+            //int n = dBLL.GetRecordCount(string.Format(" F_userPhone ='{0}' and datediff(ss,F_CreateOn,getdate()) <= 5", dModel.F_userPhone));
 
-            if (n > 0)
-            {
-                return Error("频率太高，请稍后再试");
-            }
+            //if (n > 0)
+            //{
+            //    return Error("频率太高，请稍后再试");
+            //}
             #endregion
 
             //dModel.F_Tel = tel;

ivr/IVR_GXQ.xml

@@ -48,7 +48,7 @@
 		</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="11" Note="判断节假日" />
 		<cell Name="CELL_AUDIODTMF" Pos="11" PlayType="2" ContentType="1" Content="D:\wav\GXQ\下班欢迎词.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
-		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="24" FailPos="24" HangupPos="24" Note="放节假日音" />
+		TTSEngine="0" StopWhenDtmf="1" MaxKeyCount="1" KeyPressInterval="3" FinishKey="#" KeyVar="" SuccessPos="11" FailPos="11" HangupPos="24" Note="放节假日音" />
 		<!--节假日-->