禅道bug

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

@@ -218,7 +218,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="tab"></param>
         /// <param name="parentid"></param>
         /// <returns></returns>
-        private List<Model.TreeModel> BindAssignTree(DataTable tab, string parentid)
+        private List<Model.TreeModel> BindAssignTree(DataTable tab, string parentid,int type)
         {
             DataTable tab2 = new DataTable();
 
@@ -235,10 +235,15 @@ namespace CallCenterApi.Interface.Controllers
                     model.IconCls = "";//图标
                     model.text = categorylist[i].F_DeptName;
                     model.headerid = categorylist[i].F_Header ?? 0;    //部门权限范围：9全部，1区域，2项目，3期
-                    tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_State=1 and F_Layer=0").Tables[0];
+                    string msg = "";
+                    if (type ==0)
+                    {
+                        msg = " and F_Layer=0";
+                    }
+                    tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_State=1"+ msg).Tables[0];
                     if (tab2 != null && tab2.Rows.Count > 0)
                     {
-                        model.children = BindAssignTree(tab2, currentID);
+                        model.children = BindAssignTree(tab2, currentID, type);
                     }
                     modelList.Add(model);
                 }
@@ -255,7 +260,7 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取部门列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetAssignDeptList(int pId = 0, string keywords = "")
+        public ActionResult GetAssignDeptList(int pId = 0, string keywords = "",int type=0)
         {
             //if (Request.IsAuthenticated)
             //{
@@ -272,7 +277,7 @@ namespace CallCenterApi.Interface.Controllers
             {
                 dt = new BLL.T_Sys_Department().GetList(" F_State=1 and F_ParentId=" + pId).Tables[0];
             }
-            List<Model.TreeModel> modelList = BindAssignTree(dt, "0");
+            List<Model.TreeModel> modelList = BindAssignTree(dt, "0", type);
             if (modelList != null)
             {
                 if (modelList.Count > 0)

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

@@ -452,7 +452,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
                         + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
                 }
-                string str = "SELECT  F_Expand1 AS '所属分类',F_Title AS '标题',F_Description AS '关键字',F_Content AS '内容' FROM dbo.T_RepositoryInformation where 1=1 " + sql + " ORDER BY F_RepositoryId desc";
+                string str = "SELECT  F_Expand1 AS '所属分类',F_Title AS '标题',F_KeyWords AS '关键字',F_Content AS '内容' FROM dbo.T_RepositoryInformation where 1=1 " + sql + " ORDER BY F_RepositoryId desc";
                 dt = DbHelperSQL.Query(str).Tables[0];
                 foreach (DataRow dr in dt.Rows)
                 {
@@ -496,6 +496,122 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         /// 上传base64图片
         /// </summary>
         /// <returns></returns>
+        public ActionResult UploadBase64(string[] dataurl)
+        {
+
+            string stropenid = HttpUtility.UrlDecode(RequestString.GetFormString("openid"));
+            #region 保存文件到本地路径
+            DataTable FileUrl = new DataTable();
+           var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+           
+            //string dataurl = HttpUtility.UrlDecode(RequestString.GetFormString("dataurl"));
+            //  string dataurl = RequestString.GetFormString("dataurl");
+            List<Model.T_Sys_Accessories> acs = new List<Model.T_Sys_Accessories>();
+            if (dataurl != null)
+            {
+               for (int i=0;i< dataurl.Length;i ++)
+                {
+                    string path = "/Upload/APP/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
+                    Random Rdm = new Random();
+                    string filename = DateTime.Now.ToString("yyyyMMddHHmmssfff") + i+ ".jpg";
+                    ImageUpload iu = new ImageUpload();
+                    iu.SavePath = path;
+                    iu.DataUrl = dataurl[i ];
+                 //   iu.IsCreateImg = false;
+                   
+                    if (!string.IsNullOrEmpty(filename))
+                    {
+                        iu.SaveType = 1;
+                        iu.InFileName = filename;
+                    }
+                    iu.Upload64();
+
+                    if (!string.IsNullOrEmpty(iu.SavePath))
+                    {
+                        uploadFile upfile = new uploadFile();
+                        //通过读取配置文件，获取数据库
+                        string _ftp = Configs.GetValue("ftp");
+                        string _acc = Configs.GetValue("account");
+                        string _pwd = Configs.GetValue("password");
+                        upfile.ftpPath = _ftp;
+                        upfile.ftpUserID = _acc;
+                        upfile.ftpPassword = _pwd;
+                        //20180207 原文件同时保存
+                        string uploadBeforres = upfile.UploadLocalToFtp(iu.SavePath + filename);
+                        int n = iu.Error;
+                        if (n == 0)
+                        {
+                            path = path + iu.OutFileName;
+                            Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                            model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                            model_T_Sys_Accessories.F_FileName = filename;//附件名称
+                            model_T_Sys_Accessories.F_FileType = ".jpg";//附件类型
+                            model_T_Sys_Accessories.F_FileUrl = (filename).Replace('\\', '/');//附件地址
+                            model_T_Sys_Accessories.F_Size = iu.FileSize;
+                            model_T_Sys_Accessories.F_UserCode = stropenid;//上传人  
+                            model_T_Sys_Accessories.F_OriName = filename;
+                            int fid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                            #endregion
+                            model_T_Sys_Accessories.F_FileId = fid;//修改为返回对象以便查看图片
+                            acs.Add(model_T_Sys_Accessories);
+                        }
+                        else
+                        {
+                            string msg = string.Empty;
+                            switch (n)
+                            {
+                                case 1: msg = "请选择要上传的文件"; break;
+                                case 2: msg = "上传的文件类型不支持"; break;
+                                case 3: msg = "上传的文件过大"; break;
+                                case 4: msg = "未知错误"; break;
+
+                            }
+                            return Error(msg);
+                        }
+                    }
+                    else
+                        return Error("格式修改出错，请重新上传");
+                }
+              string    mag = "";
+               if (acs !=null )
+                {
+                    foreach (var it in acs)
+                    {
+                        if (mag == "")
+                        {
+                            mag = it.F_FileId+"";
+                        }
+                        else
+                        {
+                            mag = mag+"," +it.F_FileId ;
+                        }
+                    }
+                }
+               if (mag!="")
+                {
+                    FileUrl = GetFileData(mag, configfj.F_ParamValue);
+                }
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    acs,
+                    FileUrl,
+                };
+                return Content(obj.ToJson());
+              
+
+
+            }
+
+            return Error("请选择要上传的文件");
+
+        }
+
+        /// <summary>
+        /// 上传base64图片
+        /// </summary>
+        /// <returns></returns>
         public ActionResult Upload64()
         {
  

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

@@ -284,7 +284,9 @@ namespace CallCenterApi.Interface.Controllers.report
                 markets.Add(brand);
             }
 
+        
 
+          //  return Content(obj.ToJson()); ;
             return Success("获取成功", markets);
         }
         /// <summary>
