注解

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -67,7 +67,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SeatLevel", SqlDbType.VarChar,50),
                     new SqlParameter("@F_SexFlag", SqlDbType.VarChar,50),
                     new SqlParameter("@F_RemindFlag", SqlDbType.Bit,1),
-                    new SqlParameter("@F_Remark", SqlDbType.VarChar,200),
+                    new SqlParameter("@F_Remark", SqlDbType.VarChar,-1),
                     new SqlParameter("@F_Telephone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Mobile", SqlDbType.VarChar,50),
                     new SqlParameter("@F_HomePhone", SqlDbType.VarChar,50),
@@ -186,7 +186,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SeatLevel", SqlDbType.VarChar,50),
                     new SqlParameter("@F_SexFlag", SqlDbType.VarChar,50),
                     new SqlParameter("@F_RemindFlag", SqlDbType.Bit,1),
-                    new SqlParameter("@F_Remark", SqlDbType.VarChar,200),
+                    new SqlParameter("@F_Remark",SqlDbType.VarChar,-1),
                     new SqlParameter("@F_Telephone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Mobile", SqlDbType.VarChar,50),
                     new SqlParameter("@F_HomePhone", SqlDbType.VarChar,50),

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrder.cs

@@ -147,7 +147,7 @@ namespace CallCenterApi.DAL
                            new SqlParameter("@F_VisitRemarks", SqlDbType.NVarChar,200),
                            new SqlParameter("@F_Brand", SqlDbType.NVarChar,200),
                             new SqlParameter("@F_Annotation", SqlDbType.NVarChar,200),
-              new SqlParameter("@F_CompanyName", SqlDbType.NVarChar, 200)};
+              new SqlParameter("@F_CompanyName",SqlDbType.NVarChar,-1)};
       
         parameters[0].Value = model.F_WorkOrderCode;
             parameters[1].Value = model.F_CallID;
@@ -441,7 +441,7 @@ namespace CallCenterApi.DAL
                             new SqlParameter("@F_Sid", SqlDbType.NVarChar,200),
                             new SqlParameter("@F_VisitRemarks", SqlDbType.NVarChar,200),
                             new SqlParameter("@F_Brand", SqlDbType.NVarChar,200),
-                             new SqlParameter("@F_Annotation", SqlDbType.NVarChar,200),
+                             new SqlParameter("@F_Annotation", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
             };
             parameters[0].Value = model.F_WorkOrderCode;

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

@@ -107,7 +107,54 @@ namespace CallCenterApi.Interface.Controllers
             }
             return NoToken("未知错误，请重新登录");
         }
-
+        private readonly BLL.T_Sys_UserAccount userAccountBLL = new BLL.T_Sys_UserAccount();
+        /// <summary>
+        /// 获取部门
+        /// </summary>
+        /// <param name="deptId"></param>
+        /// <returns></returns>
+        public ActionResult GetWXDept(string name)
+        {
+         
+                BLL.T_Sys_Department dBLL = new BLL.T_Sys_Department();
+                int deptId = 0;
+            int userid = 0;
+                Model.T_Sys_UserAccount user = userAccountBLL.GetworkModel(name);
+                if (user != null)
+                {
+                    deptId = user.F_DeptId;
+                userid = user.F_UserId;
+                }
+                else
+                {
+                    Model.T_Sys_UserAccount userer = userAccountBLL.GetName(name);
+                    if (userer != null)
+                    {
+                        deptId = userer.F_DeptId;
+                    userid = userer.F_UserId;
+                }
+                }
+                if (deptId==0)
+                    return Error("请输入正确的姓名或编号");
+                Model.T_Sys_Department dModel = dBLL.GetModel(deptId);
+                if (dModel != null)
+                    return Success("获取部门信息成功", new
+                    {
+                        deptid = dModel.F_DeptId,
+                        depname = dModel.F_DeptName,
+                        sort = dModel.F_Sort,
+                        parentid = dModel.F_ParentId,
+                        parentname = dModel.F_ParentName,
+                        remark = dModel.F_Remark,
+                        layerType = dModel.F_Layer,
+                        userid,
+                        //部门类型0不区分1大区2分公司
+                        //    headerid = dModel.F_Header,    //部门权限范围：9全部，1区域，2项目，3期
+                        //   TypeId = dModel.F_Type,    //部门操作权限：1接待部，2办理人员，3区域客服，4监管
+                    });
+                return Error("获取部门信息失败");
+         
+        }
         /// <summary>
         /// 添加部门
         /// </summary>

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

