工单，知识库，报表修改，人员修改

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -90,6 +90,14 @@ namespace CallCenterApi.BLL
         }
 
         /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount GetModelUserName(string UserName)
+        {
+            return dal.GetModelUserName(UserName);
+        }
+
+        /// <summary>
         /// 登录得到一个对象实体
         /// </summary>
         public Model.T_Sys_UserAccount LoginGetModel(string F_UserCode, string F_Password)

codegit/CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

@@ -53,7 +53,7 @@ namespace CallCenterApi.DAL
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CusPhone", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_CusPhone", SqlDbType.VarChar,100),
                     new SqlParameter("@F_CusName", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
                     new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
@@ -216,7 +216,7 @@ namespace CallCenterApi.DAL
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CusPhone", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_CusPhone", SqlDbType.VarChar,100),
                     new SqlParameter("@F_CusName", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
                     new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -337,6 +337,31 @@ namespace CallCenterApi.DAL
                 return null;
             }
         }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount GetModelUserName(string UserName)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_Post from T_Sys_UserAccount WITH(NOLOCK)");
+            strSql.Append(" where F_UserName=@F_UserName");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50)
+            };
+            parameters[0].Value = UserName;
+
+            Model.T_Sys_UserAccount model = new Model.T_Sys_UserAccount();
+            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>
         /// 得到一个对象实体

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AddressBookController.cs

@@ -236,6 +236,8 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     dptid = userModel.F_DeptId;
                 }
+                if (userModel.F_See == "5")
+                    return Success("暂无记录");
                 Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
                 DataTable dt = new DataTable();
                 string sql = "F_IsDelete=0 ";
@@ -324,7 +326,9 @@ namespace CallCenterApi.Interface.Controllers
                 if (userModel != null)
                 {
                         dptid = userModel.F_DeptId;
-                }                                                     
+                }
+                if (userModel.F_See == "5")
+                    return Success("暂无记录");
                 Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
                 DataTable dt = new DataTable();
                 string sql = "F_IsDelete=0 ";
@@ -355,6 +359,8 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     dptid = userModel.F_DeptId;
                 }
+                if (userModel.F_See == "5")
+                    return Success("暂无记录");
                 Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
                 DataTable dt = new DataTable();
                 string sql = "and F_IsDelete=0 ";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -274,6 +274,7 @@ namespace CallCenterApi.Interface.Controllers
                             dModel.F_Layer = 2;
                         else if (pdModel.F_Layer == 2)
                             dModel.F_Layer = 3;
+                        dModel.F_ParentName = pdModel.F_DeptName;
                     }
                 }
                 dModel.F_Sort = input.Sort;
@@ -321,6 +322,7 @@ namespace CallCenterApi.Interface.Controllers
                             dModel.F_Layer = 2;
                         else if (pdModel.F_Layer == 2)
                             dModel.F_Layer = 3;
+                        dModel.F_ParentName = pdModel.F_DeptName;
                     }
                 }
                 dModel.F_Sort = input.Sort;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers
             string sql = "";
             if (strcontent != null && strcontent != "")
             {
-                sql = " and( F_ZXZCode like '" + strcontent + "' or F_ZXZName  like '" + strcontent + "'  or F_WHBDKey like '" + strcontent + "%'  or F_WHWDKey  like '" + strcontent + "%'  or F_ZXAtt like '" + strcontent + "'  or F_Des like '" + strcontent + "')";
+                sql = " and( F_ZXZCode like '%" + strcontent + "%' or F_ZXZName  like '%" + strcontent + "%'  or F_WHBDKey like '%" + strcontent + "%'  or F_WHWDKey  like '%" + strcontent + "%'  or F_ZXAtt like '%" + strcontent + "%'  or F_Des like '%" + strcontent + "%')";
             }
             if (strpageindex.Trim() != "")
             {

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

@@ -134,6 +134,7 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     sql += "and F_RoleId=53";
                 }