@@ -1807,7 +1809,9 @@ namespace CallCenterApi.Interface.Controllers.report
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        public ActionResult ExptPrescriptionList(string stime, string endtime, string salesBase, string channel)
+        public ActionResult ExptPrescriptionList(string stime, string endtime, string salesBase, string channel ,string
+
+question)
         {
 
             string sql = $"  F_IsDelete=0";
@@ -1818,6 +1822,10 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
             }
+            if (!string.IsNullOrEmpty(question))
+            {
+                sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'" + question + "'") + "') "; ;
+            }
             if (endtime != null && endtime.Trim() != "")
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";

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

@@ -109,10 +109,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);
@@ -136,10 +136,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/ZuoXiManYiDuController.cs

@@ -50,7 +50,7 @@ namespace CallCenterApi.Interface.Controllers.report
             if (Request.IsAuthenticated)
             {
                 NPOIHelper npoi = new NPOIHelper();
-                DataTable dt = getData(stime, endtime);
+                DataTable dt = getData(stime, endtime,1);
                 if (npoi.ExportToExcel("坐席满意度评价情况", dt) == "")
                 {
                     return Success("导出成功");
@@ -63,7 +63,7 @@ namespace CallCenterApi.Interface.Controllers.report
             return res;
         }
 
-        private DataTable getData(string stime, string endtime)
+        private DataTable getData(string stime, string endtime,int type=0)
         {
             DataTable dtNew = new DataTable();
             #region
@@ -128,24 +128,50 @@ namespace CallCenterApi.Interface.Controllers.report
                     body.Add(UNDN[1], bodylist);
                 }
             }
