高层审批状态修改，来电弹屏历史记录增加客户姓名，通话记录增加客户姓名

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -20,10 +20,54 @@ namespace CallCenterApi.Interface.Controllers
         // 需要发送短信的手机号码
         string[] phoneNumbers = { "21212313123", "12345678902", "12345678903" };
         // 短信模板ID，需要在短信应用中申请
-        int templateId = 7839; // NOTE: 这里的模板ID`7839`只是一个示例，真实的模板ID需要在短信控制台中申请
+        int templateId = 225505; // NOTE: 这里的模板ID`7839`只是一个示例，真实的模板ID需要在短信控制台中申请
         // 签名
-        string smsSign = "腾讯云"; // NOTE: 这里的签名只是示例，请使用真实的已申请的签名, 签名参数使用的是`签名内容`，而不是`签名ID`
+        string smsSign = "河南心连心客服"; // NOTE: 这里的签名只是示例，请使用真实的已申请的签名, 签名参数使用的是`签名内容`，而不是`签名ID`
         #endregion
+        public ActionResult SMSSend()
+        {
+            SmsSingleSenderResult result = SMSSingleshot("17839539537", "测试");
+                if (result !=null )
+            {
+
+                return Success("根据关键字获取公司信息",   result);
+            }
+                else
+            {
+                return null;
+            }
+        }
+        /// <summary>
+        /// 指定模板单发短信
+        /// </summary>
+        /// <param name="phone"></param>
+        /// <param name="cont"></param>
+        public SmsSingleSenderResult SMSSinglesho(string phone, string cont)
+        {
+            try
+            {
+                SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
+                var result = ssender.sendWithParam("86", phone,
+                    templateId, new[] { cont }, smsSign, "", "");  // 签名参数未提供或者为空时，会使用默认签名发送短信
+                Console.WriteLine(result);
+                return result;
+            }
+            catch (JSONException e)
+            {
+                Console.WriteLine(e);
+                return null;
+            }
+            catch (HTTPException e)
+            {
+                Console.WriteLine(e);
+                return null;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                return null;
+            }
+        }
         /// <summary>
         /// 单发短信
         /// </summary>
@@ -34,8 +78,8 @@ namespace CallCenterApi.Interface.Controllers
             try
             {
                 SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
-                var result = ssender.send(0, "86", phone,
-                    cont, "", "");
+                var result = ssender.send(1, "86", phone,
+                 smsSign, cont, "");
                 Console.WriteLine(result);
                 return result;
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -338,7 +338,17 @@ namespace CallCenterApi.Interface.Controllers.tel
                                 }
                                 dr["FilePath"] = ym + path.Substring(path.IndexOf(':') + 1).Replace('\\', '/');
                             }
-                            dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList($" ( F_CompanyName like '%" + dr["CallNumber"] + "%' or F_CustomerCode like '%" + dr["CallNumber"] + "%' ) ");
+                            string tephone = dr["CallNumber"] != null ? dr["CallNumber"].ToString() : "";
+                            if (!string.IsNullOrEmpty(tephone))
+                            {
+                                Model.T_Cus_CustomerBaseNew cus = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
+                     .FirstOrDefault();
+                                if (cus != null)
+                                {
+                                    dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
+                           .FirstOrDefault().F_Legal;
+                                }
+                            }
                         }
 
                         int hrcount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=0 " + sqlcount);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -184,6 +184,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 }
                 string ucode = dr["UserCode"] != null ? dr["UserCode"].ToString() : "";
                 string uname = dr["UserName"] != null ? dr["UserName"].ToString() : "";
+                string tephone= dr["CallNumber"] != null ? dr["CallNumber"].ToString() : "";
                 if (ucode != "")
                 {
                     if (uname == "")
@@ -193,8 +194,17 @@ namespace CallCenterApi.Interface.Controllers.tel
                             dr["UserName"] = uu.F_UserName;
                     }
                 }
-                dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList($" ( F_CompanyName like '%" + dr["CallNumber"] + "%' or F_CustomerCode like '%" + dr["CallNumber"] + "%' ) ")
-                  .FirstOrDefault().F_Legal;
+                if (!string.IsNullOrEmpty(tephone))
+                {
+                    Model.T_Cus_CustomerBaseNew cus = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
+         .FirstOrDefault();
+                    if (cus != null)
+                    {
+                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
+               .FirstOrDefault().F_Legal;
+                    }
+                }
+
             }
 
             var obj = new

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

@@ -3230,6 +3230,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //验证信息
                     if (model != null)
                     {
+                        var itemlast = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + ua.F_UserCode + "'" + "and F_IsUsed=2  and  F_WoID = " + orderid);
+                        if (itemlast.Count > 0)
+                        {
+                            foreach (var it in itemlast)
+                            {
+                                it.F_IsUsed = 1;
+                                itembll.Update(it);
+                            }
+                        }
                         model.F_Highopinions = cont;
                         string deptname = "";
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);

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

@@ -4865,6 +4865,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //验证信息
                     if (model != null)
                     {
+                        var itemlast = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + ua.F_UserCode  + "'" + "and F_IsUsed=2  and  F_WoID = " + orderid );
+                            if (itemlast.Count > 0)
+                            {
+                                foreach (var it in itemlast)
+                                {
+                                    it.F_IsUsed = 1;
+                                    itembll.Update(it);
+                                }
+                            }
                         model.F_Highopinions = cont;
                         string deptname = "";
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);