资料版块返回数据去空格

OASystem/EntitySync/Program.cs

@@ -82,7 +82,8 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Sys_MessageReadAuth)
     //typeof(Crm_DeleClient)
     
-    typeof(Res_ItemDetailInfo),
-    typeof(Res_ItemVendor)
+    //typeof(Res_ItemDetailInfo),
+    //typeof(Res_ItemVendor)
+    typeof(Res_CountryFeeCost)
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1,9 +1,4 @@
 
-
-using NetTaste;
-using System.Drawing.Printing;
-using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
-
 namespace OASystem.API.Controllers
 {
     /// <summary>
@@ -82,7 +77,15 @@ namespace OASystem.API.Controllers
                 CarData.Add(new CarDataSelectView { Id = 0, UnitArea = "全部" });
                 CarData = CarData.Where((x, i) => CarData.FindIndex(z => z.UnitArea == x.UnitArea) == i).ToList();
                 CarData = CarData.OrderBy(x => x.Id).ToList();
-                return Ok(JsonView(true, "查询成功", CarData));
+                List<CarDataSelectView> data= new List<CarDataSelectView>();
+                foreach (CarDataSelectView car in CarData)
+                {
+                    if (!string.IsNullOrWhiteSpace(car.UnitArea))
+                    {
+                        data.Add(car);
+                    }
+                }
+                return Ok(JsonView(true, "查询成功", data));
             }
             catch (Exception)
             {
@@ -266,8 +269,16 @@ namespace OASystem.API.Controllers
                     return Ok(JsonView(false, "暂无数据！"));
                 }
                 LocalGuide.Add(new QueryLocalGuideSelectView { Id = 0, UnitArea = "全部" });
-                LocalGuide = LocalGuide.Where((x, i) => LocalGuide.FindIndex(z => z.UnitArea == x.UnitArea) == i).ToList();
+                LocalGuide = LocalGuide.Where((x, i) => LocalGuide.FindIndex(z => z.UnitArea == x.UnitArea && z.UnitArea != "") == i).ToList();
                 LocalGuide = LocalGuide.OrderBy(x => x.Id).ToList();
+                List<QueryLocalGuideSelectView> data = new List<QueryLocalGuideSelectView>();
+                foreach (QueryLocalGuideSelectView Local in LocalGuide)
+                {
+                    if (!string.IsNullOrWhiteSpace(Local.UnitArea))
+                    {
+                        data.Add(Local);
+                    }
+                }
                 return Ok(JsonView(true, "查询成功", LocalGuide));
             }
             catch (Exception)

