3.29发布的营业部热点汇总报表的合计； 营业部任务汇总表 列表的数据 多了一个客服部 ； 呼叫明细报表的问题登记不关联工单，要的是问卷中填的问答题的答案； 待处理工单 搜索去掉客户姓名和反映问题；加一个坐席姓名筛选框；（usercode）； 处理工单的时候去掉回访反馈内容；呼叫明细列表和报表 去掉是否处理这一列；

codegit/CallCenterApi/CallCenterApi.DAL/T_TypeResult.cs

@@ -63,9 +63,9 @@ namespace CallCenterApi.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_TypeResult(");
-			strSql.Append("F_PhoneID,F_typeName1,F_typeValue1,F_typeName2,F_typeValue2,F_typeName3,F_typeValue3,F_typeName4,F_typeValue4,F_typeName5,F_typeValue5,F_typeName6,F_typeValue6,F_CreateOn,F_userId)");
+			strSql.Append("F_PhoneID,F_typeName1,F_typeValue1,F_typeName2,F_typeValue2,F_typeName3,F_typeValue3,F_typeName4,F_typeValue4,F_typeName5,F_typeValue5,F_typeName6,F_typeValue6,F_typeName7,F_typeValue7,F_CreateOn,F_userId)");
 			strSql.Append(" values (");
-			strSql.Append("@F_PhoneID,@F_typeName1,@F_typeValue1,@F_typeName2,@F_typeValue2,@F_typeName3,@F_typeValue3,@F_typeName4,@F_typeValue4,@F_typeName5,@F_typeValue5,@F_typeName6,@F_typeValue6,@F_CreateOn,@F_userId)");
+			strSql.Append("@F_PhoneID,@F_typeName1,@F_typeValue1,@F_typeName2,@F_typeValue2,@F_typeName3,@F_typeValue3,@F_typeName4,@F_typeValue4,@F_typeName5,@F_typeValue5,@F_typeName6,@F_typeValue6,@F_typeName7,@F_typeValue7,@F_CreateOn,@F_userId)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_PhoneID", SqlDbType.Int,4),
@@ -81,7 +81,11 @@ namespace CallCenterApi.DAL
 					new SqlParameter("@F_typeValue5", SqlDbType.NVarChar,50),
 					new SqlParameter("@F_typeName6", SqlDbType.NVarChar,50),
 					new SqlParameter("@F_typeValue6", SqlDbType.NVarChar,50),
-					new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
+
+                        new SqlParameter("@F_typeName7", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_typeValue7", SqlDbType.NVarChar,1000),
+
+                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
                 new SqlParameter("@F_userId", SqlDbType.NVarChar,50)};
 			parameters[0].Value = model.F_PhoneID;
 			parameters[1].Value = model.F_typeName1;
@@ -96,8 +100,13 @@ namespace CallCenterApi.DAL
 			parameters[10].Value = model.F_typeValue5;
 			parameters[11].Value = model.F_typeName6;
 			parameters[12].Value = model.F_typeValue6;
-			parameters[13].Value = model.F_CreateOn;
-            parameters[14].Value = model.F_userId;
+
+            parameters[13].Value = model.F_typeName7;
+            parameters[14].Value = model.F_typeValue7;
+
+
+            parameters[15].Value = model.F_CreateOn;
+            parameters[16].Value = model.F_userId;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)

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

@@ -306,17 +306,17 @@ namespace CallCenterApi.Interface.Controllers.callout
 
                                             #endregion
 
-                                            #region 查重
-                                            string strwhere = " F_TaskId='" + taskid + "' and F_Phone='" + modelPhoneImport.F_Phone + "' and F_DeleteFlag=0";
-                                            DataSet ds = bll.GetList(strwhere);
-                                            if (ds != null && ds.Tables.Count > 0)
-                                            {
-                                                if (ds.Tables[0].Rows.Count > 0)
-                                                {
-                                                    continue;
-                                                }
-                                            }
-                                            #endregion
+                                            //#region 查重
+                                            //string strwhere = " F_TaskId='" + taskid + "' and F_Phone='" + modelPhoneImport.F_Phone + "' and F_DeleteFlag=0";
+                                            //DataSet ds = bll.GetList(strwhere);
+                                            //if (ds != null && ds.Tables.Count > 0)
+                                            //{
+                                            //    if (ds.Tables[0].Rows.Count > 0)
+                                            //    {
+                                            //        continue;
+                                            //    }
+                                            //}
+                                            //#endregion
 
                                             int rmw = otnBLL.Add(modelPhoneImport);
                                             if (rmw > 0)