@@ -50,6 +50,11 @@ namespace CallCenterApi.Interface.Controllers.report
             if (Request.IsAuthenticated)
             {
                 NPOIHelper npoi = new NPOIHelper();
+                if (string.IsNullOrEmpty(stime) && string.IsNullOrEmpty(endtime))
+                {
+                    stime = (DateTime.Now.AddDays(1 - DateTime.Now.Day).Date).ToString("yyyy-MM-dd");
+                    endtime = DateTime.Now.ToString("yyyy-MM-dd");
+                }
                 DataTable dt = getData(stime, endtime,1);
                 if (npoi.ExportToExcel("坐席满意度评价情况", dt) == "")
                 {

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

@@ -434,7 +434,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             return sb.ToString();
         }
-       
+       /// <summary>
+       /// 获取签名
+       /// </summary>
+       /// <param name="url"></param>
+       /// <returns></returns>
         public ActionResult GetJsSdk(string url)
         {
             var timestamp = GetCurrentUinxTime();
@@ -535,111 +539,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
            
             return ticket;
         }
-        public ActionResult Getsig()
-        {
-            WebClient web = new WebClient();
-            web.Encoding = Encoding.UTF8;
-            string msg = "";
-            string url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + AppId + "&secret=" + AppSecret;
-            string Dataaa = web.DownloadString(url);//这一句话就能请求到数据了
-            string token = "";
-            try
-            {
-                DataSet ds = new DataSet();
-                StringReader stream = new StringReader(Dataaa);//读取字符串为数据量
-                XmlTextReader reader = new XmlTextReader(stream);//对XML的数据流的只进只读访问
-                ds.ReadXml(reader);//吧数据读入DataSet
-                DataTable dt = ds.Tables["returnsms"];
-                if (dt.Rows.Count > 0)
-                {
-                    for (int i = 0; i < dt.Rows.Count; i++)
-                    {
-                        DataRow dr = ds.Tables[0].Rows[i];
-                        token = dr["access_token"].ToString();
-                    }
-                }
-                string urltoken = " https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + token + "&type=jsapi";
-                string Dataaasig = web.DownloadString(urltoken);//这一句话就能请求到数据了
-                DataSet dj = new DataSet();
-                StringReader streams = new StringReader(Dataaasig);//读取字符串为数据量
-                XmlTextReader readers = new XmlTextReader(streams);//对XML的数据流的只进只读访问
-                dj.ReadXml(readers);//吧数据读入DataSet
-                DataTable dc = dj.Tables["returnsms"];
-                if (dc.Rows.Count > 0)
-                {
-                    for (int i = 0; i < dc.Rows.Count; i++)
-                    {
-                        DataRow dr = dj.Tables[0].Rows[i];
-                        msg = dr["ticket"].ToString();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                msg = ex.Message;
-            }
-            var obj = new
-            {
-                state = "success",
-                message = "成功",
-                appId = AppId,
-                token,
-                msg,
-            };
-            return Content(obj.ToJson()); ;
-        }
-        private string sig()
-        {
-            WebClient web = new WebClient();
-            web.Encoding = Encoding.UTF8;
-            string msg = "";
-            string url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+ AppId + "&secret="+ AppSecret;
-            string Dataaa = web.DownloadString(url);//这一句话就能请求到数据了
-            string token="";
-            try
-            {
-                DataSet ds = new DataSet();
-                StringReader stream = new StringReader(Dataaa);//读取字符串为数据量
-                XmlTextReader reader = new XmlTextReader(stream);//对XML的数据流的只进只读访问
-                ds.ReadXml(reader);//吧数据读入DataSet
-                DataTable dt = ds.Tables["returnsms"];
-                if (dt.Rows.Count > 0)
-                {
-                    for (int i = 0; i < dt.Rows.Count; i++)
-                    {
-                        DataRow dr = ds.Tables[0].Rows[i];
-                        token = dr["access_token"].ToString();
-                    }
-                }
-                string urltoken = " https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token="+ token + "&type=jsapi";
-                string Dataaasig = web.DownloadString(urltoken);//这一句话就能请求到数据了
-                DataSet dj = new DataSet();
-                StringReader streams = new StringReader(Dataaasig);//读取字符串为数据量
-                XmlTextReader readers = new XmlTextReader(streams);//对XML的数据流的只进只读访问
-                dj.ReadXml(readers);//吧数据读入DataSet
-                DataTable dc = dj.Tables["returnsms"];
-                if (dc.Rows.Count > 0)
-                {
-                    for (int i = 0; i < dc.Rows.Count; i++)
-                    {
-                        DataRow dr = dj.Tables[0].Rows[i];
-                        msg  = dr["ticket"].ToString();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                msg = ex.Message;
-            }
-            return msg;
-        }
+  
         public class Accesstoken
         {
             public string access_token;
             public int  expires_in;
         }
         /// <summary>
-        /// 获取签名
+        /// 获取jsapi_ticket
         /// </summary>
         /// <param name="jsapi_ticket">微信公众号调用微信JS临时票据</param>
         /// <param name="nonceStr">随机串</param>
@@ -673,51 +580,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             return output;
         }
 
-            /// <summary>
-            /// 签名加密，使用SHA加密所得
-            /// </summary>
-            /// <param name="content">签名加密参数</param>
-            /// <param name="encode">编码UTF-8</param>
-            /// <returns></returns>
-            public static string Sha1(string content, Encoding encode)
-        {
-            try
-            {
-                SHA1 sha1 = new SHA1CryptoServiceProvider();
-                byte[] bytesIn = encode.GetBytes(content);
-                byte[] bytesOut = sha1.ComputeHash(bytesIn);
-                sha1.Dispose();
-                string result = BitConverter.ToString(bytesOut);
-                result = result.Replace("-", "");
-                return result;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("SHA1加密出错：" + ex.Message);
-            }
-        }
-        /// <summary>
-        /// SHA1加密
-        /// </summary>
-        /// <param name="content">待加密的字符串</param>
-        /// <param name="encode">编码方式</param>
-        /// <returns></returns>
-        public static string  Sha1Sign(String content, Encoding encode)
-        {
-            try
-            {
-                SHA1 sha1 = new SHA1CryptoServiceProvider();//创建SHA1对象
-                byte[] bytes_in = encode.GetBytes(content);//将待加密字符串转为byte类型
-                byte[] bytes_out = sha1.ComputeHash(bytes_in);//Hash运算
-                sha1.Dispose();//释放当前实例使用的所有资源
-                string  result = BitConverter.ToString(bytes_out);//将运算结果转为string类型
-                return result;
-            }
-            catch (Exception ex)
-            {
-                return ex.Message;
-            }
-        }
+ 
 
         /// <summary>
         /// 获取当前时间戳
@@ -912,7 +775,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         ///工单列表
         /// </summary>
-        public ActionResult GetList(string description,string OpenId, string code, string cusname, string keywords, string cusphone, string companyname, string province, string city,
+        public ActionResult GetList(string handler,string description,string OpenId, string code, string cusname, string keywords, string cusphone, string companyname, string province, string city,
             string country, string township, string category, string salebase, string touser, int source = 0, int state = -1, int status = -1, int type = 0, int pageindex = 1, int pagesize = 10)
         {
             //  int userId = CurrentUser.UserData.F_UserId;
@@ -969,6 +832,30 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrWhiteSpace(province))//乡
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
 
+                if (!string .IsNullOrEmpty (handler))
+                {
+                    Model.T_Sys_UserAccount user = userAccountBLL .GetworkModel(handler);
+                    if (user != null)
+                    {
+                        if (GetParticipate(user.F_UserCode) != "")
+                        {
+
+                            sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipate(user.F_UserCode) + ") ";
+                        }
+                    }
+                    else
+                    {
+                        Model.T_Sys_UserAccount userer = userAccountBLL.GetName(handler);
+                        if (userer != null)
+                        {
+                            if (GetParticipate(userer.F_UserCode) != "")
+                            {
+
+                                sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipate(userer.F_UserCode) + ") ";
+                            }
+                        }
+                    }
+                }
                 //   sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
                 if (ua != null)
                 {
@@ -1926,11 +1813,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (string.IsNullOrEmpty(model.F_Annotation))
                         {
-                            model.F_Annotation = cont+"-"+ ua.F_UserName + "("+ua .F_WorkNumber +")";
+        model.F_Annotation = cont+"-"+ ua.F_UserName + "("+ua .F_WorkNumber +")"+DateTime .Now .ToString ("yyyy-MM-dd HH:mm:ss");
                         }
                         else
                         {
-                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName  + "(" + ua.F_WorkNumber + ")";
+                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName  + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ;
                         }
                         var res = woBLL.Update(model);
                         if (res)
@@ -3273,6 +3160,19 @@ namespace CallCenterApi.Interface.Controllers.weixin
             ;
             return str;
         }
+        /// <summary>
+        /// 获取我参与的工单编号
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public string GetParticipate(string user)
+        {
+            string str = string.Empty;
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ")  ";
+
+            ;
+            return str;
+        }
         private bool IsCustomerBaseNew(WorkOrderNewInput input)
         {
             bool n = false;

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

@@ -5514,11 +5514,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (string .IsNullOrEmpty (model.F_Annotation))
                         {
-                            model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")";
+                            model.F_Annotation = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")"+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ; ;
                         }
                         else
                         {
-                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")";
+                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")"+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); ; ;
                         }
                         var res = workOrder.Update(model);
                         if (res)