|
@@ -3804,38 +3804,41 @@ namespace OASystem.API.Controllers
|
|
|
string sql = string.Format("select b.Id,b.Pinyin,b.lastName,b.firstName,b.phone from Grp_TourClientList a, Crm_DeleClient b where a.clientid = b.id and a.isdel = 0 and a.diid = {0}", groupInfo.Id);
|
|
string sql = string.Format("select b.Id,b.Pinyin,b.lastName,b.firstName,b.phone from Grp_TourClientList a, Crm_DeleClient b where a.clientid = b.id and a.isdel = 0 and a.diid = {0}", groupInfo.Id);
|
|
|
var arr = _sqlSugar.SqlQueryable<SimplClientInfo>(sql).ToList();
|
|
var arr = _sqlSugar.SqlQueryable<SimplClientInfo>(sql).ToList();
|
|
|
|
|
|
|
|
- string visaClientName = visaDatas.Find(it => payInfo.DIId == it.DIId && payInfo.CId == it.Id)?.VisaClient ?? "";
|
|
|
|
|
- string clientName = "-";
|
|
|
|
|
- if (Regex.Match(visaClientName, @"\d+,?").Value.Length > 0)
|
|
|
|
|
- {
|
|
|
|
|
- string[] temparr = visaClientName.Split(',');
|
|
|
|
|
- string fistrStr = temparr[0];
|
|
|
|
|
- int count = temparr.Length;
|
|
|
|
|
-
|
|
|
|
|
- int tempId;
|
|
|
|
|
- bool success = int.TryParse(fistrStr, out tempId);
|
|
|
|
|
- if (success)
|
|
|
|
|
- {
|
|
|
|
|
- SimplClientInfo tempInfo = arr.FirstOrDefault(s => s.Id == tempId);
|
|
|
|
|
-
|
|
|
|
|
- if (tempInfo != null)
|
|
|
|
|
- {
|
|
|
|
|
- EncryptionProcessor.DecryptProperties(tempInfo);
|
|
|
|
|
- if (count > 1)
|
|
|
|
|
- {
|
|
|
|
|
- clientName = string.Format(@"{0}{1}等{2}人", tempInfo.LastName, tempInfo.FirstName, count);
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- clientName = string.Format(@"{0}{1}", tempInfo.LastName, tempInfo.FirstName);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- clientName = fistrStr;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ var clientName = visaDatas.Find(it => payInfo.DIId == it.DIId && payInfo.CId == it.Id)?.VisaDescription ?? "";
|
|
|
|
|
+ #region 客户名称拼接
|
|
|
|
|
+ //string visaClientName = visaDatas.Find(it => payInfo.DIId == it.DIId && payInfo.CId == it.Id)?.VisaClient ?? "";
|
|
|
|
|
+ //string clientName = "-";
|
|
|
|
|
+ //if (Regex.Match(visaClientName, @"\d+,?").Value.Length > 0)
|
|
|
|
|
+ //{
|
|
|
|
|
+ // string[] temparr = visaClientName.Split(',');
|
|
|
|
|
+ // string fistrStr = temparr[0];
|
|
|
|
|
+ // int count = temparr.Length;
|
|
|
|
|
+
|
|
|
|
|
+ // int tempId;
|
|
|
|
|
+ // bool success = int.TryParse(fistrStr, out tempId);
|
|
|
|
|
+ // if (success)
|
|
|
|
|
+ // {
|
|
|
|
|
+ // SimplClientInfo tempInfo = arr.FirstOrDefault(s => s.Id == tempId);
|
|
|
|
|
+
|
|
|
|
|
+ // if (tempInfo != null)
|
|
|
|
|
+ // {
|
|
|
|
|
+ // EncryptionProcessor.DecryptProperties(tempInfo);
|
|
|
|
|
+ // if (count > 1)
|
|
|
|
|
+ // {
|
|
|
|
|
+ // clientName = string.Format(@"{0}{1}等{2}人", tempInfo.LastName, tempInfo.FirstName, count);
|
|
|
|
|
+ // }
|
|
|
|
|
+ // else
|
|
|
|
|
+ // {
|
|
|
|
|
+ // clientName = string.Format(@"{0}{1}", tempInfo.LastName, tempInfo.FirstName);
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
|
|
+ // else
|
|
|
|
|
+ // {
|
|
|
|
|
+ // clientName = fistrStr;
|
|
|
|
|
+ // }
|
|
|
|
|
+ //}
|
|
|
|
|
+ #endregion
|
|
|
|
|
|
|
|
priName = $"[费用名称：{clientName}]";
|
|
priName = $"[费用名称：{clientName}]";
|
|
|
break;
|
|
break;
|
