商邀资料 --> info API 更改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3353,6 +3353,56 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> UploadProject(IFormFile file)
         {
+            //var TypeName = Request.Headers["TypeName"].ToString();
+
+            //if (file == null) return Ok(JsonView(false, "文件不存在！"));
+
+            //var fileDir = AppSettingsHelper.Get("GrpFileBasePath");
+            ////文件名称
+            //string projectFileName = file.FileName;
+            ////上传的文件的路径
+            //string filePath = $"{fileDir}/{projectFileName}";
+
+            //if (TypeName == "A")//A代表团组增减款项
+            //{
+            //    filePath = fileDir + $@"\团组增减款项相关文件";
+            //    if (!Directory.Exists(filePath))
+            //    {
+            //        Directory.CreateDirectory(filePath);
+            //    }
+
+            //    //上传的文件的路径
+            //    filePath += $@"\{projectFileName}";
+
+            //}
+            //else if (TypeName == "B")//B代表商邀相关文件
+            //{
+            //    //上传的文件的路径
+            //    filePath = fileDir + $@"\商邀相关文件\{projectFileName}";
+
+            //    if (!Directory.Exists(filePath))
+            //    {
+            //        Directory.CreateDirectory(filePath);
+            //    }
+
+            //    //上传的文件的路径
+            //    filePath = $@"\{projectFileName}";
+            //}
+            //try
+            //{
+            //    using (FileStream fs = System.IO.File.Create(filePath))
+            //    {
+            //        file.CopyTo(fs);
+            //        fs.Flush();
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+            //    return Ok(JsonView(false, $"文件上传失败! Error:{ex.Message}"));
+            //}
+
+            //return Ok(JsonView(true, "上传成功！", projectFileName));
+
             try
             {
                 var TypeName = Request.Headers["TypeName"].ToString();
@@ -3363,7 +3413,7 @@ namespace OASystem.API.Controllers
                     string projectFileName = file.FileName;
 
                     //上传的文件的路径
-                    string filePath = "";
+                    string filePath = $"{fileDir}/{projectFileName}";
                     if (TypeName == "A")//A代表团组增减款项
                     {
 
@@ -3401,7 +3451,6 @@ namespace OASystem.API.Controllers
             catch (Exception ex)
             {
                 return Ok(JsonView(false, "程序错误！"));
-                throw;
             }
 
         }

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1601,22 +1601,10 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> QueryInvitationOfficialActivityById(QueryInvitationOfficialActivityByIdDto dto)
+        public async Task<IActionResult> QueryInvitationOfficialActivityById(int id)
         {
-            try
-            {
-                Result groupData = await _InvitationOfficialActivityDataRep.QueryInvitationOfficialActivityById(dto);
-                if (groupData.Code != 0)
-                {
-                    return Ok(JsonView(false, groupData.Msg));
-                }
-                return Ok(JsonView(true, groupData.Msg, groupData.Data));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
-            }
+            if (id < 1) return Ok(JsonView(false, "Id参数错误!"));
+            return Ok(await _InvitationOfficialActivityDataRep.Info(id));
         }
         /// <summary>
         /// 商邀资料操作（Status:1.新增,2.修改）

OASystem/OASystem.Api/appsettings.json

@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
     "OA2023DB": "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2023DB;MultipleActiveResultSets=True;",
-    "OA2014DB": "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2014;MultipleActiveResultSets=True"
+    "OA2014DB": "server=132.232.92.186;uid=sa;pwd=Yjx@158291;database=OA2014;MultipleActiveResultSets=True;"
   },
   "JwtSecurityKey": "48d3f4fe770940a1068052f581536b81", //jwt密钥
   "UseSwagger": "true", //启用Swagger

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -220,6 +220,7 @@ namespace OASystem.Domain.AutoMappers
             #endregion
             #region 商邀资料
             CreateMap<OpInvitationOfficialActivityDto, Res_InvitationOfficialActivityData>();
+            CreateMap<Res_InvitationOfficialActivityData, IOAInfoView>();
             #endregion
 
             #region 公务出访

OASystem/OASystem.Domain/Entities/Resource/Res_InvitationOfficialActivityData.cs

@@ -88,11 +88,19 @@ namespace OASystem.Domain.Entities.Resource
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
         public string Delegation { get; set; }
+
         /// <summary>
         /// 文件地址
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
         public string FilePath { get; set; }
+
+        /// <summary>
+        /// 文件地址
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
+        public string SndFileName { get; set; }
+
         /// <summary>
         /// 修改版文件地址
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Resource/InvitationOfficialActivityDataView.cs

@@ -1,9 +1,11 @@
-using OASystem.Domain.Entities;
+
+using OASystem.Domain.Entities;
 using OASystem.Domain.Entities.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels.Resource
@@ -14,4 +16,118 @@ namespace OASystem.Domain.ViewModels.Resource
         public string CreateUserName { get; set; }
         public string DelegationStr { get;set; }
     }
