Sfoglia il codice sorgente

团组报表客户名称输出方式修改

jiangjc 10 mesi fa
parent
commit
712f2a3f8a
1 ha cambiato i file con 17 aggiunte e 0 eliminazioni
  1. 17 0
      OASystem/OASystem.Api/Controllers/StatisticsController.cs

+ 17 - 0
OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -770,6 +770,15 @@ namespace OASystem.API.Controllers
                     string visaClients = item.VisaClient;
                     if (!string.IsNullOrEmpty(visaClients))
                     {
+                        System.Text.RegularExpressions.Match m_EnName = Regex.Match(item.ClientName, @"[A-Za-z]+");
+                        System.Text.RegularExpressions.Match m_ZHName = Regex.Match(item.ClientName, @"[\u4e00-\u9fa5]");
+
+                        if (m_EnName.Success || m_ZHName.Success)
+                        {
+                            itemClientName = visaClients;
+                            continue;
+                        }
+
                         string[] clientIds = new string[] { };
                         if (visaClients.Contains(','))
                         {
@@ -948,6 +957,14 @@ namespace OASystem.API.Controllers
                     string insClients = item.ClientName;
                     if (!string.IsNullOrEmpty(insClients))
                     {
+                        System.Text.RegularExpressions.Match m_EnName = Regex.Match(item.ClientName, @"[A-Za-z]+");
+                        System.Text.RegularExpressions.Match m_ZHName = Regex.Match(item.ClientName, @"[\u4e00-\u9fa5]");
+
+                        if (m_EnName.Success || m_ZHName.Success)
+                        {
+                            itemClientName = insClients;
+                            continue;
+                        }
 
                         string[] clientIds = new string[] { };
                         if (insClients.Contains(','))