-            foreach (string key in body.Keys)
+            if (type ==0)
             {
-                DataRow dr = dtNew.NewRow();
-                int count = body[key].Count;
-                foreach (List<string> listiteam in body[key])
+                foreach (string key in body.Keys)
                 {
-                    dr["坐席姓名"] = listiteam[0].ToString();
-                    dr["非常满意"] = listiteam[1].ToString();
-                    dr["非常满意占比"] = listiteam[2].ToString();
-                    dr["基本满意"] = listiteam[3].ToString();
-                    dr["基本满意占比"] = listiteam[4].ToString();
-                    dr["不满意"] = listiteam[5].ToString();
-                    dr["不满意占比"] = listiteam[6].ToString();
-                    dr["未评价"] = listiteam[7].ToString();
-                    dr["未评价占比"] = listiteam[8].ToString();
+                    DataRow dr = dtNew.NewRow();
+                    int count = body[key].Count;
+                    foreach (List<string> listiteam in body[key])
+                    {
+                        dr["坐席姓名"] = listiteam[0].ToString();
+                        dr["非常满意"] = listiteam[1].ToString();
+                        dr["非常满意占比"] = listiteam[2].ToString();
+                        dr["基本满意"] = listiteam[3].ToString();
+                        dr["基本满意占比"] = listiteam[4].ToString();
+                        dr["不满意"] = listiteam[5].ToString();
+                        dr["不满意占比"] = listiteam[6].ToString();
+                        dr["未评价"] = listiteam[7].ToString();
+                        dr["未评价占比"] = listiteam[8].ToString();
+                    }
+                    dtNew.Rows.Add(dr);
                 }
-                dtNew.Rows.Add(dr);
             }
+            else
+            {
+                foreach (string key in body.Keys)
+                {
+                    DataRow dr = dtNew.NewRow();
+                    int count = body[key].Count;
+                    foreach (List<string> listiteam in body[key])
+                    {
+                        dr["坐席姓名"] = listiteam[0].ToString();
+                        dr["非常满意"] = listiteam[1].ToString();
+                        dr["非常满意占比"] = string.Format("{0:f2}%", double.Parse(listiteam[2]) * 100); 
+                        dr["基本满意"] = listiteam[3].ToString();
+                        dr["基本满意占比"] = string.Format("{0:f2}%", double.Parse(listiteam[4]) * 100);
+                        dr["不满意"] = listiteam[5].ToString();
+                        dr["不满意占比"] = string.Format("{0:f2}%", double.Parse(listiteam[6]) * 100);
+                        dr["未评价"] = listiteam[7].ToString();
+                        dr["未评价占比"] = string.Format("{0:f2}%", double.Parse(listiteam[8]) * 100);
+                    }
+                    dtNew.Rows.Add(dr);
+                }
+            }
+         
+           
             return dtNew;
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -949,7 +949,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and  (F_QuestionType like '%" + keywords.Trim()
                          + "%' or F_ZX_Area like '%" + keywords.Trim() + "%' or F_ZX_Branch like '%" + keywords.Trim()
-                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
+                         + "%' or F_CusName like '%" + keywords.Trim() + "%' or F_WorkOrderCode like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -977,216 +977,287 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         sql += $" and F_WxOpenId ='" + OpenId + "'";
                     }