+
+    public class IOAInfoView
+    {
+        public int Id { get; set; }
+
+        // <summary>
+        /// 邀请方国家
+        /// </summary>
+        public string Country { get; set; }
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; }
+        /// <summary>
+        /// 邀请方名称
+        /// </summary>
+        public string UnitName { get; set; }
+        /// <summary>
+        ///邀请方官网
+        /// </summary>
+        public string UnitWeb { get; set; }
+        /// <summary>
+        /// 涉及领域
+        /// </summary>
+        public string Field { get; set; }
+        /// <summary>
+        /// 邀请方地址
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 邀请方信息
+        /// </summary>
+        public string UnitInfo { get; set; }
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string Contact { get; set; }
+        /// <summary>
+        /// 职务
+        /// </summary>
+        public string Job { get; set; }
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Tel { get; set; }
+        /// <summary>
+        /// 电子邮箱
+        /// </summary>
+        public string Email { get; set; }
+        /// <summary>
+        /// 微信
+        /// </summary>
+        public string WeChat { get; set; }
+        /// <summary>
+        /// fb
+        /// </summary>
+        public string FaceBook { get; set; }
+        /// <summary>
+        /// ins
+        /// </summary>
+        public string Ins { get; set; }
+        /// <summary>
+        /// 团名
+        /// </summary>
+        public string Delegation { get; set; }
+
+        /// <summary>
+        /// 文件地址
+        /// </summary>
+        public string SndFileName { get; set; }
+
+        /// <summary>
+        /// 修改版文件地址
+        /// </summary>
+        public string[] SndFilePathItem
+        {
+            get
+            {
+                var urls = new List<string>();
+                if (string.IsNullOrEmpty(SndFileName)) return urls.ToArray();
+
+                var filePath = @$"http://132.232.92.186:24/Office/GrpFile/商邀相关文件/";
+                try
+                {
+                    var strs = JsonSerializer.Deserialize<List<string>>(SndFileName);
+                    foreach (var str in strs)
+                    {
+                        urls.Add(@$"{filePath}{str}");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    urls.Add(@$"{filePath}{SndFileName}");
+                }
+                return urls.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// 传真号码
+        /// </summary>
+        public string Fax { get; set; }
+
+        /// <summary>
+        /// 其他信息
+        /// </summary>
+        public string OtherInfo { get; set; }
+
+        /// <summary>
+        /// 背景
+        /// </summary>
+        public string Background { get; set; }
+    }
+
 }

OASystem/OASystem.Infrastructure/Repositories/Resource/InvitationOfficialActivityDataRepository.cs

@@ -7,6 +7,7 @@ using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.ViewModels;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Domain.ViewModels.Resource;
+using OASystem.Infrastructure.Tools;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -127,25 +128,15 @@ namespace OASystem.Infrastructure.Repositories.Resource
         /// <param name="dto"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<Result> QueryInvitationOfficialActivityById(QueryInvitationOfficialActivityByIdDto dto)
+        public async Task<JsonView> Info(int id)
         {
-            Result result = new Result() { Code = -2, Msg = "未知错误" };
-            try
-            {
-                Res_InvitationOfficialActivityData res_Invitation = await _sqlSugar.Queryable<Res_InvitationOfficialActivityData>().FirstAsync(a => a.Id == dto.Id && a.IsDel == 0);
-                if (res_Invitation!=null) {
-                    result = new Result() { Code = 0, Msg = "查询成功！", Data = res_Invitation };
-                }
-                else
-                {
-                    result = new Result() { Code = 0, Msg = "暂无数据！", Data = res_Invitation };
-                }
-            }
-            catch (Exception ex)
-            {
-                result = new Result() { Code = -2, Msg = "未知错误" };
-            }
-            return result;
+            
+            var res = await _sqlSugar.Queryable<Res_InvitationOfficialActivityData>()
+                                     .Where(x => x.Id == id && x.IsDel == 0)
+                                     .FirstAsync();
+            
+            var _view = _mapper.Map<IOAInfoView>(res);
+            return new JsonView() { Code = StatusCodes.Status200OK, Msg = "操作成功", Data = _view };
         }
 
         public async Task<Result> OpInvitationOfficialActivity(OpInvitationOfficialActivityDto dto)