报表导出，bug修改

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

@@ -446,7 +446,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 if (getunique(0, input.F_CustomerCode))
                     return Error("编号已被占用，请重新输入！");
             }
-            if (string.IsNullOrEmpty(input.F_LegalPhone.Trim()))
+            if (string.IsNullOrEmpty(input.F_LegalPhone))
                 return Error("请输入客户电话");
             if (getunphone(0, input.F_LegalPhone.Trim()))
                 return Error("已存在该客户请勿重复添加");
@@ -502,8 +502,11 @@ namespace CallCenterApi.Interface.Controllers.customer
             #region 添加验证判断
             if (input.F_CustomerId <= 0)
                 return Error("参数错误！");
+             if (string.IsNullOrEmpty(input.F_LegalPhone))
+                return Error("请输入客户电话");
             if (getunique(input.F_CustomerId, input.F_CustomerCode))
                 return Error("编号已被占用，请重新输入！");
+
             if (!string.IsNullOrEmpty(input.F_SalesPhone))
             {
                 if (!IsNumeric(input.F_SalesPhone))
@@ -664,7 +667,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
             model.F_Credit = input.F_Credit;//信用等级:一星、二星、三星、四星、五星、空
             model.F_Legal = input.F_Legal;//法人 
-            model.F_LegalPhone = input.F_LegalPhone.Trim();//法人电话
+            model.F_LegalPhone = input.F_LegalPhone;//法人电话
             model.F_AddressProvince = input.F_AddressProvince;//省
             model.F_AddressCity = input.F_AddressCity;//市
             model.F_AddressCountry = input.F_AddressCountry;//县

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

@@ -2,11 +2,12 @@
 using CallCenterApi.DB;
 using CallCenterApi.Interface.App_Start;
 using CallCenterApi.Interface.Controllers.Base;
-using CallCenterApi.Interface.Controllers.workorder;
 using CallCenterApi.Interface.Models.Enum;
 using CallCenterApi.Interface.Models.Input;
 using CallCenterAPI.WechatSDK;
 using CallCenterAPI.WechatSDK.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using qcloudsms_csharp;
 using System;
 using System.Collections.Generic;
@@ -427,15 +428,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var length = NonceStrings.Length;
 
             //生成15位数的随机字符串，当然也可以通过控制对应字符串大小生成，但是至多不超过32位
-            for (int i = 0; i < 15; i++)
+            for (int i = 0; i < 16; i++)
             {
                 sb.Append(NonceStrings[random.Next(length - 1)]);//通过random获得的随机索引到，NonceStrings数组中获取对应数组值
             }
             return sb.ToString();
         }
-        public ActionResult  GetJsSdk(string url)
+       
+        public ActionResult GetJsSdk(string url)
         {
-            var  timestamp = GetCurrentUinxTime();
+            var timestamp = GetCurrentUinxTime();
             var nonceStr = CreateNonceStr();
             var obj = new
             {
@@ -444,24 +446,96 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 appId = AppId,
                 timestamp = timestamp,
                 nonceStr = nonceStr,
-                signature= GetSignature(sig(), nonceStr, timestamp, url)
+                token = GetToken(),
+                ticket= Getticket(GetToken()),
+                url,
+                signature = GetSignature(Getticket(GetToken()), nonceStr, timestamp, url)
             };
             return Content(obj.ToJson()); ;
         }
-        private void PrepareArg()
-        {
-            //  return;
-            var url = Request.Url.ToString();
-            var timestamp = GetCurrentUinxTime();
-            var nonceStr = CreateNonceStr();
-          var signature = sig();
-            ViewBag.timestamp = timestamp;
-            ViewBag.nonceStr = nonceStr;
-            ViewBag.signature = signature;
-        }
+      
        string     AppId = Configs.GetValue("WechatAppid");
         string   AppSecret = Configs.GetValue("WechatAppsecret");
