Explorar el Código

优化部分代码

yuanrf hace 1 año
padre
commit
9e37ea61f4

+ 3 - 3
OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -65,9 +65,9 @@ namespace OASystem.API.Controllers
                     Dictionary<int, string> dicHeader = new Dictionary<int, string>();
                     List<string> listNameStr = new List<string>() { "姓名", "Name" };
                     List<string> listSexStr = new List<string>() { "性别", "Gender" };
-                    List<string> listDOBStr = new List<string>() { "D.O.B", "出生年月", "生日" };
+                    List<string> listDOBStr = new List<string>() { "D.O.B", "出生年月", "生日", "出生日期" };
                     List<string> listIdCard = new List<string>() { "身份证号码", "身份证" };
-                    List<string> listOrganizationStr = new List<string>() { "工作单位", "Organization", "单位" };
+                    List<string> listOrganizationStr = new List<string>() { "工作单位", "Organization", "单位", "所在单位及职务" };
                     List<string> listJobStr = new List<string>() { "职务", "Title", "职位" };
                     List<string> listMobileStr = new List<string>() { "联系电话", "Mobile" };
                     List<string> listAgeStr = new List<string>() { "年龄", "Age" };
@@ -210,7 +210,7 @@ namespace OASystem.API.Controllers
             catch (Exception ex)
             {
                 jw.Code = 400;
-                jw.Msg = "base64数据有误!";
+                jw.Msg = "程序异常!";
                 jw.Data = new string[0];
             }
 

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

@@ -1852,7 +1852,7 @@ namespace OASystem.API.Controllers
             try
             {
                 var res = await _airTicketResRep.SoftDeleteByIdAsync<Grp_AirTicketReservations>(dto.Id.ToString(), dto.DeleteUserId);
-                if (!res)
+                if (res)
                 {
                     var result = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == dto.Id && a.CTable == 85).SetColumns(a => new Grp_CreditCardPayment()
                     {
@@ -1860,9 +1860,9 @@ namespace OASystem.API.Controllers
                         DeleteUserId = dto.DeleteUserId,
                         DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                     }).ExecuteCommandAsync();
-                    return Ok(JsonView(false, "删除失败"));
+                    return Ok(JsonView(true, "删除成功!"));
                 }
-                return Ok(JsonView(true, "删除成功!"));
+                return Ok(JsonView(false, "删除失败!"));
             }
             catch (Exception ex)
             {

+ 1 - 1
OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -675,7 +675,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
 
             string teamCode = "";
-            if (dto.PortType == 1 || dto.PortType == 2) //web
+            if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3) //web
             {
 
                 string teamCodeSql = string.Format("Select TourCode From Grp_DelegationInfo");