bug调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -49,6 +49,7 @@ using System.IO.Compression;
 using System.Linq.Expressions;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Web;
 using static OASystem.API.OAMethodLib.JWTHelper;
 using static OASystem.Infrastructure.Repositories.Groups.AirTicketResRepository;
@@ -3289,7 +3290,7 @@ FROM
                         WorkState = (string)jsonData.GetType().GetProperty("工作职责")!.GetValue(jsonData)!,
                         WorkDate = (string)jsonData.GetType().GetProperty("入职/入学时间（详细到月）")!.GetValue(jsonData)!,
                         USAAddress = (string)jsonData.GetType().GetProperty("请提供美国详细住址")!.GetValue(jsonData)!,
-                        PurposeUSA = (string)jsonData.GetType().GetProperty("赴美目的")!.GetValue(jsonData)!,
+                        USAPurpose = (string)jsonData.GetType().GetProperty("赴美目的")!.GetValue(jsonData)!,
                         CostBearers = (string)jsonData.GetType().GetProperty("费用谁付")!.GetValue(jsonData)!,
                         USAContact = (string)jsonData.GetType().GetProperty("美国联系人或组织")!.GetValue(jsonData)!,
                         USAContactTel = usa_phone,
@@ -3783,10 +3784,6 @@ FROM
 
         #endregion
 
-
-
-
-
         /// <summary>
         ///  根据团组Id获取签证客户信息List
         /// </summary>
@@ -4045,6 +4042,7 @@ FROM
             return Ok(JsonView(true, msg));
         }
 
+        #endregion
         #endregion
 
         #region 团组任务分配
@@ -9023,8 +9021,9 @@ FROM
 
                         #endregion
 
+                        var guid = CommonFun.GUID.Substring(0,8);
                         //文件名
-                        string strFileName = $"{_DelegationInfo.TeamName}出入境费用{Guid.NewGuid().ToString()}.docx";
+                        string strFileName = CommonFun.ValidFileName($"{_DelegationInfo.TeamName}出入境费用{guid}.docx");
                         AsposeHelper.removewatermark_v2180();
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
@@ -28502,6 +28501,13 @@ WHERE
             return Ok(jw);
         }
 
+        [HttpPost]
+        public async Task<IActionResult> TimeTest1()
+        {
+            var infos = await _sqlSugar.Queryable<Crm_DeleClient>().ToListAsync();
+
+            return Ok(infos);
+        }
+
     }
 }
-#endregion

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1068,7 +1068,6 @@ namespace OASystem.API.OAMethodLib
 
         #endregion
 
-
         #region 根据团ID获取各板块实际操作人
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Customer/Crm_DeleClient.cs

@@ -516,7 +516,6 @@ namespace OASystem.Domain.Entities.Customer
 
         /// <summary>
         /// 请提供美国详细住址
-        ///   赴美目的
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
         public string USAAddress { get; set; }
@@ -525,7 +524,7 @@ namespace OASystem.Domain.Entities.Customer
         /// 赴美目的
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
-        public string PurposeUSA { get; set; }
+        public string USAPurpose { get; set; }
 
         /// <summary>
         /// 美国联系人或组织
@@ -662,7 +661,7 @@ namespace OASystem.Domain.Entities.Customer
         /// <summary>
         /// 母亲出生日期
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn( IsNullable = true, ColumnDataType = "varchar(50)")]
         public DateTime? MthBirth { get; set; }
     }
 

OASystem/OASystem.Infrastructure/Repositories/Groups/TourClientListRepository.cs

@@ -324,11 +324,13 @@ WHERE
 
                 EncryptionProcessor.EncryptProperties(dto);
 
-                var clientInfo = await _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0
-                                                                                         && it.LastName.Equals(dto.LastName)
-                                                                                         && it.FirstName.Equals(dto.FirstName)
-                                                                                   //&& it.Phone.Equals(dto.Phone)
-                                                                                   ).FirstAsync();
+                var clientInfo = await _sqlSugar.Queryable<Crm_DeleClient>()
+                    .Select(x => new {x.Id,x.CrmCompanyId,x.IsDel,x.LastName,x.FirstName })
+                    .Where(it => it.IsDel == 0
+                            && it.LastName.Equals(dto.LastName)
+                            && it.FirstName.Equals(dto.FirstName)
+                    //&& it.Phone.Equals(dto.Phone)
+                    ).FirstAsync();
 
                 Crm_CustomerCompany _CustomerCompany = new Crm_CustomerCompany()
                 {

OASystem/OASystem.Infrastructure/Tools/CommonFun.cs

@@ -794,7 +794,6 @@ public static class CommonFun
         }
     }
 
-
     /// <summary>
     /// 常见的双字姓氏列表
     /// </summary>