+                sql += "and F_See!='5'";
                 int recordCount = 0;
                 dt = BLL.PagerBLL.GetListPager(
                                         "T_Sys_UserAccount",
@@ -603,6 +604,7 @@ namespace CallCenterApi.Interface.Controllers
         {
             if (Request.IsAuthenticated)
             {
+            string display = Configs.GetValue("display");
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(CurrentUser.UserData.F_UserId);
                 if (userModel == null)
                     return Error("获取失败");
@@ -613,7 +615,8 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     user = userModel,
                     role = roleModel,
-                    FileUrl = FileUrl
+                    FileUrl = FileUrl,
+                    display= display
                 };
                 return Success("获取成功", obj);
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -125,7 +125,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 if (isdc > 0)
                 {
                     string dccols = "F_Area,F_Office,F_Province,F_City,F_County,F_Name,F_Phone,F_Remarks";
-                    var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Bus_WorkOrder1 where 1=1 " + sql).Tables[0];
+                    var dtdc = DbHelperSQL.Query(" select " + dccols + " from T_Bus_WorkOrder where 1=1 " + sql).Tables[0];
                     string[] dccolnames = new string[] {"大区", "办事处", "省份", "城市", "县/区", "姓名", "电话", "备注" };
                     var msg = new NPOIHelper().ExportToExcel("客户列表", dtdc, dccolnames);
                     if (msg == "")
@@ -516,7 +516,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                 dModel.F_Office = dr["办事处"].ToString();
                                 dModel.F_Province = dr["省份"].ToString();
                                 dModel.F_City = dr["城市"].ToString();
-                                dModel.F_County = dr["县/区"].ToString();
+                                dModel.F_County = dr["区/县"].ToString();
                                 dModel.F_Name = dr["姓名"].ToString();
                                 dModel.F_Phone = dr["电话"].ToString();
                                 dModel.F_Remarks = dr["备注"].ToString();
@@ -621,13 +621,15 @@ namespace CallCenterApi.Interface.Controllers.customer
         //                    if (!string.IsNullOrEmpty(dr["投诉时间"].ToString()))
         //                        try
         //                        {
-        //                            dModel.F_CreateTime = DateTime.Parse("2018年12月" + dr["投诉时间"].ToString());
-        //                            dModel.F_WorkOrderId = DateTime.Parse("2018年12月" + dr["投诉时间"].ToString()).ToString("yyyyMMddHHmmssfff");  //工单编号  
+
+        //                            dModel.F_CreateTime = DateTime.Parse("2019年12月" + dr["投诉时间"].ToString());
+        //                            var a = dModel.F_CreateTime;
+        //                            dModel.F_WorkOrderId = DateTime.Parse("2019年12月" + dr["投诉时间"].ToString()).ToString("yyyyMMddHHmmssfff");  //工单编号  
+        //                            var b = dModel.F_WorkOrderId;
         //                        }
         //                        catch
         //                        {
-        //                            dModel.F_CreateTime = DateTime.Parse("2018年12月26日11时28分" + DateTime.Now.Second + "秒");
-        //                            dModel.F_WorkOrderId = DateTime.Parse("2018年12月26日11时28分" + DateTime.Now.Second + "秒").ToString("yyyyMMddHHmmssfff");
+        //                            return Error("第" + headrow + "行，导入失败<br>");
         //                        }
         //                    try
         //                    {
@@ -637,10 +639,9 @@ namespace CallCenterApi.Interface.Controllers.customer
         //                    {
 
         //                    }
-
         //                    dModel.F_CusName = dr["姓名"].ToString();
         //                    dModel.F_AddRess = dr["地址"].ToString();
-        //                    dModel.F_CusPhone = dr["联系电话"].ToString().Split('、')[0];
+        //                    dModel.F_CusPhone = dr["联系电话"].ToString();
         //                    dModel.F_ProductType = dr["产品代码"].ToString();
         //                    dModel.F_ProductName = dr["产品名称"].ToString();
         //                    dModel.F_Specifications = dr["规格"].ToString();
@@ -648,9 +649,27 @@ namespace CallCenterApi.Interface.Controllers.customer
         //                    dModel.F_Manufacturer = dr["生产厂家"].ToString();
         //                    dModel.F_ProblemCode = dr["问题代码"].ToString();
         //                    dModel.F_QualityProblem = dr["质量问题"].ToString();
-        //                    dModel.F_Notifications = dr["通知人"].ToString();
-        //                    dModel.F_ReceivingPerson = dr["接听人"].ToString();
+        //                    if (!string .IsNullOrEmpty (dr["通知人"].ToString()))
+        //                    {
+        //                        var user = new BLL.T_Sys_UserAccount().GetModelUserName(dr["通知人"].ToString());
+        //                        if (user!=null )
+        //                            dModel.F_Notifications = user.F_UserCode ;
+        //                        else
+        //                            dModel.F_Notifications = dr["通知人"].ToString();
+        //                    }
+        //                    if (!string.IsNullOrEmpty(dr["接听人"].ToString()))
+        //                    {
+        //                        var user = new BLL.T_Sys_UserAccount().GetModelUserName(dr["接听人"].ToString());
+        //                        if (user != null)
+        //                            dModel.F_ReceivingPerson = user.F_UserCode;
+        //                        else
+        //                            dModel.F_ReceivingPerson = dr["接听人"].ToString();
+        //                    }
         //                    dModel.F_DealResult = dr["落实情况"].ToString();
+        //                    dModel.F_Content = "导入工单";
+        //                    dModel.F_BatchNumber = dr["产品编码"].ToString();
+        //                    dModel.F_State = 10;
+
         //                    dModel.F_Type = 2;
         //                    #endregion
         //                    var res = new BLL.T_Bus_WorkOrder().Add(dModel);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeClassController.cs

@@ -133,6 +133,11 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
                     if (sort != "")
                     {
+                    if (double.Parse(sort.Trim()) > 100000)
+                    {
+                        return Error("排序不能过大");
+                    }
+                    else
                         dModel.F_Sort = int.Parse(sort.Trim());
                     }
                     else
@@ -179,6 +184,12 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
                             if (sort.Trim() != "")
                             {
+                            if (double .Parse (sort.Trim())>100000)
+                                {
+                                return Error("排序不能过大");
+                            }
+                            else 
+
                                 dModel.F_Sort = int.Parse(sort.Trim());
                             }
                             if (cname.Trim() != "")

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/IndexBaseController.cs

@@ -105,10 +105,20 @@ namespace CallCenterApi.Interface.Controllers.quality
                 }
                 if (!string.IsNullOrWhiteSpace(sort.Trim()))
                 {
-                    dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                    if (double.Parse(sort.Trim()) > 100000)
+                    {
+                        return Error("排序过大，请重新输入");
+                    }
+                    else
+                        dModel.F_Sort = Convert.ToInt32(sort.Trim());
                 }
                 if (!string.IsNullOrWhiteSpace(score.Trim()))
                 {
+                    if (double .Parse (score.Trim())>100000)
+                    {
+                        return Error("分值过大，请重新输入");
+                    }
+                    else 
                     dModel.F_Score = Convert.ToInt32(score.Trim());
                 }
                 if (!string.IsNullOrWhiteSpace(title.Trim()))
@@ -159,11 +169,21 @@ namespace CallCenterApi.Interface.Controllers.quality
                         }
                         if (!string.IsNullOrWhiteSpace(sort.Trim()))
                         {
-                            dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                            if (double.Parse(sort.Trim()) > 100000)
+                            {
+                                return Error("排序过大，请重新输入");
+                            }
+                            else
+                                dModel.F_Sort = Convert.ToInt32(sort.Trim());
                         }
                         if (!string.IsNullOrWhiteSpace(score.Trim()))
                         {
-                            dModel.F_Score = Convert.ToInt32(score.Trim());
+                            if (double.Parse(sort.Trim()) > 100000)
+                            {
+                                return Error("分值过大，请重新输入");
+                            }
+                            else
+                                dModel.F_Score = Convert.ToInt32(score.Trim());
                         }
                         if (!string.IsNullOrWhiteSpace(title.Trim()))
                         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/QCManageController.cs

@@ -46,7 +46,7 @@ namespace CallCenterApi.Interface.Controllers.quality
 
                 if (phone.Trim() != "")
                 {
-                    sql += " and CallNumber='" + phone + "'";
+                    sql += " and CallNumber like'%" + phone + "%'";
                 }
                 if (usercode.Trim() != "")
                 {
@@ -182,7 +182,7 @@ namespace CallCenterApi.Interface.Controllers.quality
 
                 if (phone.Trim() != "")
                 {
-                    sql += " and CallNumber='" + phone + "'";
+                    sql += " and CallNumber like'%" + phone + "%'";
                 }
                 if (usercode.Trim() != "")
                 {

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

@@ -206,7 +206,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 if (string.IsNullOrEmpty(userModel.groupcode))
                 {
                     //strsql = " and UserId in(select F_UserId from T_Sys_UserAccount where F_DeptId=" + dpt.ToString() + ") ";
-                    strsql += " AND groupcode='" + userModel.groupcode + "' ";
+                   strsql += " AND groupcode='" + userModel.groupcode + "' ";
                 }
 
                 DataSet ds = DbHelperSQL.Query("select *,(select F_UserName from  T_Sys_UserAccount as b where b.F_UserId=a.UserId) as name,(select F_WorkNumber from  T_Sys_UserAccount as b where b.F_UserId=a.UserId) as wknmb from (select COUNT(*) as ct,UserId from T_Call_CallRecords WITH(NOLOCK) where F_QCState=1 " + sqltimeCallRecords + strsql + " group by  UserId) as a order by wknmb asc");

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

@@ -112,10 +112,10 @@ namespace CallCenterApi.Interface.Controllers.report
                 DataColumn dc1 = new DataColumn("月份", Type.GetType("System.String"));
                 DataColumn dc2 = new DataColumn(beginyear + "年客户呼叫数", Type.GetType("System.String"));
                 DataColumn dc3 = new DataColumn(beginyear + "年坐席接听数", Type.GetType("System.String"));
-                DataColumn dc4 = new DataColumn(beginyear + "年接听率", Type.GetType("System.String"));
+                DataColumn dc4 = new DataColumn(beginyear + "年接通率", Type.GetType("System.String"));
                 DataColumn dc5 = new DataColumn(endyear + "年客户呼叫数", Type.GetType("System.String"));
                 DataColumn dc6 = new DataColumn(endyear + "年坐席接听数", Type.GetType("System.String"));
-                DataColumn dc7 = new DataColumn(endyear + "年接听率", Type.GetType("System.String"));
+                DataColumn dc7 = new DataColumn(endyear + "年接通率", Type.GetType("System.String"));
 
                 dtNew.Columns.Add(dc1);
                 dtNew.Columns.Add(dc2);
@@ -139,10 +139,10 @@ namespace CallCenterApi.Interface.Controllers.report
                     drNew["月份"] = (i + 1).ToString() + "月";
                     drNew[beginyear + "年客户呼叫数"] = bkhcall[i];
                     drNew[beginyear + "年坐席接听数"] = bzxjt[i];
-                    drNew[beginyear + "年接听率"] = bjtl[i];
+                    drNew[beginyear + "年接通率"] = bjtl[i];
                     drNew[endyear + "年客户呼叫数"] = ekhcall[i];
                     drNew[endyear + "年坐席接听数"] = ezxjt[i];
-                    drNew[endyear + "年接听率"] = ejtl[i];
+                    drNew[endyear + "年接通率"] = ejtl[i];
                     dtNew.Rows.Add(drNew);
                 }
             }

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

@@ -82,7 +82,7 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc7 = new DataColumn("接通率");
             DataColumn dc8 = new DataColumn("呼损率");
             DataColumn dc9 = new DataColumn("平均排队时间");
-            DataColumn dc10 = new DataColumn("接听通话次数");
+          //  DataColumn dc10 = new DataColumn("接听通话次数");
             DataColumn dc11 = new DataColumn("通话分钟数");
             DataColumn dc13 = new DataColumn("平均接听通话分钟数");
             DataColumn dc14 = new DataColumn("平均振铃秒数");
@@ -106,7 +106,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc7);
             dtNew.Columns.Add(dc8);
             dtNew.Columns.Add(dc9);