-      public ActionResult Getsig()
+        public class Token
+        {
+            public string token;
+            public DateTime time;
+        }
+       
+        public class AssedToken
+        {
+          
+            public string access_token { get; set; }
+          
+            public int expires_in { get; set; }
+          
+          
+        }
+        public string  GetToken()
+        {
+            WebClient web = new WebClient();
+            web.Encoding = Encoding.UTF8;
+            string msg = "";
+            var model = new BLL.T_Sys_AssToken().GetModelList("F_IsDelete=0 order by F_ID desc").FirstOrDefault();
+            if (model!=null )
+            {
+                System.TimeSpan id = DateTime.Now - DateTime.Parse(model.F_CreatTime .ToString());
+                if (id.TotalMinutes>=120)
+                {
+                    string url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + AppId + "&secret=" + AppSecret;
+                    string Dataaa = web.DownloadString(url);//这一句话就能请求到数据了
+                    JObject jo = (JObject)JsonConvert.DeserializeObject(Dataaa);
+                    string access_token = jo["access_token"].ToString();
+                   
+                    var asser = new Model.T_Sys_AssToken();
+                    asser.F_CreatTime = DateTime.Now;
+                    asser.F_IsDelete = 0;
+                    asser.F_Token = access_token;
+                    int a = new BLL.T_Sys_AssToken().Add(asser);
+                    if (a >0)
+                    {
+                        msg = access_token;
+                    }
+                }
+                else
+                {
+                    msg = model.F_Token ;
+                }
+            }
+            else
+            {
+                string url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + AppId + "&secret=" + AppSecret;
+                string Dataaa = web.DownloadString(url);//这一句话就能请求到数据了
+                JObject jo = (JObject)JsonConvert.DeserializeObject(Dataaa);
+                string access_token = jo["access_token"].ToString();
+                var asser = new Model.T_Sys_AssToken();
+                asser.F_CreatTime = DateTime.Now;
+                asser.F_IsDelete = 0;
+                asser.F_Token = access_token;
+                int a = new BLL.T_Sys_AssToken().Add(asser);
+                if (a > 0)
+                {
+                    msg = access_token;
+                }
+            }
+            
+            return msg;
+        }
+       
+        public string  Getticket(string token)
+        {
+            WebClient web = new WebClient();
+            web.Encoding = Encoding.UTF8;
+            string msg = "";
+            string urltoken = " https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + token + "&type=jsapi";
+            string Dataaasig = web.DownloadString(urltoken);//这一句话就能请求到数据了
+            JObject jo = (JObject)JsonConvert.DeserializeObject(Dataaasig);
+            string ticket = jo["ticket"].ToString();
+            string errmsg = jo["errmsg"].ToString();
+           
+            return ticket;
+        }
+        public ActionResult Getsig()
         {
             WebClient web = new WebClient();
             web.Encoding = Encoding.UTF8;
@@ -582,16 +656,30 @@ namespace CallCenterApi.Interface.Controllers.weixin
                           .Append("timestamp=").Append(timestamp).Append("&")
                           .Append("url=").Append(url.IndexOf("#") >= 0 ? url.Substring(0, url.IndexOf("#")) : url);
 
-            return Sha1(string1Builder.ToString(), Encoding.UTF8);
+            return Sha1Sign(string1Builder.ToString());
         }
 
-        /// <summary>
-        /// 签名加密，使用SHA加密所得
-        /// </summary>
-        /// <param name="content">签名加密参数</param>
-        /// <param name="encode">编码UTF-8</param>
-        /// <returns></returns>
-        public static string Sha1(string content, Encoding encode)
+        public static string Sha1Sign(string data)
+        {
+            byte[] temp1 = Encoding.UTF8.GetBytes(data);
+            SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider();
+            byte[] temp2 = sha.ComputeHash(temp1);
+            sha.Clear();
+            // 注意， 不能用这个
+            // string output = Convert.ToBase64String(temp2);// 不能直接转换成base64string
+            var output = BitConverter.ToString(temp2);
+            output = output.Replace("-", "");
+            output = output.ToLower();
+            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
             {
@@ -609,6 +697,29 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
         }
         /// <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>
         /// 获取当前时间戳
         /// </summary>
         /// <returns></returns>
@@ -616,8 +727,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             DateTime currentDate = DateTime.Now;//当前时间
             //转化为时间戳
-            DateTime localTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
-            return long.Parse((currentDate - localTime).TotalSeconds.ToString().Split('.')[0]);
+          DateTime localTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+           return long.Parse((currentDate - localTime).TotalSeconds.ToString().Split('.')[0]);
+           // var ticks = currentDate.ToUniversalTime().Ticks - new DateTime(1970, 1, 1, 0, 0, 0, //DateTimeKind.Utc).Ticks;
+           // var timeSpan = ticks / TimeSpan.TicksPerSecond;
+            //return timeSpan;
+
         }
         /// <summary>
         /// 获取微信openid