-                    switch (state)
+                    if (state >-1)
                     {
-                        case 0://待审批
-                            string uwhere = "";
+                        switch (state)
+                        {
+                            case 0://待审批
+                                string uwhere = "";
 
-                            if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL")
-                            {
-                                if (GetApprovalOrderID(ua, OpenId, ro.F_RoleCode) != "")
+                                if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL")
                                 {
-                                    sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetApprovalOrderID(ua, OpenId, ro.F_RoleCode) + ") ";
+                                    if (GetApprovalOrderID(ua, OpenId, ro.F_RoleCode) != "")
+                                    {
+                                        sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetApprovalOrderID(ua, OpenId, ro.F_RoleCode) + ") ";
+                                    }
+                                    else
+                                    {
+                                        return Success("暂无工单");
+                                    }
+                                }
+                                else
+                                {
+                                    return Success("无操作权限");
+                                }
+                                break;
+                            case 11://已创单
+                                sql += $" and F_CreateBy  ='" + ua.F_UserCode + "'";
+                                break;
+                            case 12://退单
+                                if (GetBackid(ua) != "")
+                                {
+                                    sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetBackid(ua) + ") ";
                                 }
                                 else
                                 {
                                     return Success("暂无工单");
                                 }
-                            }
-                            else
-                            {
-                                return Success("无操作权限");
-                            }
-                            break;
-                        case 11://已创单
-                            sql += $" and F_CreateBy  ='" + ua.F_UserCode + "'";
-                            break;
-                        case 12://退单
-                            if (GetBackid(ua) != "")
-                            {
-                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetBackid(ua) + ") ";
-                            }
-                            else
-                            {
-                                return Success("暂无工单");
-                            }
-                            break;
-                        case 1://已审核
-                            if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "GC")
-                            {
-                                if (GetApprovedOrderID(ua.F_UserCode) != "")
+                                break;
+                            case 1://已审核
+                                if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "GC")
                                 {
-                                    sql += $"  and F_ID in ( " + GetApprovedOrderID(ua.F_UserCode) + ") "; ;
+                                    if (GetApprovedOrderID(ua.F_UserCode) != "")
+                                    {
+                                        sql += $"  and F_ID in ( " + GetApprovedOrderID(ua.F_UserCode) + ") "; ;
+                                    }
+                                    else
+                                    {
+                                        return Error("暂无工单");
+                                    }
                                 }
                                 else
                                 {
-                                    return Error("暂无工单");
+                                    return Success("暂无工单");
                                 }
-                            }
-                            else
-                            {
-                                return Success("暂无工单");
-                            }
-                            break;
-                        case 2://待完成的(待接单)
-                            if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
-                            {
+                                break;
+                            case 2://待完成的(待接单)
+                                if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
+                                {
 
-                                sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
-                          GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
+                                    sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                              GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
 
-                            }
-                            else
-                            {
+                                }
+                                else
+                                {
 
-                                return Success("暂无工单"); ;
-                            }
-                            break;
-                        case 5://待审批
-                            if (ro.F_RoleCode == "GC")
-                            {
-                                if (GetHApproval(ua.F_UserCode) != "")
+                                    return Success("暂无工单"); ;
+                                }
+                                break;
+                            case 5://待审批
+                                if (ro.F_RoleCode == "GC")
                                 {
-                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetHApproval(ua.F_UserCode) + ") "; ;
+                                    if (GetHApproval(ua.F_UserCode) != "")
+                                    {
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetHApproval(ua.F_UserCode) + ") "; ;
+                                    }
                                 }
-                            }
-                            else
-                            {
-                                return Success("暂无工单"); ;
-                            }
-                            break;
-                        case 4://待完成的(待处理)
-                            if (GetDWCWorkOrderID(ua.F_UserCode,ua .F_DeptId ) != null)
-                            {
-                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback  + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId) + ") ";
+                                else
+                                {
+                                    return Success("暂无工单"); ;
+                                }
+                                break;
+                            case 4://待完成的(待处理)
+                                if (GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId) != null)
+                                {
+                                    sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId) + ") ";
 