-            dtNew.Columns.Add(dc10);
+       //     dtNew.Columns.Add(dc10);
             dtNew.Columns.Add(dc11);
             dtNew.Columns.Add(dc13);
             dtNew.Columns.Add(dc14);
@@ -276,7 +276,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                 izlms = 0;
                             }
                         }
-                        drNew["接听通话次数"] = ijtcs.ToString();
+                      //  drNew["接听通话次数"] = ijtcs.ToString();
                         //drNew["通话分钟数"] = (ithms / 60).ToString();
                         drNew["通话分钟数"] = CallCenter.Utility.DateTimeConvert.parseTimeSeconds(ithms, 0);
                        

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

@@ -78,24 +78,35 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string code, string starttime, string endtime,string productType,string productDate, string batchNumber,string manufacturer,string problemCode,string notifications,string keywords, string dealTimely,int area = 0,int office=0,int duplicate=-1, int see = 0, int source = 0, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10,int isdc=0,int istime=0 )
+        public ActionResult GetList(string code, string starttime, string endtime,string duplicatetime,string endduplicatetime, string productType,string productDate, string batchNumber,string manufacturer,string problemCode,string notifications,string keywords, string dealTimely,int area = 0,int office=0,int duplicate=-1, int see = 0, int source = 0, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10,int isdc=0,int istime=0 )
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
                 string sql = $"  F_IsDelete=0";
