|
@@ -1454,6 +1454,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
throw;
|
|
|
}
|
|
|
}
|
|
|
+ #endregion
|
|
|
|
|
|
#region 公务出访
|
|
|
|
|
@@ -1467,8 +1468,8 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
{
|
|
|
List<Grp_DelegationInfo> _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(a => a.IsDel == 0).OrderBy(a => a.CreateTime, OrderByType.Desc).ToList();
|
|
|
List<Sys_SetData> data = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToListAsync();
|
|
|
- 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=_DelegationInfos,SetData=data, DeleFile= _DeleFile }));
|
|
|
+ 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 = _DelegationInfos, SetData = data, DeleFile = _DeleFile }));
|
|
|
}
|
|
|
[HttpPost]
|
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
@@ -1544,15 +1545,14 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- int Type =int.Parse(Request.Headers["Type"]);
|
|
|
- int DiId= int.Parse(Request.Headers["DiId"]);
|
|
|
- int CreateUserId= DiId = int.Parse(Request.Headers["CreateUserId"]);
|
|
|
+ int Type = int.Parse(Request.Headers["Type"]);
|
|
|
+ int DiId = int.Parse(Request.Headers["DiId"]);
|
|
|
+ int CreateUserId = int.Parse(Request.Headers["CreateUserId"]);
|
|
|
if (file != null)
|
|
|
{
|
|
|
var fileDir = AppSettingsHelper.Get("GrpFileBasePath");
|
|
|
|
|
|
string projectFileName = file.FileName;
|
|
|
-
|
|
|
|
|
|
string filePath = "";
|
|
|
if (!Directory.Exists(fileDir))
|
|
@@ -1591,8 +1591,39 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
throw;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ [HttpPost]
|
|
|
+ [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
|
+ public async Task<IActionResult> DelloadOfficialActivities(DelBaseDto dto)
|
|
|
+ {
|
|
|
+ try
|
|
|
+ {
|
|
|
+ var fileDir = AppSettingsHelper.Get("GrpFileBasePath");
|
|
|
+ Grp_DeleFile _DeleFile = await _sqlSugar.Queryable<Grp_DeleFile>().FirstAsync(a => a.Id == dto.Id);
|
|
|
+ if (_DeleFile != null)
|
|
|
+ {
|
|
|
+ string fileName = _DeleFile.FileName;
|
|
|
+ string filePath = fileDir + "/团组增减款项相关文件/" + fileName;
|
|
|
+
|
|
|
+ System.IO.File.Delete(filePath);
|
|
|
+ int id = await _sqlSugar.Updateable<Grp_DeleFile>().Where(a => a.Id == dto.Id).SetColumns(a => new Grp_DeleFile { IsDel = 1, DeleteUserId = dto.DeleteUserId, DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") }).ExecuteCommandAsync();
|
|
|
+ return Ok(JsonView(true, "取消文件成功!"));
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return Ok(JsonView(false, "取消文件失败!"));
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ catch (Exception ex)
|
|
|
+ {
|
|
|
+ return Ok(JsonView(false, "程序错误!"));
|
|
|
+ throw;
|
|
|
+ }
|
|
|
+ }
|
|
|
#endregion
|
|
|
}
|
|
|
- #endregion
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|