-                            }
-                            else
-                            {
-                                return Success("暂无工单"); ;
-                            }
-                            break;
-                        case 10://已完成的
-                            if (GetDeptUserCode(ua.F_DeptId) != "")
-                            {
-                                sql += " and F_State in(10,11) and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
-                            }
-                          //  sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
-                            break;
-                        case 3://我参与的
-                            if (GetParticipateID(ua.F_UserCode) != "")
-                            {
-                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
-                            }
-                            else
-                            {
-                                return Error("暂无工单");
-                            }
+                                }
+                                else
+                                {
+                                    return Success("暂无工单"); ;
+                                }
+                                break;
+                            case 10://已完成的
+                                if (GetDeptUserCode(ua.F_DeptId) != "")
+                                {
+                                    sql += " and F_State in(10,11) and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
+                                }
+                                //  sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
+                                break;
+                            case 3://我参与的
+                                if (GetParticipateID(ua.F_UserCode) != "")
+                                {
+                                    sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID(ua.F_UserCode) + ") ";
+                                }
+                                else
+                                {
+                                    return Error("暂无工单");
+                                }
 
-                            break;
-                        case 6://待回访
-                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
-                            {
-                                uwhere = "";
-                            }
-                            else
-                            {
-                                return Success("无操作权限"); ;
-                            }
-                            sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
-                            break;
-                        case 7://已回访
-                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
-                            {
-                                if (GetCYWorkOrderID(ua.F_UserCode) != "")
+                                break;
+                            case 6://待回访
+                                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                                 {
-                                    sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
+                                    uwhere = "";
                                 }
                                 else
                                 {
-                                    return Success("暂无工单"); ;
+                                    return Success("无操作权限"); ;
                                 }
-                                sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
-                            }
-                            else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
-                            {
-                                string detpid = "" + ua.F_DeptId;
-                                var deparmentlist = new List<Model.T_Sys_Department>();
-                                Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
-                                if (dModel != null)
+                                sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
+                                break;
+                            case 7://已回访
+                                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                                 {
-                                    if (dModel.F_Layer == 1)
+                                    if (GetCYWorkOrderID(ua.F_UserCode) != "")
                                     {
-                                        deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
-                                        if (deparmentlist.Count > 0)
+                                        sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
+                                    }
+                                    else
+                                    {
+                                        return Success("暂无工单"); ;
+                                    }
+                                    sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
+                                }
+                                else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                                {
+                                    string detpid = "" + ua.F_DeptId;
+                                    var deparmentlist = new List<Model.T_Sys_Department>();
+                                    Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                                    if (dModel != null)
+                                    {
+                                        if (dModel.F_Layer == 1)
                                         {
-                                            foreach (var it in deparmentlist)
+                                            deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                            if (deparmentlist.Count > 0)
                                             {
-                                                if (detpid != "")
-                                                {
-                                                    detpid += "," + it.F_DeptId;
-                                                }
-                                                else
+                                                foreach (var it in deparmentlist)
                                                 {
-                                                    detpid = "" + it.F_DeptId; ;
+                                                    if (detpid != "")
+                                                    {
+                                                        detpid += "," + it.F_DeptId;
+                                                    }
+                                                    else
+                                                    {
+                                                        detpid = "" + it.F_DeptId; ;
+                                                    }
                                                 }
                                             }
                                         }
+                                        else
+                                        {
+                                            detpid = ua.F_DeptId.ToString();
+                                        }
+                                        if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
+                                        {
+                                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
+                                        }
+                                        else
+                                        {
+
+                                            return Success("暂无工单"); ;
+                                        }
+
                                     }
                                     else
                                     {
-                                        detpid = ua.F_DeptId.ToString();
+                                        return Error("加载失败");
+                                    }
+                                }
+                                else
+                                {
+                                    return Success("无操作权限"); ;
+                                }
+                                sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
+                                break;
+                            case 8://待完结
+                                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
+                                {
+                                    uwhere = ""; ;
+                                }
+                                else
+                                {
+                                    return Success("无操作权限"); ;
+                                }
+                                sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "0" + "' "; ;
+                                break;
+                            case 9://待接单
+
+                                if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
+                                {
+
+                                    sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                              GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
+
+                                }
+                                else
+                                {
+
+                                    return Success("暂无工单"); ;
+                                }
+
+                                break;
+                        }
+                    }
+                    else
+                    {
+                        if (ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "YWY")
+                            sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
+                        else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG")
+                        {
+                            string detpid = "" + ua.F_DeptId;
+                            var deparmentlist = new List<Model.T_Sys_Department>();
+                            Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                            if (dModel != null)
+                            {
+                                if (dModel.F_Layer == 1)
+                                {
+                                    deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                    if (deparmentlist.Count > 0)
+                                    {
+                                        foreach (var it in deparmentlist)
+                                        {
+                                            if (detpid != "")
+                                            {
+                                                detpid += "," + it.F_DeptId;
+                                            }
+                                            else
+                                            {
+                                                detpid = "" + it.F_DeptId;
+                                            }
+                                        }
                                     }
-                                    if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
+                                }
+                                else
+                                {
+                                    detpid = ua.F_DeptId.ToString();
+                                }
+                                if (state >= 0)
+                                {
+                                    if (GetDeptWorkOrderID(detpid) != "")
                                     {
-                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
+
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
                                     }
                                     else
                                     {
 
                                         return Success("暂无工单"); ;
                                     }
-
                                 }
                                 else
                                 {
-                                    return Error("加载失败");
-                                }
-                            }
-                            else
-                            {
-                                return Success("无操作权限"); ;
-                            }
-                            sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
-                            break;
-                        case 8://待完结
-                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
-                            {
-                                uwhere = ""; ;
-                            }
-                            else
-                            {
-                                return Success("无操作权限"); ;
-                            }
-                            sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "0" + "' "; ;
-                            break;
-                        case 9://待接单
+                                    if (GetDeptWorkOrderID(detpid) != "")
+                                    {
 
-                            if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
-                            {
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
+                                    }
+                                    else
+                                    {
 
-                                sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
-                          GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
+                                        return Success("暂无工单"); ;
+                                    }
+                                }
 
                             }
                             else
                             {
-
-                                return Success("暂无工单"); ;
+                                return Error("加载失败");
                             }
-
-                            break;
+                        }
                     }
