调整分配任务，只能分配启动中的任务

我的任务、我的任务结果、任务结果 增加时间搜索
调整工单接口
ivr提交

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -572,10 +572,18 @@ namespace CallCenterApi.Interface.Controllers.callout
             StringBuilder sb = new StringBuilder();
 
             sb.Append(" and F_FPState=0 and F_DeleteFlag=0 ");
+            var sql = "";
             if (!string.IsNullOrWhiteSpace(key))
             {
-                sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' and F_IsStart=1 and F_DeleteFlag=0 ) ");
+                sql += " and F_Phone='" + key + "' or  F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%'";
             }
+            sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where  F_IsStart=1 and F_DeleteFlag=0 " + sql + " ) ");
+            #region 20180612 zhengbingbing 需要调整部分语句必须执行
+            //if (!string.IsNullOrWhiteSpace(key))
+            //{
+            //    sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' and F_IsStart=1 and F_DeleteFlag=0 ) ");
+            //}
+            #endregion
             int userid = CurrentUser.UserData.F_UserId;
             string username = CurrentUser.UserData.F_UserName;
             #region 按数量平均分配
@@ -763,7 +771,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Success("获取成功", obj);
         }
         //获取我的任务列表
-        public ActionResult GetMyTaskList(string key, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetMyTaskList(string key, string sdate, string edate, int pagesize = 10, int pageindex = 1)
         {
             StringBuilder sb = new StringBuilder();
             int userid = CurrentUser.UserData.F_UserId;
@@ -778,6 +786,16 @@ namespace CallCenterApi.Interface.Controllers.callout
             {
                 sb.Append(" and F_Phone like '%" + key.Trim() + "%'");
             }
+            #region 增加时间搜索
+            if (!string.IsNullOrWhiteSpace(sdate))
+            {
+                sb.Append(" and datediff(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
+            }
+            if (!string.IsNullOrWhiteSpace(edate))
+            {
+                sb.Append(" and datediff(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
+            }
+            #endregion
             //string sqlwhere = "";
             //if (!string.IsNullOrWhiteSpace(key))
             //{
@@ -805,7 +823,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Content(obj.ToJson());
         }
         //获取我的任务结果
-        public ActionResult GetMyResultList(string key, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetMyResultList(string key, string sdate, string edate, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
         {
             StringBuilder sb = new StringBuilder();
             int userid = CurrentUser.UserData.F_UserId;
@@ -828,6 +846,16 @@ namespace CallCenterApi.Interface.Controllers.callout
             {
                 sb.Append(" and F_Phone like '%" + key.Trim() + "%'");
             }
+            #region 增加时间搜索
+            if (!string.IsNullOrWhiteSpace(sdate))
+            {
+                sb.Append(" and datediff(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
+            }
+            if (!string.IsNullOrWhiteSpace(edate))
+            {
+                sb.Append(" and datediff(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
+            }
+            #endregion
             //string sqlwhere = "";
             //if (!string.IsNullOrWhiteSpace(key))
             //{
@@ -867,7 +895,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Content(obj.ToJson());
         }
         //获取总体任务结果
-        public ActionResult GetResultList(string key, int userid = 0, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetResultList(string key, string sdate, string edate, int userid = 0, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
         {
             StringBuilder sb = new StringBuilder();
             #region 查询条件
@@ -892,6 +920,16 @@ namespace CallCenterApi.Interface.Controllers.callout
             {
                 sb.Append(" and F_Phone like '%" + key.Trim() + "%'");
             }
+            #region 增加时间搜索
+            if (!string.IsNullOrWhiteSpace(sdate))
+            {
+                sb.Append(" and datediff(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
+            }
+            if (!string.IsNullOrWhiteSpace(edate))
+            {
+                sb.Append(" and datediff(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
+            }
+            #endregion
             //string sqlwhere = "";
             //if (!string.IsNullOrWhiteSpace(key))
             //{

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

@@ -152,6 +152,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                         string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
                         string strisreward = HttpUtility.UrlDecode(RequestString.GetQueryString("isreward"));
+                        string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));
                         string strpageindex = RequestString.GetQueryString("page");
                         int pageindex = 1;
                         string strpagesize = RequestString.GetQueryString("pagesize");
@@ -228,6 +229,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             sql += " and ISReward=" + strisreward.Trim();
                         }
+                        #region 针对已参与工单增加状态搜索
+                        //20180612 zhengbingbing
+                        if (strstate.Trim() != "" && strstate != "undefined")
+                        {
+                            if (strstate.Trim() == "0")
+                                sql += " and State <> '2' ";
+                            else
+                                sql += " and State = '2' ";
+                        }
+                        #endregion
                         #endregion
                         if (strpageindex.Trim() != "")
                         {

ivr/IVR_XXDC.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ivr>
-	<flow Name="IVR_XXDC" Type="normal" MatchedNum="." MatchedLine="|-1|" Concurrency="1">
+	<flow Name="IVR_RZMD" Type="normal" MatchedNum="." MatchedLine="|-1|" Concurrency="1">
 		<cell Name="CELL_START" Pos="1" Next="2" Note="开始节点" />
 		<cell Name="CELL_SQL" Pos="2" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_XiXianDC;Data Source=192.168.1.2" 
 		SqlStr="INSERT INTO T_Call_CallRecords(CallId,CallNumber,CallType,CallState,DealType,BeginTime,IvrStartTime,IvrEndTime,EndTime,LongTime,IsDeal,OperateType,MYD) VALUES('%[CallID]','%[CallerID]',0,0,0,GETDATE(),GETDATE(),GETDATE(),GETDATE(),0,0,0,0)" 
@@ -92,8 +92,6 @@
 			<Map Var="zbdh" />
 		</cell>
 		<cell Name="CELL_TRANSFEROUT" Pos="30" CalleeNumType="1" CalleeNum="zbdh" Timeout="60" SuccessPos="25" FailPos="24" Note="转值班电话" />
-		<!--20170515:::13523455559-->
-		<!--20170510:::13523455555-->
 		<!--转值班电话-->
 	</flow>		
 </ivr>