Ver código fonte

修改变量名问题

yuanrf 20 horas atrás
pai
commit
8b5b63d136

+ 9 - 9
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3289,7 +3289,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,
@@ -3353,7 +3353,7 @@ FROM
                     });
 
                     //工作信息
-                    visaDetails.ClientCompany=new()
+                    visaDetails.ClientCompany = new()
                     {
                         CompanyFullName = (string)jsonData.GetType().GetProperty("工作经历雇主")!.GetValue(jsonData)!,
                     };
@@ -3376,7 +3376,7 @@ FROM
             if (compId < 1)
             {
                 _sqlSugar.RollbackTran();
-                return Ok(JsonView(false,"公司信息更新失败!"));
+                return Ok(JsonView(false, "公司信息更新失败!"));
             }
             visaDetails.ClientInfo.CrmCompanyId = compId;
             // 客户资料表
@@ -3435,7 +3435,7 @@ FROM
             #endregion
             #endregion
 
-            return Ok(JsonView(true,jsonString));
+            return Ok(JsonView(true, jsonString));
         }
 
         #region 扩展处理
@@ -3600,9 +3600,9 @@ FROM
             if (parts.Length != 2) return (null, null);
 
             // 3. 解析
-            bool ff = DateTime.TryParse(parts[0].Trim(),out var from);
-            bool tf = DateTime.TryParse(parts[1].Trim(),out var to);
-            
+            bool ff = DateTime.TryParse(parts[0].Trim(), out var from);
+            bool tf = DateTime.TryParse(parts[1].Trim(), out var to);
+
             return (tf ? from : null, tf ? to : null);
         }
 
@@ -3693,7 +3693,7 @@ FROM
         /// </summary>
         /// <param name="raw"></param>
         /// <returns></returns>
-        public static (bool hasService, string branch, string rank, string specialty,(DateTime? start, DateTime? end) period) MilitaryParser(string? raw)
+        public static (bool hasService, string branch, string rank, string specialty, (DateTime? start, DateTime? end) period) MilitaryParser(string? raw)
         {
             const string fmt = "yyyy年MM月dd日";
 
@@ -3727,7 +3727,7 @@ FROM
         /// </summary>
         /// <param name="raw"></param>
         /// <returns></returns>
-        public static (string fatherName, DateTime? fatherDob,string motherName, DateTime? motherDob)ParentParser(string? raw)
+        public static (string fatherName, DateTime? fatherDob, string motherName, DateTime? motherDob) ParentParser(string? raw)
         {
             const string fmt = "yyyy年MM月dd日";
 

+ 3 - 2
OASystem/OASystem.Domain/Entities/Customer/Crm_DeleClient.cs

@@ -525,7 +525,7 @@ namespace OASystem.Domain.Entities.Customer
         /// 赴美目的
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
-        public string PurposeUSA { get; set; }
+        public string USAPurpose { get; set; }
 
         /// <summary>
         /// 美国联系人或组织
@@ -667,7 +667,8 @@ namespace OASystem.Domain.Entities.Customer
     }
 
 
-    public class GroupClints {
+    public class GroupClints
+    {
         public int Id { get; set; }
         public string Name { get; set; }
         /// <summary>