+                 
                 }
                 else
                 {
@@ -1463,9 +1534,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
             }
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where "
-                     + "F_CreateUser in(" + ua + ") "
-               ;
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where (F_CreateUser in(" + ua + ")  or F_NextDept in(" + user + "))"
+             ;
 
             return str;
         }
@@ -1856,11 +1926,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (string.IsNullOrEmpty(model.F_Annotation))
                         {
-                            model.F_Annotation = cont+"-"+ ua.F_UserCode +"("+ua .F_WorkNumber +")";
+                            model.F_Annotation = cont+"-"+ ua.F_UserName + "("+ua .F_WorkNumber +")";
                         }
                         else
                         {
-                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserCode + "(" + ua.F_WorkNumber + ")";
+                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName  + "(" + ua.F_WorkNumber + ")";
                         }
                         var res = woBLL.Update(model);
                         if (res)
@@ -2794,6 +2864,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             model.F_CreateBy = creatname.F_WorkNumber; ;//添加人
                             model.F_CreateName = creatname.F_UserName; ;//添加人
+                            model.F_CreatePhone = creatname.F_Mobile;
                             model.CreateName = creatname.F_UserName + "(" + creatname.F_WorkNumber + ")";
                         }
 
@@ -3975,6 +4046,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
                 Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
+                if (model .F_State !=0)
+                {
+                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                    if (modellist != null)
+                    {
+                        if (modellist.F_NextUser != ua.F_UserCode)
+                            return Error("非接单人不可操作工单");
+                    }
+                }
+               
                 WorkOrderNewInput input = new WorkOrderNewInput();
 
                 if (ua != null)
