公务出访 --> (CURD)新增字段 邮箱/微信、网址、性质

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1685,9 +1685,19 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             dynamic groupInfos = null;
             if (_groupData.Code == 0) groupInfos = _groupData.Data;
 
-            List<Sys_SetData> data = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToList();
-            List<Grp_DeleFile> _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel == 0 && a.Category == 970).ToList();
-            return Ok(JsonView(true, "查询成功！", new { Delegation = groupInfos, SetData = data, DeleFile = _DeleFile }));
+            var data = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToList();
+
+            var natureData = _sqlSugar.Queryable<Sys_SetData>()
+                                      .Where(a => a.IsDel == 0 && a.STid == 86)
+                                      .Select(x => new
+                                      {
+                                          x.Id,
+                                          x.Name
+                                      })
+                                      .ToList();
+
+            var _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel == 0 && a.Category == 970).ToList();
+            return Ok(JsonView(true, "查询成功！", new { Delegation = groupInfos, SetData = data, Nature = natureData, DeleFile = _DeleFile }));
         }
 
         /// <summary>

OASystem/OASystem.Domain/Dtos/Resource/OfficialActivitiesDto.cs

@@ -142,6 +142,13 @@ namespace OASystem.Domain.Dtos.Resource
         /// </summary>
         public string? Website { get; set; }
 
+        /// <summary>
+        /// 公务性质
+        /// setdata 外键Id 
+        /// </summary>
+        public int NatureId { get; set; }
+
+
     }
 
     public class OfficialActivitiesUploadFilesDto

OASystem/OASystem.Domain/Entities/Resource/Res_OfficialActivities.cs

@@ -149,15 +149,24 @@ namespace OASystem.Domain.Entities.Resource
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(500)")]
         public string? ScreenshotOfMailUrl { get; set; }
+
         /// <summary>
         /// 邮箱/微信
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
         public string? EmailOrWeChat { get; set; }
+
         /// <summary>
         /// 网址
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string? Website { get; set; }
+
+        /// <summary>
+        /// 公务性质
+        /// setdata 外键Id 
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int NatureId { get; set; } 
     }
 }

OASystem/OASystem.Domain/ViewModels/Resource/OfficialActivitiesView.cs

@@ -11,7 +11,10 @@ namespace OASystem.Domain.ViewModels.Resource
     public class OfficialActivitiesView : Res_OfficialActivities
     {
 
-        public List<string> ScreenshotOfMailUrls { get {
+        public List<string> ScreenshotOfMailUrls
+        {
+            get
+            {
 
                 List<string> urls = new List<string>();
                 urls = !string.IsNullOrEmpty(ScreenshotOfMailUrl)
@@ -19,11 +22,18 @@ namespace OASystem.Domain.ViewModels.Resource
                     : new List<string>();
 
                 List<string> urls1 = new List<string>();
-                urls.ForEach(x => {
+                urls.ForEach(x =>
+                {
                     urls1.Add("http://132.232.92.186:24/" + x);
                 });
                 return urls1;
-            } }
+            }
+        }
+
+        /// <summary>
+        /// 性质
+        /// </summary>
+        public string NatureName { get; set; }
 
         public string CreateUserName { get; set; }
         public string OfficialFormName { get; set; }

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -44,6 +44,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             string sql = string.Format(@"
 SELECT
+  sd1.Name AS NatureName,
   *,
   u.CnName AS CreateUserName,
   sd.Name AS OfficialFormName
@@ -51,6 +52,7 @@ FROM
   Res_OfficialActivities o
   LEFT JOIN Sys_SetData sd ON o.OfficialForm = sd.Id
   LEFT JOIN Sys_Users u ON o.CreateUserId = u.Id
+  LEFT JOIN Sys_SetData sd1 ON o.NatureId = sd1.Id
 {0}
 ORDER BY
   o.CreateTime desc
@@ -270,6 +272,7 @@ FROM
                     IsSubmitApproval = dto.IsSubmitApproval,
                     EmailOrWeChat = dto.EmailOrWeChat,
                     Website = dto.Website,
+                    NatureId = dto.NatureId,
                 });
                 if (res)
                 {