@@ -941,9 +1056,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             }
                             break;
                         case 4://待完成的(待处理)
-                            if (GetDWCWorkOrderID(ua.F_UserCode) != null)
+                            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) + ") ";
+                                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
@@ -952,7 +1067,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             }
                             break;
                         case 10://已完成的
-                            sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
+                            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) != "")
@@ -1111,8 +1230,24 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             else
             {
-                return Error("无操作权限！");
+                return Success("暂无工单"); ;
+            }
+        }
+        public string GetDeptUserCode(int deptid)
+        {
+            string deptuser = string.Empty;
+            var dept = userAccountBLL .GetModelList("F_DeptId=" + deptid);
+            if (dept != null)
+            {
+                foreach (var it in dept)
+                {
+                    if (deptuser != "")
+                        deptuser += "," + it.F_UserCode;
+                    else
+                        deptuser += it.F_UserCode;
+                }
             }
+            return deptuser;
         }
         /// <summary>
         ///综合查询列表
@@ -1381,14 +1516,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// 获取待完成的工单编号
         /// </summary>
         /// <returns></returns>
-        public string GetDWCWorkOrderID(string user)
+        public string GetDWCWorkOrderID(string user,int deptid)
         {
             string str = string.Empty;
 
             str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                 + " and ("
-                    + "(F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + ") and F_CreateUser='" + user + "') "//办理中和接单状态的操作人
-                    + " or (F_WoState in(" + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.receive + ") and F_NextUser='" + user + "')"//退回下一步操作人
+                    + "(F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + ") and F_NextDept='" + deptid + "') "//办理中和接单状态的操作人
+                    + " or (F_WoState in(" + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.receive + ") and F_NextDept='" + deptid + "')"//退回下一步操作人
                 + ")"
                 + " and isnull(F_IsUsed,'0')='0' ";
 