@@ -4533,6 +4614,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
                     if (model != null)
                     {
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                        if (modellist != null)
+                        {
+                            string[] sprt = modellist.F_NextUser.Split(',');
+                            if (sprt.Length == 1)
+                            {
+                                if (modellist.F_NextUser != ua.F_UserCode)
+                                    return Error("非接单人不可操作工单");
+                            }
+                        }
                         if (model.F_State == 2)
                         {
                             return Error("工单已接单无需重新接单");
@@ -4699,6 +4790,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (model != null)
                         {
+                            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                            if (modellist != null)
+                            {
+                                if (modellist.F_NextUser != ua.F_UserCode)
+                                    return Error("非接单人不可操作工单");
+                            }
                             if (model.F_Type == "2")
                             {
                                 if (deptmodel.F_DeptId == 37)
@@ -4828,6 +4925,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //验证信息
                     if (model != null)
                     {
+                       
+                            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and  F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                            if (modellist != null)
+                            {
+                                if (modellist.F_NextUser != ua.F_UserCode)
+                                    return Error("非接单人不可操作工单");
+                            }
+                        
                         var res = BackWO(ua, model, cont, type);
                         if (res)
                             return Success("退回成功");

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

@@ -4684,6 +4684,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             model.F_CreateBy = creatname.F_WorkNumber; ;//添加人
                             model.F_CreateName = creatname.F_UserName ; ;//添加人
+                            model.F_CreatePhone = creatname.F_Mobile;
                             model.CreateName = creatname.F_UserName + "(" + creatname.F_WorkNumber + ")";
                         }
                     }
@@ -5513,11 +5514,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (string .IsNullOrEmpty (model.F_Annotation))
                         {
-                            model.F_Annotation = cont + "-" + ua.F_UserCode + "(" + ua.F_WorkNumber + ")";
+                            model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")";
                         }
                         else
                         {
-                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserCode + "(" + ua.F_WorkNumber + ")";
+                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")";
                         }
                         var res = workOrder.Update(model);
                         if (res)
@@ -5803,6 +5804,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
+                if (model .F_State !=0)
+                {
+                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                    if (modellist != null)
+                    {
+                        if (modellist.F_NextUser != ua.F_UserCode)
+                            return Error("非接单人不可操作工单");
+                    }
+                }
+               
                 WorkOrderNewInput input = new WorkOrderNewInput();
                 if (clid != 0)
                 {
@@ -5931,9 +5942,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (ua != null)
                 {
                     Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
+                   
                     if (model != null)
                     {
-                        if(model .F_State ==2)
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                        if (modellist != null)
+                        {
+                            string[] sprt = modellist.F_NextUser.Split(',');
+                            if (sprt.Length ==1)
+                            {
+                                if (modellist.F_NextUser != ua.F_UserCode)
+                                    return Error("非接单人不可操作工单");
+                            }
+                        }
+                        if (model .F_State ==2)
                         {
                             return Error("工单已接单无需重新接单");
                         }
@@ -6025,6 +6047,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (model != null)
                         {
+                            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                            if (modellist != null)
+                            {
+                                if (modellist.F_NextUser != ua.F_UserCode)
+                                    return Error("非接单人不可操作工单");
+                            }
                             if (model.F_Type == "2")
                             {
                                 if (deptmodel.F_DeptId == 37)
@@ -6195,6 +6223,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //验证信息 
                     if (model != null)
                     {
+                       
+                            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                            if (modellist != null)
+                            {
+                                if (modellist.F_NextUser != ua.F_UserCode)
+                                    return Error("非接单人不可操作工单");
+                            }
+                        
+                       
                         var res = BackWO(ua, model, cont, type);
                         if (res)
                             return Success("退回成功");

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

@@ -735,6 +735,13 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 添加人工号
         /// </summary>
+        public string F_CreatePhone
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 添加人工号
+        /// </summary>
         public string CreateName
         {
             get; set;