+                sql += "and F_Duplicate!=5";
+                string where = "";
+                bool duplica = false;
                 DataTable dt = new DataTable();
                 #region 筛选条件
-                if (type > 0 && type < 5)//工单类型
-                    sql += $" and F_Type=" + type;
+                if (type > 0 && type < 4)//工单类型
+                {
+                    if (type == 1)
+                        sql += $" and (F_Type=" + type + "or F_Duplicate in(1))";
+                    else if (type == 2)
+                        sql += $" and (F_Type=" + type + "or (F_Duplicate in(2,0)and F_Type=3))";
+                    else
+                        sql += $" and F_Type=" + type;
+                }
+                    
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
                 if (area > 0)//大区
                     sql += $" and F_Area=" + area;
                 if (office > 0)//办事处
                     sql += $" and F_Office=" + office;
-                if (duplicate >= 0)//办事处
-                    sql += $" and F_Duplicate=" + duplicate;
+                if (duplicate >= 0)
+                    sql += $" and F_Type=" + 3;
                if (!string.IsNullOrWhiteSpace(productType))//产品代码
                     sql += $" and F_ProductType = '" + productType.Trim() + "'";
                 if (!string.IsNullOrWhiteSpace(productDate))//生产日期
@@ -114,6 +125,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and datediff(day,F_CreateTime,'" + starttime + "')<=0 ";
                 if (!string.IsNullOrEmpty(endtime))
                     sql += " and datediff(day,F_CreateTime,'" + endtime + "')>=0   ";