@@ -1675,7 +1675,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         #endregion
 
 
-        public ActionResult AddAnswers(int phoneid,string F_typeName1,string F_typeName2, string F_typeName3, string F_typeName4, string F_typeName5, string F_typeName6,string  value1, string value2, string value3, string value4, string value5, string value6)
+        public ActionResult AddAnswers(int phoneid,string F_typeName1,string F_typeName2, string F_typeName3, string F_typeName4, string F_typeName5, string F_typeName6,string  value1, string value2, string value3, string value4, string value5, string value6, string F_TypeName7,string value7)
         {
 
             Model.T_TypeResult remodel = new Model.T_TypeResult();
@@ -1687,12 +1687,15 @@ namespace CallCenterApi.Interface.Controllers.callout
             remodel.F_typeName5 = F_typeName5;
             remodel.F_typeName6 = F_typeName6;
 
+            remodel.F_typeName7 = F_TypeName7;
+
             remodel.F_typeValue1 = value1;
             remodel.F_typeValue2 = value2;
             remodel.F_typeValue3 = value3;
             remodel.F_typeValue4 = value4;
             remodel.F_typeValue5 = value5;
             remodel.F_typeValue6 = value6;
+            remodel.F_typeValue7 = value7;
             remodel.F_userId = CurrentUser.UserData.F_UserId.ToString();
 
             BLL.T_TypeResult bll = new BLL.T_TypeResult();

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

@@ -157,6 +157,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string state = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));
             string strinfotype = HttpUtility.UrlDecode(RequestString.GetQueryString("infotype"));
             string strpageindex = RequestString.GetQueryString("page");
+
+            string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
+
+
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
@@ -165,8 +169,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
             switch (strltype)
             {
                 case "0"://待处理和处理中
-                         //sql += " and State ='0' and CreateUser= '" + ua.F_UserCode + "' ";
-                    sql += " and (( State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(CurrentUser.UserData.F_UserCode) + "')) )";
+                    sql += " and State!=2 and AuditUser like '%" + CurrentUser.UserData.F_UserCode + "%'";
+                    //sql += " and State ='0' and CreateUser= '" + ua.F_UserCode + "' ";
+                    //  sql += " and (( State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(CurrentUser.UserData.F_UserCode) + "')) )";
                     // sql += " and (State ='0' or State ='1' or( State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(CurrentUser.UserData.F_UserCode) + "')) )";
                     break;
                 case "1"://已完成的
@@ -223,6 +228,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 sql += " and InfoTypeID = '" + strinfotype.Trim() + "' ";
             }
+
+            if (strusercode.Trim() != "" && strusercode != "undefined")
+            {
+                sql += " and CreateUser = '" + strusercode.Trim() + "' ";
+            }
+
             #endregion
             if (strpageindex.Trim() != "")
             {
@@ -274,7 +285,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
             switch (strltype)
             {
                 case "0"://待处理 
-                    sql += " and (( State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID(CurrentUser.UserData.F_UserCode) + "')) )";
+                   
+                    sql += " and State!=2 and AuditUser like '%" + CurrentUser.UserData.F_UserCode + "%'";
+                  //  sql += " and (( State ='1' and WorkOrderID in ( '" + GetDWCWorkOrderID() + "')) )";
                     msg = "待处理工单数量";
                     break;
                

codegit/CallCenterApi/CallCenterApi.Model/T_TypeResult.cs

@@ -40,9 +40,31 @@ namespace CallCenterApi.Model
 		private string _f_typevalue5;
 		private string _f_typename6;
 		private string _f_typevalue6;
+
+        private string _f_typename7;
+        private string _f_typevalue7;
+
         private string _f_userid;
         private DateTime? _f_createon= DateTime.Now;
 
+
+        public string F_typeName7
+        {
+            set { _f_typename7 = value; }
+            get { return _f_typename7; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_typeValue7
+        {
+            set { _f_typevalue7 = value; }
+            get { return _f_typevalue7; }
+        }
+
+
+
+
         public string F_userId
         {
             set { _f_userid = value; }