OASystem/OASystem.Domain/Entities/Resource/Res_CountryFeeCost.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Resource
+{
+    [SugarTable("Res_CountryFeeCost")]
+    public class Res_CountryFeeCost:EntityBase
+    {
+        /// <summary>
+        /// 洲名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string VisaContinent { get; set; }
+
+        /// <summary>
+        /// 国家名
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string VisaCountry { get; set; }
+
+        /// <summary>
+        /// 是否免签免签 0:是 1:否
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsVisaExemption { get; set; }
+        /// <summary>
+        /// 是否落地签 0:是 1:否
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsVisaOnArrival { get; set; }
+        /// <summary>
+        /// 是否电子签 0:是 1:否
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsElectronicSignature { get; set; }
+
+        /// <summary>
+        /// 签证费用
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        public decimal VisaPrice { get; set; }
+
+        /// <summary>
+        /// 签证费用描述
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(255)")]
+        public string VisaPriceDesc { get; set; }
+
+        /// <summary>
+        /// 签证类型 大公务/小公务/大小公务同时免签
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string VisaType { get; set; }
+
+        /// <summary>
+        /// 一般签证时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public DateTime VisaTime { get; set; }
+
+        /// <summary>
+        /// 签证是否加急 0:加急  1: 不加急
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsUrgent { get; set; }
+
+        /// <summary>
+        /// 加急时间 
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public DateTime UrgentTime { get; set; }
+
+        /// <summary>
+        /// 加急费用
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        public decimal UrgentPrice { get; set; }
+
+        /// <summary>
+        /// 加急费用描述 
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(255)")]
+        public string UrgentPriceDesc { get; set; }
+
+        /// <summary>
+        /// 签证地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string VisaAddress { get; set; }
+
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Resource/CarDataRepository.cs

@@ -27,19 +27,19 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 string sqlWhere = string.Empty;
                 if (!string.IsNullOrWhiteSpace(dto.UnitName))
                 {
-                    sqlWhere += string.Format(@" And UnitName='{0}'", dto.UnitName);
+                    sqlWhere += string.Format(@" And UnitName like '%{0}%'", dto.UnitName);
                 }
                 if (!string.IsNullOrWhiteSpace(dto.UnitArea) && dto.UnitArea!="全部")
                 {
-                    sqlWhere += string.Format(@" And UnitArea='{0}'", dto.UnitArea);
+                    sqlWhere += string.Format(@" And UnitArea like '%{0}%'", dto.UnitArea);
                 }
                 if (!string.IsNullOrWhiteSpace(dto.Contact))
                 {
-                    sqlWhere += string.Format(@" And Contact='{0}'", dto.Contact);
+                    sqlWhere += string.Format(@" And Contact like '%{0}%'", dto.Contact);
                 }
                 if (!string.IsNullOrWhiteSpace(dto.ContactTel))
                 {
-                    sqlWhere += string.Format(@" And ContactTel='{0}'", dto.ContactTel);
+                    sqlWhere += string.Format(@" And ContactTel like '%{0}%'", dto.ContactTel);
                 }
                 if (!string.IsNullOrEmpty(sqlWhere.Trim()))
                 {
@@ -89,7 +89,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         {
                             Code = 0,
                             Msg = "查询成功",
-                            Data = new { pageCount = count, totalPage = ((int)totalPage).ToString(), pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = ListData },
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = ListData },
                         };
                     }
                     

OASystem/OASystem.Infrastructure/Repositories/Resource/LocalGuideDataRepository.cs

@@ -94,19 +94,19 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 string sqlWhere = string.Empty;
                 if (!string.IsNullOrWhiteSpace(dto.UnitName))
                 {
-                    sqlWhere += string.Format(@" And UnitName='{0}'", dto.UnitName);
+                    sqlWhere += string.Format(@" And UnitName like '%{0}%'", dto.UnitName);
                 }
                 if (!string.IsNullOrWhiteSpace(dto.UnitArea) && dto.UnitArea != "全部")
                 {
-                    sqlWhere += string.Format(@" And UnitArea='{0}'", dto.UnitArea);
+                    sqlWhere += string.Format(@" And UnitArea like '%{0}%''", dto.UnitArea);
                 }
                 if (!string.IsNullOrWhiteSpace(dto.Contact))
                 {
-                    sqlWhere += string.Format(@" And Contact='{0}'", dto.Contact);
+                    sqlWhere += string.Format(@" And Contact like '%{0}%'", dto.Contact);
                 }
                 if (!string.IsNullOrWhiteSpace(dto.ContactTel))
                 {
-                    sqlWhere += string.Format(@" And ContactTel='{0}'", dto.ContactTel);
+                    sqlWhere += string.Format(@" And ContactTel like '%{0}%'", dto.ContactTel);
                 }
                 if (!string.IsNullOrEmpty(sqlWhere.Trim()))
                 {
@@ -156,7 +156,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         {
                             Code = 0,
                             Msg = "查询成功",
-                            Data = new { pageCount = count, totalPage = ((int)totalPage).ToString(), pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = ListData },
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = ListData },
                         };
                     }
 
@@ -204,7 +204,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         {
                             Code = 0,
                             Msg = "查询成功",
-                            Data = new { pageCount = count, totalPage = ((int)totalPage).ToString(), pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = ListData },
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = ListData },
                         };
                     }
                 }

OASystem/_Doc/OA2023数据字典.docx

@@ -2927,3 +2927,95 @@ Null
 机场英文名
 
 
+5) 国家_签证费用标准表：Res_CountryFeeCost（挪用）
+                                   字段名
+                                 类型长度
+                                 字段属性
+                                 字段约束
+                                 字段描述
+                                    备注
+VisaContinent
+varchar(50)
+Null
+
+洲名
+
+VisaCountry
+varchar(50)
+Null
+
+国家名
+
+IsVisaExemption
+int
+Null
+
+是否免签免签
+0:是 1:否
+IsVisaOnArrival
+int
+Null
+
+是否落地签
+0:是 1:否
+IsElectronicSignature
+int
+Null
+
+是否电子签
+0:是 1:否
+VisaPrice
+decimal(10, 2)
+Null
+
+签证费用
+
+VisaPriceDesc
+nvarchar(255)
+Null
+
+签证费用描述
+
+VisaType
+varchar(50)
+Null
+
+签证类型
+大公务/小公务/大小公务同时免签
+VisaTime
+varchar(50)
+Null
+
+一般签证时间
+
+IsUrgent
+int
+Null
+
+签证是否加急
+0:加急  1: 不加急
+UrgentTime
+varchar(50)
+Null
+
+加急时间 
+
+UrgentPrice
+decimal(10, 2)
+Null
+
+加急费用
+
+UrgentPriceDesc
+nvarchar(255)
+Null
+
+加急费用描述 
+
+VisaAddress
+nvarchar(255)
+Null
+
+签证地址
+
+