+
+
+                if (!string.IsNullOrEmpty(duplicatetime))
+                {
+                    
+                    duplica = true;
+                    sql += $" and F_Type=" + 3;
+                    where += " and datediff(day,F_CreateTime,'" + duplicatetime + "')<=0 ";
+                }
+                if (!string.IsNullOrEmpty(endduplicatetime))
+                {
+                    duplica = true;
+                    sql += $" and F_Type=" + 3;
+                    where += " and datediff(day,F_CreateTime,'" + endduplicatetime + "')>=0   ";
+                }
+
+
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and ( F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -191,6 +219,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                     }
                 }
+                if (duplica)
+                {
+                    if (GetDuplica(where) != null)
+                        sql += "AND F_Id in(" + GetDuplica(where) + ")";
+                    else
+                        return Success("暂无工单");
+                }
                 #endregion
                 string str = "";
                 string sql1 = "";
@@ -253,7 +288,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         drNew["通知人"] = it.F_Notifications;
                         drNew["接听人"] = it.F_ReceivingPerson;
                         drNew["落实情况"] = it.F_ImplementationSituation;
-                        drNew["重复投诉日期"] = it.F_CreateTime;
+                        var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='1' and F_ItemType=" + 11 + " and  F_WoID=" + it.F_Id  + " ").FirstOrDefault ();
+                        if (itemlast!=null )
+                        drNew["重复投诉日期"] = itemlast.F_CreateTime ;
                         dt.Rows.Add(drNew);
                         #endregion
                     }
@@ -293,7 +330,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     dt.Columns.Add("落实情况");
                     dt.Columns.Add("处理进度");
                     dt.Columns.Add("工单类别");
-                    dt.Columns.Add("重复工单");
+                    
                     #endregion
                     foreach (var it in depts)
                     {
@@ -326,7 +363,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["办事处"]  = "";
                             }
                         }
-                        drNew["投诉时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("dd日HH时mm分");//
+                        drNew["投诉时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy年MM月dd日HH时mm分");//
                         drNew["序号"] = it.F_SerialNumber;//
                         drNew["姓名"] = it.F_CusName;//姓名
                         drNew["地址"] = it.F_AddRess;//地址
@@ -375,12 +412,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             drNew["处理进度"] = "已完结";
                         if (it .F_Type==1)
                         drNew["工单类别"] = "咨询";
-                        else
+                        else if(it.F_Type == 2)
                             drNew["工单类别"] = "投诉";
-                        if (it .F_Duplicate==0)
-                        drNew["重复工单"] = "未重复";
-                        else
-                            drNew["重复工单"] = "重复";
+                        else 
+                           drNew["工单类别"] = "重复";
                         dt.Rows.Add(drNew);
                         #endregion
                     }
@@ -407,7 +442,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             "F_Id",
                             "*",
                             sql,