@@ -1492,9 +1627,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         case 1://待完成的(待处理)
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            if (GetDWCWorkOrderID(ua.F_UserCode) != null)
+                            if (GetDWCWorkOrderID(ua.F_UserCode,ua .F_DeptId ) != null)
                             {
-                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId) + ") ";
                             }
                             else
                             {
@@ -1507,8 +1642,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         case 2://已完成的
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
-                            YCL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已完成的
+                        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 + "' ";
+                        YCL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已完成的
                             break;
                        
                         case 3://待审批
@@ -1717,11 +1856,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (string.IsNullOrEmpty(model.F_Annotation))
                         {
-                            model.F_Annotation = cont;
+                            model.F_Annotation = cont+"-"+ ua.F_UserCode +"("+ua .F_WorkNumber +")";
                         }
                         else
                         {
-                            model.F_Annotation = model.F_Annotation + "。" + cont;
+                            model.F_Annotation = model.F_Annotation + "。" + cont + "-" + ua.F_UserCode + "(" + ua.F_WorkNumber + ")";
                         }
                         var res = woBLL.Update(model);
                         if (res)
@@ -2354,7 +2493,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (!string.IsNullOrEmpty(cuModel.F_AreaID))
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
+                            Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
+                            try
+                            {
+                                pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
+                            }
+                            catch
+                            {
+                                pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                            }
+
                             if (pdModel != null)
                             {
                                 model.F_AreaName = pdModel.F_DeptName;
@@ -2362,7 +2510,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         if (!string.IsNullOrEmpty(cuModel.F_BranchID))
                         {
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
+                            Model.T_Sys_Department pdModel1 = new Model.T_Sys_Department();
+                            try
+                            {
+                                pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));//通过公司id获取部门
+                            }
+                            catch
+                            {
+                                pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);//通过公司id获取部门
+                            }
                             if (pdModel1 != null)
                             {
                                 model.F_BranchName = pdModel1.F_DeptName;
@@ -2528,13 +2684,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (manage != null)
                             {
                                 model.F_QuestionType = manage.F_QuestionName;
+                                model.F_QuestionTypeid = manage.F_Id;
                                 if (manage.F_Label == "3")
                                 {
                                     Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
                                     Model.T_Wo_QuestionManage Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
                                     model.F_QuestionTypeone = Manage2.F_QuestionName;//问题类别1
+                                    model.F_QuestionTypeoneid = Manage2.F_Id;//问题类别1
                                     model.F_QuestionTypetwo = Manage1.F_QuestionName;//问题类别2
-
+                                    model.F_QuestionTypetwoid = Manage1.F_Id;//问题类别1
                                 }
                             }
 
@@ -2549,7 +2707,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_BatchNumber = model1[i].F_BatchNumber;//生产批次号
                     model.F_TS_Formula = model1[i].F_TS_Formula;// 投诉-配方
                     model.F_TS_Category = model1[i].F_TS_Category;//投诉-产品种类：化肥、化工、其他
-                    model.F_TS_Quantity = model1[i].F_TS_Quantity;//投诉-问题数量（吨）
+                    if (!string.IsNullOrEmpty(model1[i].F_TS_Quantity))
+                    {
+                        model.F_TS_Quantity = model1[i].F_TS_Quantity ;//投诉-问题数量（吨）
+                    }
+                    else
+                        model.F_TS_Quantity = "";
                     model.F_TS_Level = model1[i].F_TS_Level;//投诉-重要级别：轻微、一般、较大、重大
                     #endregion
                     #region 咨询类
@@ -3034,7 +3197,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public string GetParticipateID(string user)
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ") and F_OptType in( 1,7 )";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ") and F_OptType in( 0,1,7 )";
 
             ;
             return str;
@@ -3373,7 +3536,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
             model.F_CJ_Tonnage = input.F_CJ_Tonnage;//抽检-抽检吨数
             model.F_CJ_BagNo = input.F_CJ_BagNo;//抽检-抽检袋数
             model.F_CJ_Outlay = input.F_CJ_Outlay;//抽检-公关费用金额：单位元】
-            model.F_WxOpenId = input.F_WxOpenId;                                    //     model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
+            model.F_WxOpenId = input.F_WxOpenId;
+           
+            //     model.F_VisitRemarks = input.F_VisitRemarks;//回访备注
             //if (!string.IsNullOrEmpty(input.F_BatchNumber))
             //{
             //    if (type == 1)
@@ -3467,10 +3632,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
         public ActionResult CustomAdd(WorkOrderNewInput input, int overtime = 0, int sms = 0)
         {
-                if ( input.F_Source != 4)
-                {
-                    return Error("无操作权限！");
-                }
+                
                 if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))

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

@@ -302,6 +302,13 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
+        /// 问题类别1
+        /// </summary>
+        public int  F_QuestionTypeoneid
+        {
+            get; set;
+        }
+        /// <summary>
         /// 问题类别2
         /// </summary>
         public string F_QuestionTypetwo
@@ -309,13 +316,26 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
+        /// 问题类别2
+        /// </summary>
+        public int  F_QuestionTypetwoid
+        {
+            get; set;
+        }
+        /// <summary>
         /// 问题类别
         /// </summary>
         public string F_QuestionType
         {
             get; set;
         }
-  
+        /// <summary>
+        /// 问题类别
+        /// </summary>
+        public int  F_QuestionTypeid
+        {
+            get; set;
+        }
         /// <summary>
         /// 生产批次号
         /// </summary>