Sfoglia il codice sorgente

1、公务出访 确认、取消邀请接口编写

LEIYI 7 mesi fa
parent
commit
ed154cd239

+ 10 - 47
OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1754,6 +1754,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             return Ok(JsonView(true, groupData.Msg, groupData.Data));
 
         }
+        
         /// <summary>
         /// 上传文件(邮件截图)
         /// </summary>
@@ -1860,7 +1861,6 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             return Ok(JsonView(false, "操作失败!"));
         }
 
-
         /// <summary>
         /// 删除文件(邮件截图)
         /// </summary>
@@ -1918,7 +1918,6 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             return Ok(JsonView(false, "操作失败!"));
         }
 
-
         /// <summary>
         /// 公务出访 确认、取消邀请
         /// </summary>
@@ -1926,52 +1925,16 @@ 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> OfficialActivitiesDelFile1(OfficialActivitiesDelFileDto dto)
+        public async Task<IActionResult> OfficialActivitiesInviteOperation(OfficialActivitiesInviteOperationDto dto)
         {
-            string networkPath = AppSettingsHelper.Get("GrpFileBaseUrl");
-            string localPath = AppSettingsHelper.Get("GrpFileBasePath");
-            string ptfPath = AppSettingsHelper.Get("GrpFileFtpPath");
-            if (dto.Id < 1 || string.IsNullOrEmpty(dto.FileName))
-            {
-                return Ok(JsonView(false, "参数有误,上传失败!"));
-            }
-
-            string localFileDir = $"{localPath}{ptfPath}";
-            List<string> fileUrls = new List<string>();
-
-            var oaInfo = await _sqlSugar.Queryable<Res_OfficialActivities>().Where(x => x.Id == dto.Id).FirstAsync();
-
-            if (oaInfo != null)
-            {
-                string urlJson = oaInfo.ScreenshotOfMailUrl ?? "";
-                if (!string.IsNullOrEmpty(urlJson))
-                {
-                    List<string> urls = JsonConvert.DeserializeObject<List<string>>(urlJson);
-
-                    var filePath = urls.Find(x => x.Contains(dto.FileName));
-                    if (string.IsNullOrEmpty(filePath)) return Ok(JsonView(false, "文件不存在!"));
-
-                    var updFile = urls.Remove(filePath);
-                    if (updFile)
-                    {
-                        //删除文件
-                        string fileUrl = AppSettingsHelper.Get("GrpFileBasePath").Replace(@"/Office/GrpFile", "") + filePath;
-
-                        if (System.IO.File.Exists(fileUrl))
-                        {
-                            System.IO.File.Delete(fileUrl);
-                        }
-
-
-                        string urlJsonstr = JsonConvert.SerializeObject(urls);
-                        var upd = await _sqlSugar.Updateable<Res_OfficialActivities>()
-                                                 .SetColumns(x => x.ScreenshotOfMailUrl == urlJsonstr)
-                                                 .Where(x => x.Id == dto.Id)
-                                                 .ExecuteCommandAsync();
-                        if (upd > 0) return Ok(JsonView(true, "操作成功!"));
-                    }
-                }
-            }
+            if (dto.Id < 1 ) return Ok(JsonView(false, "Id参数有误!"));
+            if (dto.Type < 0 || dto.Type > 1) return Ok(JsonView(false, "Type参数有误!"));
+
+            var upd = await _sqlSugar.Updateable<Res_OfficialActivities>()
+                                     .SetColumns(x => x.ConfirmTheInvitation == dto.Type)
+                                     .Where(x => x.Id == dto.Id)
+                                     .ExecuteCommandAsync();
+            if (upd > 0) return Ok(JsonView(true, "操作成功!"));
 
             return Ok(JsonView(false, "操作失败!"));
         }

+ 10 - 0
OASystem/OASystem.Domain/Dtos/Resource/OfficialActivitiesDto.cs

@@ -151,6 +151,16 @@ namespace OASystem.Domain.Dtos.Resource
         public string FileName { get; set; }
     }
 
+    public class OfficialActivitiesInviteOperationDto
+    {
+        public int Id { get; set; }
+        /// <summary>
+        /// 邀请确认
+        /// 0 未确认 1 已确认
+        /// </summary>
+        public int Type { get; set; }
+    }
+
     /// <summary>
     /// 导出请示参数
     /// </summary>

+ 1 - 1
OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -151,7 +151,7 @@ FROM
 {0}", sqlWhere);
                 var OfficialActivities = await _sqlSugar.SqlQueryable<OfficialActivitiesView>(sql)
                     .FirstAsync();
-                OfficialActivities.ScreenshotOfMailUrls.ForEach(url => { url = AppSettingsHelper.Get("GrpFileBaseUrl") + url; });
+                //OfficialActivities.ScreenshotOfMailUrls.ForEach(url => { url = AppSettingsHelper.Get("GrpFileBaseUrl") + url; });
                 result = new Result() { Code = 0, Msg = "查询成功!", Data = OfficialActivities };
 
             }