-                            "ORDER BY T_Bus_WorkOrder.F_Id desc",
+                            "ORDER BY T_Bus_WorkOrder.F_CreateTime desc",
                             pagesize,
                             pageindex,
                             true,
@@ -529,7 +564,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.F_OfficName = it.F_Office;
                     }
                 }
-                model.F_CreateTime = DateTime .Parse (it.F_CreateTime.ToString ()).ToString ("dd日HH时mm分")  ;//投诉时间
+                model.F_CreateTime = DateTime .Parse (it.F_CreateTime.ToString ()).ToString ("yyyy年MM月dd日HH时mm分")  ;//投诉时间
                 model.F_DealTimely = it.F_DealTimely;//重要级别
                 model.F_Reason = it.F_Reason;//重要级别原因
                 model.F_SerialNumber = it.F_SerialNumber;//序号
@@ -577,6 +612,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return Input;
         }
         /// <summary>
+        /// 获取高层审批
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public string GetDuplica(string time)
+        {
+            string str = string.Empty;
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where   F_ItemType=" + 11 + time;
+            return str;
+        }
+        /// <summary>
         /// 注解
         /// </summary>
         /// <param name="orderid"></param>
@@ -614,7 +660,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return Error("无操作权限");
         }
         /// <summary>
-        /// 注解
+        /// 标记重复工单
         /// </summary>
         /// <param name="orderid"></param>
         /// <param name="cont"></param>
@@ -639,12 +685,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (isbj==1)
                         {
-                            model.F_Duplicate = 1;
+                            model.F_Duplicate = model.F_Type;
+                           model.F_Type  = 3;
                         }
                         var res = workorderBLL.Update(model);
                         if (res)
                         {
-                            AddLog(model.F_Id, (int)model.F_State , deptname + ua.F_UserName + "标记重复工单", 0, 0, "",0 ,ua,1);
+                            AddLog(model.F_Id, (int)model.F_State , deptname + ua.F_UserName + "标记重复工单", 11, 11, "",0 ,ua,1);
                             return Success("标记重复成功");
                         }
                           
@@ -737,7 +784,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 int userId = CurrentUser.UserData.F_UserId;
                 Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
-                if (!(input.F_Type > 0 && input.F_Type < 3))
+                if (!(input.F_Type > 0 && input.F_Type < 4))
                     return Error("工单类型错误！");
                 if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入来电人姓名！");
@@ -802,7 +849,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
                 if (input.F_Id <= 0)
                     return Error("参数错误！");
-                if (!(input.F_Type > 0 && input.F_Type < 3))
+                if (!(input.F_Type > 0 && input.F_Type < 4))
                     return Error("工单类型错误！");
                 if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入来电人姓名！");
@@ -869,8 +916,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                         if (!string.IsNullOrEmpty(idd.Trim()))
                         {
-                            if (itembll.DeleteList(idd.TrimEnd(',')))
-                            {
+                           
                                 if (workorderBLL.DeleteList(idd.TrimEnd(',')))
                                 {
 
@@ -881,11 +927,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     return Error("设置失败");
                                 }
-                            }
-                            else
-                            {
-                                return Error("设置失败");
-                            }
+                            
 
                         }
                         else
@@ -1288,7 +1330,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_Type = input.F_Type;//工单类型1咨询2投诉
             model.F_Area = input.F_Area;//大区
             model.F_Office = input.F_Office;//办事处
-            model.F_DealTimely = input.F_DealTimely;// 重要级别1红色2绿色3普通工单
+            if (!string.IsNullOrEmpty(input.F_DealTimely))
+                model.F_DealTimely = input.F_DealTimely;// 重要级别1红色2绿色3普通工单
+            else
+                model.F_DealTimely = "普通工单";
             model.F_Reason = input.F_Reason;// 重要级别原因
             model.F_CusName = input.F_CusName;//来电人姓名
             model.F_CusPhone = input.F_CusPhone;//来电人电话
@@ -1302,7 +1347,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_ProblemCode = input.F_ProblemCode;//问题代码
             model.F_QualityProblem = input.F_QualityProblem;//质量问题
         //    model.F_ImplementationSituation = input.F_ImplementationSituation;//落实情况
-            model.F_Duplicate = input.F_Duplicate;//是否重复工单0否1是
+            model.F_Duplicate = 0;//是否重复工单0否1是
             model.F_Content = input.F_Content;//备注
             #endregion
             if (type == 1)